Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-imageformats for
openSUSE:Factory checked in at 2022-09-15 22:59:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-imageformats (Old)
and /work/SRC/openSUSE:Factory/.qt6-imageformats.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-imageformats"
Thu Sep 15 22:59:23 2022 rev:15 rq:1003806 version:6.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-imageformats/qt6-imageformats.changes
2022-06-20 15:37:47.566904891 +0200
+++
/work/SRC/openSUSE:Factory/.qt6-imageformats.new.2083/qt6-imageformats.changes
2022-09-15 23:00:31.569441673 +0200
@@ -1,0 +2,6 @@
+Fri Sep 9 12:41:36 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 6.3.2:
+ * https://www.qt.io/blog/qt-6.3.2-released
+
+-------------------------------------------------------------------
Old:
----
qtimageformats-everywhere-src-6.3.1.tar.xz
New:
----
qtimageformats-everywhere-src-6.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-imageformats.spec ++++++
--- /var/tmp/diff_new_pack.oZUw8T/_old 2022-09-15 23:00:32.181443401 +0200
+++ /var/tmp/diff_new_pack.oZUw8T/_new 2022-09-15 23:00:32.189443423 +0200
@@ -16,7 +16,7 @@
#
-%define real_version 6.3.1
+%define real_version 6.3.2
%define short_version 6.3
%define short_name qtimageformats
%define tar_name qtimageformats-everywhere-src
@@ -28,7 +28,7 @@
%endif
#
Name: qt6-imageformats%{?pkg_suffix}
-Version: 6.3.1
+Version: 6.3.2
Release: 0
Summary: Qt 6 ImageFormat Plugins
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
++++++ qtimageformats-everywhere-src-6.3.1.tar.xz ->
qtimageformats-everywhere-src-6.3.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-6.3.1/.cmake.conf
new/qtimageformats-everywhere-src-6.3.2/.cmake.conf
--- old/qtimageformats-everywhere-src-6.3.1/.cmake.conf 2022-06-06
03:06:49.000000000 +0200
+++ new/qtimageformats-everywhere-src-6.3.2/.cmake.conf 2022-09-06
09:27:24.000000000 +0200
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.3.1")
+set(QT_REPO_MODULE_VERSION "6.3.2")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-6.3.1/.tag
new/qtimageformats-everywhere-src-6.3.2/.tag
--- old/qtimageformats-everywhere-src-6.3.1/.tag 2022-06-06
03:06:49.000000000 +0200
+++ new/qtimageformats-everywhere-src-6.3.2/.tag 2022-09-06
09:27:24.000000000 +0200
@@ -1 +1 @@
-9ae8dcdddf99e5b23038c3b96eb923a04cd83a93
+ec28a0ce38299fcae29976d0254e3427c0f953ad
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.3.1/dependencies.yaml
new/qtimageformats-everywhere-src-6.3.2/dependencies.yaml
--- old/qtimageformats-everywhere-src-6.3.1/dependencies.yaml 2022-06-06
03:06:49.000000000 +0200
+++ new/qtimageformats-everywhere-src-6.3.2/dependencies.yaml 2022-09-06
09:27:24.000000000 +0200
@@ -1,4 +1,4 @@
dependencies:
../qtbase:
- ref: 8483dcde90f40cdfd0a0ec4245b03610b46b6cae
+ ref: 12dc1dc09d73f5400e1e77181749793885ed9ffc
required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.3.1/src/imageformats/doc/src/qt6-changes.qdoc
new/qtimageformats-everywhere-src-6.3.2/src/imageformats/doc/src/qt6-changes.qdoc
---
old/qtimageformats-everywhere-src-6.3.1/src/imageformats/doc/src/qt6-changes.qdoc
2022-06-06 03:06:49.000000000 +0200
+++
new/qtimageformats-everywhere-src-6.3.2/src/imageformats/doc/src/qt6-changes.qdoc
1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \page qtimageformats-changes-qt6.html
- \title Changes to Qt Image Formats
- \ingroup changes-qt-5-to-6
- \brief Migrate Qt Image Formats to Qt 6.
-
- Qt 6 is a result of the conscious effort to make the framework more
- efficient and easy to use.
-
- We try to maintain binary and source compatibility for all the public
- APIs in each release. But some changes were inevitable in an effort to
- make Qt a better framework.
-
- In this topic we summarize those changes in Qt Image Formats, and provide
guidance
- to handle them.
-
- \section1 ADD STUFF HERE
-*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.3.1/src/imageformats/doc/src/qtimageformats.qdoc
new/qtimageformats-everywhere-src-6.3.2/src/imageformats/doc/src/qtimageformats.qdoc
---
old/qtimageformats-everywhere-src-6.3.1/src/imageformats/doc/src/qtimageformats.qdoc
2022-06-06 03:06:49.000000000 +0200
+++
new/qtimageformats-everywhere-src-6.3.2/src/imageformats/doc/src/qtimageformats.qdoc
2022-09-06 09:27:24.000000000 +0200
@@ -77,10 +77,6 @@
plugins. They may be deployed to the target system in the same way as
other plugins, see the \l{Deploying Plugins} documentation.
-\section1 Module Evolution
-\l{Changes to Qt Image Formats} lists important changes in the module
-API and functionality that were done for the Qt 6 series of Qt.
-
\section1 Licenses and Attributions
Qt Image Formats is available under commercial licenses from \l{The Qt
Company}.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.3.1/src/plugins/imageformats/icns/qicnshandler.cpp
new/qtimageformats-everywhere-src-6.3.2/src/plugins/imageformats/icns/qicnshandler.cpp
---
old/qtimageformats-everywhere-src-6.3.1/src/plugins/imageformats/icns/qicnshandler.cpp
2022-06-06 03:06:49.000000000 +0200
+++
new/qtimageformats-everywhere-src-6.3.2/src/plugins/imageformats/icns/qicnshandler.cpp
2022-09-06 09:27:24.000000000 +0200
@@ -462,8 +462,12 @@
if (isIconCompressed(icon))
return true;
// Icon depth:
- if (!depth.isEmpty())
- icon.depth = ICNSEntry::Depth(depth.toUInt());
+ if (!depth.isEmpty()) {
+ const uint depthUInt = depth.toUInt();
+ if (depthUInt > 32)
+ return false;
+ icon.depth = ICNSEntry::Depth(depthUInt);
+ }
// Try mono if depth not found
if (icon.depth == ICNSEntry::DepthUnknown)
icon.depth = ICNSEntry::DepthMono;
@@ -516,7 +520,7 @@
icon.height = icon.width;
}
// Sanity check
- if (icon.width == 0 || icon.width > 4096 || icon.depth > 32)
+ if (icon.width == 0 || icon.width > 4096)
return false;
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.3.1/src/plugins/imageformats/jp2/CMakeLists.txt
new/qtimageformats-everywhere-src-6.3.2/src/plugins/imageformats/jp2/CMakeLists.txt
---
old/qtimageformats-everywhere-src-6.3.1/src/plugins/imageformats/jp2/CMakeLists.txt
2022-06-06 03:06:49.000000000 +0200
+++
new/qtimageformats-everywhere-src-6.3.2/src/plugins/imageformats/jp2/CMakeLists.txt
2022-09-06 09:27:24.000000000 +0200
@@ -12,7 +12,6 @@
qjp2handler.cpp qjp2handler_p.h
LIBRARIES
WrapJasper::WrapJasper
- LIBRARIES
Qt::Core
Qt::Gui
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.3.1/src/plugins/imageformats/jp2/qjp2handler.cpp
new/qtimageformats-everywhere-src-6.3.2/src/plugins/imageformats/jp2/qjp2handler.cpp
---
old/qtimageformats-everywhere-src-6.3.1/src/plugins/imageformats/jp2/qjp2handler.cpp
2022-06-06 03:06:49.000000000 +0200
+++
new/qtimageformats-everywhere-src-6.3.2/src/plugins/imageformats/jp2/qjp2handler.cpp
2022-09-06 09:27:24.000000000 +0200
@@ -43,6 +43,7 @@
#include "qimage.h"
#include "qvariant.h"
#include "qcolor.h"
+#include "qimagereader.h"
#include <jasper/jasper.h>
#include <math.h> // for pow
@@ -333,16 +334,46 @@
Jpeg2000JasperReader::Jpeg2000JasperReader(QIODevice *iod, SubFormat format)
: jasperOk(true), ioDevice(iod), format(format), hasAlpha(false)
{
+#if JAS_VERSION_MAJOR < 3
if (jas_init()) {
jasperOk = false;
qDebug("Jasper Library initialization failed");
}
+#else
+ jas_conf_clear();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ jas_conf_set_max_mem_usage(QImageReader::allocationLimit() * 1024 * 1024);
+#else
+ // 128MB seems to be enough.
+ jas_conf_set_max_mem_usage(128 * 1024 * 1024);
+#endif
+ if (jas_init_library()) {
+ jasperOk = false;
+ qDebug("Jasper library initialization failed");
+ }
+ if (jas_init_thread()) {
+ jas_cleanup_library();
+ jasperOk = false;
+ qDebug("Jasper thread initialization failed");
+ }
+#endif
}
Jpeg2000JasperReader::~Jpeg2000JasperReader()
{
+#if JAS_VERSION_MAJOR < 3
if (jasperOk)
jas_cleanup();
+#else
+ if (jasperOk) {
+ if (jas_cleanup_thread()) {
+ qDebug("Jasper thread cleanup failed");
+ }
+ if (jas_cleanup_library()) {
+ qDebug("Jasper library cleanup failed");
+ }
+ }
+#endif
}
/*! \internal
@@ -853,7 +884,7 @@
}
// Open an empty jasper stream that grows automatically
- jas_stream_t * memory_stream = jas_stream_memopen(0, -1);
+ jas_stream_t * memory_stream = jas_stream_memopen(0, 0);
// Jasper wants a non-const string.
char *str = qstrdup(jasperFormatString.toLatin1().constData());
