Accepting request 1291563 from multimedia:apps

OBS-URL: https://build.opensuse.org/request/show/1291563
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yacreader?expand=0&rev=6

0002-fix_building_with_qt_6_9_0.patch

@@ -0,0 +1,30 @@
+From 6e0e6f3bc39ddc4d7241f4f946088291410feb50 Mon Sep 17 00:00:00 2001
+From: "Jason E. Hale" <jhale@FreeBSD.org>
+Date: Sat, 19 Apr 2025 06:28:17 -0400
+Subject: [PATCH] Fix build with Qt 6.9.0 (fixes #469)
+
+Support for std::array was added to QDebug in 6.9.0
+---
+ tests/concurrent_queue_test/concurrent_queue_test.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/concurrent_queue_test/concurrent_queue_test.cpp b/tests/concurrent_queue_test/concurrent_queue_test.cpp
+index b09d05f69..d9c4eb4bb 100644
+--- a/tests/concurrent_queue_test/concurrent_queue_test.cpp
++++ b/tests/concurrent_queue_test/concurrent_queue_test.cpp
+@@ -209,6 +209,7 @@ void waitAndPrint(const ConcurrentQueue &queue, const QueueControlMessagePrinter
+     printer.printEndWaitingMessage();
+ }
+ 
++#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
+ template<typename T, std::size_t size>
+ QDebug operator<<(QDebug debug, const std::array<T, size> &array)
+ {
+@@ -225,6 +226,7 @@ QDebug operator<<(QDebug debug, const std::array<T, size> &array)
+ 
+     return debug;
+ }
++#endif
+ 
+ using RandomEngine = std::mt19937_64;
+ 

0003-add_missing_QVariantMap_include.patch

@@ -0,0 +1,22 @@
+From 254652f03ec648423c9488929dc62fb3f4b817c7 Mon Sep 17 00:00:00 2001
+From: "Jason E. Hale" <jhale@FreeBSD.org>
+Date: Sat, 19 Apr 2025 06:25:11 -0400
+Subject: [PATCH] Add missing include
+
+Fixes build with Qt 6.9.0
+---
+ YACReaderLibrary/comic_vine/model/response_parser.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/YACReaderLibrary/comic_vine/model/response_parser.cpp b/YACReaderLibrary/comic_vine/model/response_parser.cpp
+index 033fd6077..dd2582120 100644
+--- a/YACReaderLibrary/comic_vine/model/response_parser.cpp
++++ b/YACReaderLibrary/comic_vine/model/response_parser.cpp
+@@ -2,6 +2,7 @@
+ #include <QDebug>
+ #include <QJsonDocument>
+ #include <QJsonParseError>
++#include <QVariantMap>
+ 
+ ResponseParser::ResponseParser(QObject *parent)
+     : QObject(parent), error(false), errorTxt("None"), numResults(-1), currentPage(-1), totalPages(-1)

_service

@@ -0,0 +1,25 @@
+<services>
+
+<service name="obs_scm" mode="manual">
+  <param name="scm">git</param>
+  <param name="url">https://github.com/YACReader/yacreader</param>
+  <param name="filename">yacreader</param>
+  <param name="revision">9.15.0</param>
+  <param name="versionformat">@PARENT_TAG@</param>
+</service>
+
+<service name="obs_scm" mode="manual">
+  <param name="scm">git</param>
+  <param name="url">https://github.com/selmf/unarr</param>
+  <param name="filename">unarr</param>
+  <param name="revision">b211040df83dee513362cdeb9bd87afa26fd5e38</param>
+  <param name="version">_none_</param>
+</service>
+
+<service name="tar" mode="manual" />
+<service name="recompress" mode="manual">
+  <param name="compression">zstd</param>
+  <param name="file">*.tar</param>
+</service>
+
+</services>

unarr-569ffdb.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c839bc1f7b5b5fbda0e07fbdf490acab478d0688eb5922ab78ac622000b3a9d
-size 161416

unarr.tar.zst

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f479372299667b3c5aebee65a303fa8dca510b14cfe1560643a5e13bfa23ae5f
+size 152258

yacreader-9.14.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f8d7643d9676504d7b52cafaca1bec3bc262bd13f9d272a79ad83662eaaeb01c
-size 1759841

yacreader-9.15.0.tar.zst

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f1f015b349440c7965f9c06ddeec0acb09babd5ef806684699b81365db56c9dc
+size 22217104

yacreader.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Jul  9 14:57:41 UTC 2025 - Martin Jambor <mjambor@suse.com>
+
+- Add 0002-fix_building_with_qt_6_9_0.patch and
+  0003-add_missing_QVariantMap_include.patch to fix building with Qt 9.6.0
+  (both backported from https://github.com/YACReader/yacreader/issues/469).
+
+-------------------------------------------------------------------
+Fri Jan  3 04:32:38 UTC 2025 - Xu Zhao <i@xuzhao.net>
+
+- Update to 9.15.0
+  * Save magnifying glass size and zoom level.
+  * Bump PDF render size.
+  * Fix trackpad scrolling.
+- Use obs_scm to manage source code
+
 -------------------------------------------------------------------
 Wed Feb 21 20:28:47 UTC 2024 - Xu Zhao <i@xuzhao.net>
 

yacreader.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package yacreader
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 # Copyright (c) 2019 Xu Zhao (i@xuzhao.net).
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,36 +17,42 @@
 #
 
 
-%define unarr_version 569ffdb
 %define p7zip_version 16.02
+%define srcext        tar.zst
 Name:           yacreader
-Version:        9.14.2
+Version:        9.15.0
 Release:        0
 Summary:        The best way for reading your comics
 License:        GPL-3.0-or-later
 Group:          Productivity/Graphics/Viewers
 URL:            https://www.yacreader.com
-Source0:        https://github.com/YACReader/yacreader/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source1:        unarr-%{unarr_version}.zip
+Source0:        yacreader-%{version}.%{srcext}
+Source1:        unarr.%{srcext}
 # Source URL: https://sourceforge.net/projects/p7zip/files/p7zip/16.02/p7zip_16.02_src_all.tar.bz2/download
 Source2:        p7zip_%{p7zip_version}_src_all.tar.bz2
 Patch1:         0001-fix-unarr.patch
+# PATCH-FIX-UPSTREAM 0002-fix_building_with_qt_6_9_0.patch https://github.com/YACReader/yacreader/issues/469
+Patch2:         0002-fix_building_with_qt_6_9_0.patch
+# PATCH-FIX-UPSTREAM 0003-add_missing_QVariantMap_include.patch https://github.com/YACReader/yacreader/issues/469
+Patch3:         0003-add_missing_QVariantMap_include.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  glu-devel
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  libQt5QuickControls2-devel
-BuildRequires:  libQt5Sql5-sqlite
-BuildRequires:  libpoppler-qt5-devel
-BuildRequires:  libqt5-linguist
-BuildRequires:  libqt5-qtbase-devel
-BuildRequires:  libqt5-qtdeclarative-devel
-BuildRequires:  libqt5-qtmultimedia-devel
-BuildRequires:  libqt5-qtscript-devel
-BuildRequires:  libqt5-qtsvg-devel
+BuildRequires:  libpoppler-qt6-devel
 BuildRequires:  mozilla-nss
+BuildRequires:  qt6-base-devel
+BuildRequires:  qt6-declarative-devel
+BuildRequires:  qt6-linguist-devel
+BuildRequires:  qt6-multimedia-devel
+BuildRequires:  qt6-qml-devel
+BuildRequires:  qt6-qt5compat-devel
+BuildRequires:  qt6-quickcontrols2-devel
+BuildRequires:  qt6-sql-devel
+BuildRequires:  qt6-svg-devel
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
+BuildRequires:  zstd
 Requires:       hicolor-icon-theme
 
 %description
@@ -54,12 +60,14 @@ A cross platform comic reader and library manager.
 
 %prep
 %setup -q -a 1 -a 2
-mv unarr-%{unarr_version} compressed_archive/unarr/unarr-master
+mv unarr compressed_archive/unarr/unarr-master
 %patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
 mv p7zip_%{p7zip_version} compressed_archive/libp7zip
 
 %build
-qmake-qt5
+qmake6
 make %{?_smp_mflags}
 
 %install