From c04fe4c734e0e8e368509164b97012d0d66d7075683f71988500870cbb00a6fe Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 2 Jun 2020 15:46:49 +0000 Subject: [PATCH] Accepting request 810888 from home:wolfi323:branches:KDE:Extra - Update to 3.3.1: Features: * Updated filter dialog to allow matching against empty text. Bug Fixes: * Updated script for Dark Horse comics data source. * Fixed bug with creation date for duplicated entries (kde#422127). * Fixed error in ISO-5426 conversion (kde#420451). * Fixed compilation with Qt versions back to 5.9. - Drop patches merged upstream: * Use-unnamespaced-hex-for-Qt-lt-5.14.patch * Fix-build-with-Qt-5.9.patch - Add Fix-compilation-with-Qt-5.9.patch to fix a new compiler error with Qt 5.9 (kde#422354) OBS-URL: https://build.opensuse.org/request/show/810888 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/tellico?expand=0&rev=59 --- Fix-build-with-Qt-5.9.patch | 32 ---------------------- Fix-compilation-with-Qt-5.9.patch | 33 +++++++++++++++++++++++ Use-unnamespaced-hex-for-Qt-lt-5.14.patch | 30 --------------------- tellico-3.3.1.tar.xz | 3 +++ tellico-3.3.tar.xz | 3 --- tellico.changes | 18 +++++++++++++ tellico.spec | 6 ++--- 7 files changed, 56 insertions(+), 69 deletions(-) delete mode 100644 Fix-build-with-Qt-5.9.patch create mode 100644 Fix-compilation-with-Qt-5.9.patch delete mode 100644 Use-unnamespaced-hex-for-Qt-lt-5.14.patch create mode 100644 tellico-3.3.1.tar.xz delete mode 100644 tellico-3.3.tar.xz diff --git a/Fix-build-with-Qt-5.9.patch b/Fix-build-with-Qt-5.9.patch deleted file mode 100644 index eaa86c8..0000000 --- a/Fix-build-with-Qt-5.9.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 48b3238c50314d0a2a5ab62c03868c9dedd7a360 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer -Date: Thu, 23 Apr 2020 18:56:39 +0200 -Subject: [PATCH] Fix build with Qt 5.9 - -`qsizetype` is only defined starting with Qt 5.10. -To avoid a compiler error, conditionally define it appropriately for -older Qt versions (the actual line is copied from Qt 5.10's qglobal.h). - -Differential Revision: https://phabricator.kde.org/D29134 ---- - src/images/image.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/images/image.h b/src/images/image.h -index eb287db9..3081b831 100644 ---- a/src/images/image.h -+++ b/src/images/image.h -@@ -30,6 +30,10 @@ - #include - #include - -+#if (QT_VERSION < QT_VERSION_CHECK(5, 10, 0)) -+using qsizetype = QIntegerForSizeof::Signed; -+#endif -+ - namespace Tellico { - class ImageFactory; - class ImageDirectory; --- -2.16.4 - diff --git a/Fix-compilation-with-Qt-5.9.patch b/Fix-compilation-with-Qt-5.9.patch new file mode 100644 index 0000000..a42ca91 --- /dev/null +++ b/Fix-compilation-with-Qt-5.9.patch @@ -0,0 +1,33 @@ +From ac8740fd9b4042af476fcf8dbb91c7d212d143e4 Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer +Date: Tue, 2 Jun 2020 17:12:02 +0200 +Subject: Fix compilation with Qt 5.9 + +`QTimer::callOnTimeout()` only exists since Qt 5.12. + +Connect to the `QTimer::timeout` signal instead, this works with older +versions as well and is equivalent according to the Qt documentation. + +BUG: 422354 +FIXED-IN: 3.3.2 +Differential Revision: https://phabricator.kde.org/D29841 +--- + src/document.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/document.cpp b/src/document.cpp +index 3d2b4b1..7807002 100644 +--- a/src/document.cpp ++++ b/src/document.cpp +@@ -61,7 +61,7 @@ Document::Document() : QObject(), m_coll(nullptr), m_isModified(false), + m_allImagesOnDisk = Config::imageLocation() != Config::ImagesInFile; + m_loadImagesTimer.setSingleShot(true); + m_loadImagesTimer.setInterval(500); +- m_loadImagesTimer.callOnTimeout(this, &Document::slotLoadAllImages); ++ connect(&m_loadImagesTimer, &QTimer::timeout, this, &Document::slotLoadAllImages); + newDocument(Collection::Book); + } + +-- +cgit v1.1 + diff --git a/Use-unnamespaced-hex-for-Qt-lt-5.14.patch b/Use-unnamespaced-hex-for-Qt-lt-5.14.patch deleted file mode 100644 index 05c3237..0000000 --- a/Use-unnamespaced-hex-for-Qt-lt-5.14.patch +++ /dev/null @@ -1,30 +0,0 @@ -From aee9e90c1ce0257d12ea85029435db8ffa65a6a1 Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Thu, 23 Apr 2020 09:31:11 +0200 -Subject: Use unnamespaced hex for Qt < 5.14 - -Qt 5.14 moves hex under a Qt namespace, so use it in the right way -depending on the Qt version. ---- - src/utils/iso5426converter.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/utils/iso5426converter.cpp b/src/utils/iso5426converter.cpp -index 7ea81c7..0c19767 100644 ---- a/src/utils/iso5426converter.cpp -+++ b/src/utils/iso5426converter.cpp -@@ -1211,7 +1211,11 @@ QChar Iso5426Converter::getCombiningChar(uint c) { - return 0x1EF1; // SMALL LETTER U WITH HORN AND DOT BELOW - - default: -+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) -+ myDebug() << "no match for" << hex << c; -+#else - myDebug() << "no match for" << Qt::hex << c; -+#endif - return QChar(); - } - } --- -cgit v1.1 - diff --git a/tellico-3.3.1.tar.xz b/tellico-3.3.1.tar.xz new file mode 100644 index 0000000..2403a27 --- /dev/null +++ b/tellico-3.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5b1417572e4970571c4e9585d89254767312213607244040d2e598988c5b373 +size 5619068 diff --git a/tellico-3.3.tar.xz b/tellico-3.3.tar.xz deleted file mode 100644 index 7d52054..0000000 --- a/tellico-3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de08c27a63f3dd9cab085604fda9f94efb3abfd1ffb1e0ec2f7be9fcf79d2fb6 -size 5618088 diff --git a/tellico.changes b/tellico.changes index d9beb0b..15c9d6d 100644 --- a/tellico.changes +++ b/tellico.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Jun 2 15:41:28 UTC 2020 - Wolfgang Bauer + +- Update to 3.3.1: + Features: + * Updated filter dialog to allow matching against empty text. + Bug Fixes: + * Updated script for Dark Horse comics data source. + * Fixed bug with creation date for duplicated entries + (kde#422127). + * Fixed error in ISO-5426 conversion (kde#420451). + * Fixed compilation with Qt versions back to 5.9. +- Drop patches merged upstream: + * Use-unnamespaced-hex-for-Qt-lt-5.14.patch + * Fix-build-with-Qt-5.9.patch +- Add Fix-compilation-with-Qt-5.9.patch to fix a new compiler error + with Qt 5.9 (kde#422354) + ------------------------------------------------------------------- Thu Apr 23 13:42:09 UTC 2020 - Wolfgang Bauer diff --git a/tellico.spec b/tellico.spec index 372c6de..fc4d7b7 100644 --- a/tellico.spec +++ b/tellico.spec @@ -17,7 +17,7 @@ Name: tellico -Version: 3.3 +Version: 3.3.1 Release: 0 Summary: A Collection Manager License: GPL-2.0-or-later @@ -25,9 +25,7 @@ Group: Productivity/Office/Other URL: https://tellico-project.org/ Source0: https://tellico-project.org/files/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM -Patch0: Use-unnamespaced-hex-for-Qt-lt-5.14.patch -# PATCH-FIX-UPSTREAM -Patch1: Fix-build-with-Qt-5.9.patch +Patch0: Fix-compilation-with-Qt-5.9.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: libcdio-devel