Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-qtpbfimageformat for
openSUSE:Factory checked in at 2025-05-13 20:07:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-qtpbfimageformat (Old)
and /work/SRC/openSUSE:Factory/.qt6-qtpbfimageformat.new.30101 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-qtpbfimageformat"
Tue May 13 20:07:34 2025 rev:4 rq:1277086 version:4.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/qt6-qtpbfimageformat/qt6-qtpbfimageformat.changes
2025-01-09 15:12:43.953477191 +0100
+++
/work/SRC/openSUSE:Factory/.qt6-qtpbfimageformat.new.30101/qt6-qtpbfimageformat.changes
2025-05-13 20:07:36.112211446 +0200
@@ -1,0 +2,13 @@
+Sun May 11 12:49:39 CEST 2025 - tu...@cbox.cz
+
+- Update to version 4.2
+ * Qt5 builds now require Qt 5.15.
+ * Fixed UNIX builds on MacOS (Macports).
+
+-------------------------------------------------------------------
+Thu Feb 13 23:40:07 CET 2025 - tu...@cbox.cz
+
+- Update to version 4.1
+ * Fixed broken text handling under Qt5.
+
+-------------------------------------------------------------------
Old:
----
QtPBFImagePlugin-4.0.tar.gz
New:
----
QtPBFImagePlugin-4.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-qtpbfimageformat.spec ++++++
--- /var/tmp/diff_new_pack.NIh3h4/_old 2025-05-13 20:07:38.536313082 +0200
+++ /var/tmp/diff_new_pack.NIh3h4/_new 2025-05-13 20:07:38.552313753 +0200
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: qt6-qtpbfimageformat
-Version: 4.0
+Version: 4.2
Release: 1
Summary: Qt6 PBF Image Format Plugin
License: LGPL-3.0-only
++++++ QtPBFImagePlugin-4.0.tar.gz -> QtPBFImagePlugin-4.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPBFImagePlugin-4.0/.appveyor.yml
new/QtPBFImagePlugin-4.2/.appveyor.yml
--- old/QtPBFImagePlugin-4.0/.appveyor.yml 2025-01-08 00:36:27.000000000
+0100
+++ new/QtPBFImagePlugin-4.2/.appveyor.yml 2025-05-11 11:55:54.000000000
+0200
@@ -1,4 +1,4 @@
-version: 4.0.{build}
+version: 4.2.{build}
configuration:
- Release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPBFImagePlugin-4.0/.github/workflows/android.yml
new/QtPBFImagePlugin-4.2/.github/workflows/android.yml
--- old/QtPBFImagePlugin-4.0/.github/workflows/android.yml 2025-01-08
00:36:27.000000000 +0100
+++ new/QtPBFImagePlugin-4.2/.github/workflows/android.yml 2025-05-11
11:55:54.000000000 +0200
@@ -40,7 +40,7 @@
- name: Configure build
run: qmake pbfplugin.pro
- name: Build project
- run: make -j2
+ run: make -j4
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPBFImagePlugin-4.0/.github/workflows/linux.yml
new/QtPBFImagePlugin-4.2/.github/workflows/linux.yml
--- old/QtPBFImagePlugin-4.0/.github/workflows/linux.yml 2025-01-08
00:36:27.000000000 +0100
+++ new/QtPBFImagePlugin-4.2/.github/workflows/linux.yml 2025-05-11
11:55:54.000000000 +0200
@@ -8,7 +8,10 @@
jobs:
build:
name: QtPBFImagePlugin
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
+ strategy:
+ matrix:
+ config: ['release', 'debug']
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -17,6 +20,6 @@
sudo apt-get update
sudo apt-get install qtbase5-dev qtbase5-dev-tools qt5-qmake
zlib1g-dev
- name: Configure build
- run: qmake pbfplugin.pro
+ run: qmake CONFIG+=${{ matrix.config }} pbfplugin.pro
- name: Build project
- run: make -j2
+ run: make -j4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPBFImagePlugin-4.0/.github/workflows/osx.yml
new/QtPBFImagePlugin-4.2/.github/workflows/osx.yml
--- old/QtPBFImagePlugin-4.0/.github/workflows/osx.yml 2025-01-08
00:36:27.000000000 +0100
+++ new/QtPBFImagePlugin-4.2/.github/workflows/osx.yml 2025-05-11
11:55:54.000000000 +0200
@@ -15,7 +15,7 @@
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
- version: '6.8.1'
+ version: '6.8.2'
- name: Configure build
run: qmake pbfplugin.pro QMAKE_APPLE_DEVICE_ARCHS="x86_64h arm64"
- name: Build project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPBFImagePlugin-4.0/.gitignore
new/QtPBFImagePlugin-4.2/.gitignore
--- old/QtPBFImagePlugin-4.0/.gitignore 2025-01-08 00:36:27.000000000 +0100
+++ new/QtPBFImagePlugin-4.2/.gitignore 2025-05-11 11:55:54.000000000 +0200
@@ -7,7 +7,3 @@
moc_*.h
qrc_*.cpp
Makefile*
-
-# lib
-libpbf.so
-libpbf.dylib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPBFImagePlugin-4.0/README.md
new/QtPBFImagePlugin-4.2/README.md
--- old/QtPBFImagePlugin-4.0/README.md 2025-01-08 00:36:27.000000000 +0100
+++ new/QtPBFImagePlugin-4.2/README.md 2025-05-11 11:55:54.000000000 +0200
@@ -67,7 +67,7 @@
## Build
### Requirements
-* Qt5 >= 5.11 or Qt6
+* Qt5 >= 5.15 or Qt6
* Zlib
### Build steps
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPBFImagePlugin-4.0/pbfplugin.pro
new/QtPBFImagePlugin-4.2/pbfplugin.pro
--- old/QtPBFImagePlugin-4.0/pbfplugin.pro 2025-01-08 00:36:27.000000000
+0100
+++ new/QtPBFImagePlugin-4.2/pbfplugin.pro 2025-05-11 11:55:54.000000000
+0200
@@ -2,7 +2,7 @@
TEMPLATE = lib
CONFIG += plugin
QT += gui
-VERSION = 4.0
+VERSION = 4.2
HEADERS += src/pbfhandler.h \
src/data.h \
@@ -37,7 +37,7 @@
DEFINES += QT_NO_DEPRECATED_WARNINGS
-unix:!macx:!android {
+unix:!android {
LIBS += -lz
target.path += $$[QT_INSTALL_PLUGINS]/imageformats
@@ -51,9 +51,6 @@
QMAKE_TARGET_DESCRIPTION = Qt $$QT_VERSION MVT/PBF image plugin
QMAKE_TARGET_COPYRIGHT = Copyright (c) 2018-2025 Martin Tuma
}
-macx {
- LIBS += -lz
-}
android {
LIBS += -lz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPBFImagePlugin-4.0/src/data.cpp
new/QtPBFImagePlugin-4.2/src/data.cpp
--- old/QtPBFImagePlugin-4.0/src/data.cpp 2025-01-08 00:36:27.000000000
+0100
+++ new/QtPBFImagePlugin-4.2/src/data.cpp 2025-05-11 11:55:54.000000000
+0200
@@ -11,7 +11,7 @@
struct CTX
{
CTX(const QByteArray &ba)
- : bp(ba.constData()), be(bp + ba.size()) {}
+ : bp(ba.constData()), be(bp + ba.size()), tag(0) {}
const char *bp;
const char *be;
@@ -60,7 +60,14 @@
if (ctx.bp + len > ctx.be)
return false;
+/* In Qt5 the (later) conversion to QString is broken when the QByteArray is
+ not nul terminated so we have to use the "deep copy" constructor that
+ nul-terminates the byte array when it is created. */
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+ val = QByteArray(ctx.bp, len);
+#else
val = QByteArray::fromRawData(ctx.bp, len);
+#endif
ctx.bp += len;
return true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPBFImagePlugin-4.0/src/function.h
new/QtPBFImagePlugin-4.2/src/function.h
--- old/QtPBFImagePlugin-4.0/src/function.h 2025-01-08 00:36:27.000000000
+0100
+++ new/QtPBFImagePlugin-4.2/src/function.h 2025-05-11 11:55:54.000000000
+0200
@@ -6,6 +6,7 @@
#include <QColor>
#include <QPair>
#include <QString>
+#include <QJsonValue>
class QJsonObject;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPBFImagePlugin-4.0/src/sprites.cpp
new/QtPBFImagePlugin-4.2/src/sprites.cpp
--- old/QtPBFImagePlugin-4.0/src/sprites.cpp 2025-01-08 00:36:27.000000000
+0100
+++ new/QtPBFImagePlugin-4.2/src/sprites.cpp 2025-05-11 11:55:54.000000000
+0200
@@ -22,6 +22,7 @@
}
Sprites::Sprite::Sprite(const QJsonObject &json)
+ : _pixelRatio(1.0), _sdf(false)
{
int x, y, width, height;
@@ -44,16 +45,10 @@
_rect = QRect(x, y, width, height);
-
if (json.contains("pixelRatio") && json["pixelRatio"].isDouble())
_pixelRatio = json["pixelRatio"].toDouble();
- else
- _pixelRatio = 1.0;
-
if (json.contains("sdf") && json["sdf"].isBool())
_sdf = json["sdf"].toBool();
- else
- _sdf = false;
}
bool Sprites::load(const QString &jsonFile, const QString &imageFile)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPBFImagePlugin-4.0/src/textpathitem.cpp
new/QtPBFImagePlugin-4.2/src/textpathitem.cpp
--- old/QtPBFImagePlugin-4.0/src/textpathitem.cpp 2025-01-08
00:36:27.000000000 +0100
+++ new/QtPBFImagePlugin-4.2/src/textpathitem.cpp 2025-05-11
11:55:54.000000000 +0200
@@ -2,13 +2,6 @@
#include <QPainter>
#include "textpathitem.h"
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
-#define INTERSECTS intersect
-#else // QT 5.15
-#define INTERSECTS intersects
-#endif // QT 5.15
-
static void swap(const QLineF &line, QPointF *p1, QPointF *p2)
{
@@ -30,10 +23,10 @@
{
QPointF *p = p1;
- if (line.INTERSECTS(QLineF(rect.topLeft(), rect.topRight()), p)
+ if (line.intersects(QLineF(rect.topLeft(), rect.topRight()), p)
== QLineF::BoundedIntersection)
p = p2;
- if (line.INTERSECTS(QLineF(rect.topLeft(), rect.bottomLeft()), p)
+ if (line.intersects(QLineF(rect.topLeft(), rect.bottomLeft()), p)
== QLineF::BoundedIntersection) {
if (p == p2) {
swap(line, p1, p2);
@@ -41,7 +34,7 @@
}
p = p2;
}
- if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.bottomLeft()), p)
+ if (line.intersects(QLineF(rect.bottomRight(), rect.bottomLeft()), p)
== QLineF::BoundedIntersection) {
if (p == p2) {
swap(line, p1, p2);
@@ -49,7 +42,7 @@
}
p = p2;
}
- if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.topRight()), p)
+ if (line.intersects(QLineF(rect.bottomRight(), rect.topRight()), p)
== QLineF::BoundedIntersection) {
if (p == p2) {
swap(line, p1, p2);
@@ -64,16 +57,16 @@
static bool intersection(const QLineF &line, const QRectF &rect, QPointF *p)
{
- if (line.INTERSECTS(QLineF(rect.topLeft(), rect.topRight()), p)
+ if (line.intersects(QLineF(rect.topLeft(), rect.topRight()), p)
== QLineF::BoundedIntersection)
return true;
- if (line.INTERSECTS(QLineF(rect.topLeft(), rect.bottomLeft()), p)
+ if (line.intersects(QLineF(rect.topLeft(), rect.bottomLeft()), p)
== QLineF::BoundedIntersection)
return true;
- if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.bottomLeft()), p)
+ if (line.intersects(QLineF(rect.bottomRight(), rect.bottomLeft()), p)
== QLineF::BoundedIntersection)
return true;
- if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.topRight()), p)
+ if (line.intersects(QLineF(rect.bottomRight(), rect.topRight()), p)
== QLineF::BoundedIntersection)
return true;
++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.NIh3h4/_old 2025-05-13 20:07:39.356347464 +0200
+++ /var/tmp/diff_new_pack.NIh3h4/_new 2025-05-13 20:07:39.376348302 +0200
@@ -1,3 +1,16 @@
+qt5-pbf-image-plugin (4.2) stable; urgency=low
+
+ * Qt5 builds now require Qt 5.15.
+ * Fixed UNIX builds on MacOS (Macports).
+
+ -- Martin Tuma <tu...@cbox.cz> Sun, 11 May 2025 12:53:03 +0200
+
+qt5-pbf-image-plugin (4.1) stable; urgency=critical
+
+ * Fixed broken text handling under Qt5.
+
+ -- Martin Tuma <tu...@cbox.cz> Thu, 13 Feb 2025 23:44:42 +0100
+
qt5-pbf-image-plugin (4.0) stable; urgency=low
* Removed Google Protocol buffers dependency.
++++++ qtpbfplugin.dsc ++++++
--- /var/tmp/diff_new_pack.NIh3h4/_old 2025-05-13 20:07:39.716362558 +0200
+++ /var/tmp/diff_new_pack.NIh3h4/_new 2025-05-13 20:07:39.748363900 +0200
@@ -1,10 +1,10 @@
Format: 1.0
Source: qt5-pbf-image-plugin
-Version: 4.0-1
+Version: 4.2-1
Binary: qt5-pbf-image-plugin
Maintainer: Martin Tuma <tu...@cbox.cz>
Architecture: any
Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-dev-tools, qt5-qmake,
zlib1g-dev
Files:
- 00000000000000000000000000000000 0 QtPBFImagePlugin-4.0.tar.gz
+ 00000000000000000000000000000000 0 QtPBFImagePlugin-4.2.tar.gz
