From 704798534fc69afdfba1c2778b94220a6484d947 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:13:26 +0000 Subject: [PATCH 01/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeal.spec b/zeal.spec index d880f07..ae20bdc 100644 --- a/zeal.spec +++ b/zeal.spec @@ -4,7 +4,7 @@ Name: zeal Version: 0.6.1 -Release: 13.20220826.%{shortcommit}%{?dist} +Release: 14.20220826.%{shortcommit}%{?dist} Summary: Offline documentation browser inspired by Dash License: GPLv3+ @@ -69,6 +69,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.z %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.6.1-14.20220826.00d4b9c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Aug 26 2022 Lumír Balhar - 0.6.1-13.20220826.00d4b9c - Update to commit 00d4b9c From 4e6691aa58769dcd922fb2a921f31f3d2e68d0c4 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Sat, 10 Jun 2023 17:06:50 +0800 Subject: [PATCH 02/45] Update to commit 1cfa7c6 - Update to commit 1cfa7c6 - Migrate to Qt 6 - Use forge macros - Deprecate versioned cmake macros - Clean up BuildRequires - Reflect the actual version written in CMakeLists.txt --- .gitignore | 1 + 0001-apply-websettings.patch | 13 +++++++ sources | 2 +- zeal.spec | 75 ++++++++++++++++++++++-------------- 4 files changed, 62 insertions(+), 29 deletions(-) create mode 100644 0001-apply-websettings.patch diff --git a/.gitignore b/.gitignore index 7714ccf..8f275de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /zeal-0.6.1.tar.gz /zeal-dbb8eb2.tar.gz /zeal-00d4b9c.tar.gz +/zeal-1cfa7c637f745be9d98777f06b4f8dec90892bf2.tar.gz diff --git a/0001-apply-websettings.patch b/0001-apply-websettings.patch new file mode 100644 index 0000000..48e585c --- /dev/null +++ b/0001-apply-websettings.patch @@ -0,0 +1,13 @@ +diff --git a/src/libs/ui/mainwindow.cpp b/src/libs/ui/mainwindow.cpp +index d217c54..56ce048 100644 +--- a/src/libs/ui/mainwindow.cpp ++++ b/src/libs/ui/mainwindow.cpp +@@ -194,7 +194,7 @@ MainWindow::MainWindow(Core::Application *app, QWidget *parent) + ui->splitter->restoreState(m_settings->verticalSplitterGeometry); + + // Setup web settings. +- auto webSettings = new Browser::Settings(m_settings, this); ++ new Browser::Settings(m_settings, this); + + // Setup web bridge. + m_webBridge = new Browser::WebBridge(this); diff --git a/sources b/sources index c76ec35..4601381 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeal-00d4b9c.tar.gz) = 25c272a14829994e6caf09f0942cd3e946afbc8721b51468dfa1c15938a597993d652d2072007d962299de5ae4e2922e23b31788b90933a93febcd631a4567c4 +SHA512 (zeal-1cfa7c637f745be9d98777f06b4f8dec90892bf2.tar.gz) = 14660191f94fac7e4526207744f893732bf1de65ce3888a599e3c4e7f2d20272dea044f961877dc657258a0a4e3e981e6325d6d05933a60bade58feb89bf36b5 diff --git a/zeal.spec b/zeal.spec index ae20bdc..2756d9e 100644 --- a/zeal.spec +++ b/zeal.spec @@ -1,32 +1,47 @@ -%global commit 00d4b9ca5bf4588629939cca9d602a3dbd6a8525 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global forgeurl https://github.com/zealdocs/zeal +%global commit 1cfa7c637f745be9d98777f06b4f8dec90892bf2 %global debug_package %{nil} +%forgemeta + Name: zeal -Version: 0.6.1 -Release: 14.20220826.%{shortcommit}%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Summary: Offline documentation browser inspired by Dash License: GPLv3+ URL: https://zealdocs.org/ -Source0: https://github.com/zealdocs/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Source: %{forgesource} +Patch0: 0001-apply-websettings.patch -# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches -ExclusiveArch: %{qt5_qtwebengine_arches} +# handled by qt6-srpm-macros, which defines %%qt6_qtwebengine_arches +ExclusiveArch: %{qt6_qtwebengine_arches} -BuildRequires: cmake3 -BuildRequires: cmake(Qt5) -BuildRequires: cmake(Qt5WebKit) -BuildRequires: cmake(Qt5X11Extras) -BuildRequires: desktop-file-utils +BuildRequires: cmake(Qt6Core) >= 6.2.0 +BuildRequires: cmake(Qt6Gui) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6WebEngineWidgets) +BuildRequires: cmake(Qt6WebChannel) +BuildRequires: cmake(Qt6Network) + +BuildRequires: pkgconfig(libarchive) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-keysyms) + +BuildRequires: cmake BuildRequires: extra-cmake-modules -BuildRequires: kf5-rpm-macros +BuildRequires: ninja-build +BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: qt6-qtbase-private-devel +BuildRequires: qt6-srpm-macros +BuildRequires: desktop-file-utils BuildRequires: libappstream-glib -BuildRequires: libarchive-devel -BuildRequires: sqlite-devel -BuildRequires: xcb-util-keysyms-devel -BuildRequires: qt5-qtwebengine-devel + +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} Requires: hicolor-icon-theme %description @@ -34,24 +49,20 @@ Zeal is a simple offline documentation browser inspired by Dash. %prep -%autosetup -p1 -n %{name}-%{commit} - -# Disable ads on the welcome page -# Ads will be removed in 0.7.x -sed -i 's/("disable_ad"), false/("disable_ad"), true/' src/libs/core/settings.cpp +%forgesetup +%autopatch -p1 %build # turn off shared libs building: # - it's only used from Zeal itself # - build scripts not configured to install the lib -%cmake_kf5 \ - -DBUILD_SHARED_LIBS:BOOL=OFF \ - %{nil} -%cmake3_build +%cmake_qt6 \ + -DBUILD_SHARED_LIBS:BOOL=OFF +%cmake_build %install -%cmake3_install +%cmake_install %check @@ -61,7 +72,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.z %files %license COPYING -%doc README.md +%doc README.md CHANGELOG.md %{_bindir}/%{name} %{_datadir}/applications/org.zealdocs.zeal.desktop %{_metainfodir}/org.zealdocs.zeal.appdata.xml @@ -69,6 +80,14 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.z %changelog +* Sat Jun 10 2023 Zephyr Lykos - 0.6.2-1.git1cfa7c6 +- Update to commit 1cfa7c6 +- Migrate to Qt 6 +- Use forge macros +- Deprecate versioned cmake macros +- Clean up BuildRequires +- Reflect the actual version written in CMakeLists.txt + * Sat Jan 21 2023 Fedora Release Engineering - 0.6.1-14.20220826.00d4b9c - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 34c758d4bdb43d3f4edaba2175492075cdf1dbfe Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Sun, 18 Jun 2023 13:40:09 +0200 Subject: [PATCH 03/45] Do not use %qt6_qtwebengine_arches for ExclusiveArch --- zeal.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/zeal.spec b/zeal.spec index 2756d9e..610dea1 100644 --- a/zeal.spec +++ b/zeal.spec @@ -14,8 +14,12 @@ URL: https://zealdocs.org/ Source: %{forgesource} Patch0: 0001-apply-websettings.patch -# handled by qt6-srpm-macros, which defines %%qt6_qtwebengine_arches -ExclusiveArch: %{qt6_qtwebengine_arches} +# We should use %%qt6_qtwebengine_arches provided by qt6-srpm-macros +# but one of our dependency qt6-qtwebengine is available only +# for aarch64 and x86_64. +# BZ for the macro: https://bugzilla.redhat.com/show_bug.cgi?id=2215703 +# Ticket about the arch supoort: https://bugreports.qt.io/browse/QTBUG-102143 +ExclusiveArch: aarch64 x86_64 BuildRequires: cmake(Qt6Core) >= 6.2.0 BuildRequires: cmake(Qt6Gui) @@ -37,7 +41,6 @@ BuildRequires: ninja-build BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: qt6-qtbase-private-devel -BuildRequires: qt6-srpm-macros BuildRequires: desktop-file-utils BuildRequires: libappstream-glib From e10ba8654124c8b03c7368fbee6db8863ab8a7c6 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Sun, 18 Jun 2023 14:50:43 +0200 Subject: [PATCH 04/45] Don't use obsoleted forge macros --- .gitignore | 1 + sources | 2 +- zeal.spec | 15 ++++++++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 8f275de..77d0ba0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /zeal-dbb8eb2.tar.gz /zeal-00d4b9c.tar.gz /zeal-1cfa7c637f745be9d98777f06b4f8dec90892bf2.tar.gz +/zeal-1cfa7c6.tar.gz diff --git a/sources b/sources index 4601381..3cd02b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeal-1cfa7c637f745be9d98777f06b4f8dec90892bf2.tar.gz) = 14660191f94fac7e4526207744f893732bf1de65ce3888a599e3c4e7f2d20272dea044f961877dc657258a0a4e3e981e6325d6d05933a60bade58feb89bf36b5 +SHA512 (zeal-1cfa7c6.tar.gz) = 14660191f94fac7e4526207744f893732bf1de65ce3888a599e3c4e7f2d20272dea044f961877dc657258a0a4e3e981e6325d6d05933a60bade58feb89bf36b5 diff --git a/zeal.spec b/zeal.spec index 610dea1..8868c57 100644 --- a/zeal.spec +++ b/zeal.spec @@ -1,17 +1,15 @@ -%global forgeurl https://github.com/zealdocs/zeal %global commit 1cfa7c637f745be9d98777f06b4f8dec90892bf2 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global debug_package %{nil} -%forgemeta - Name: zeal Version: 0.6.2 -Release: 1%{?dist} +Release: 2.20230618.%{shortcommit}%{?dist} Summary: Offline documentation browser inspired by Dash License: GPLv3+ URL: https://zealdocs.org/ -Source: %{forgesource} +Source: https://github.com/zealdocs/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Patch0: 0001-apply-websettings.patch # We should use %%qt6_qtwebengine_arches provided by qt6-srpm-macros @@ -52,8 +50,8 @@ Zeal is a simple offline documentation browser inspired by Dash. %prep -%forgesetup -%autopatch -p1 +%autosetup -p1 -n %{name}-%{commit} + %build # turn off shared libs building: @@ -83,6 +81,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.z %changelog +* Sun Jun 18 2023 Lumír Balhar - 0.6.2-2.20230618.1cfa7c6 +- Don't use obsoleted forge macros + * Sat Jun 10 2023 Zephyr Lykos - 0.6.2-1.git1cfa7c6 - Update to commit 1cfa7c6 - Migrate to Qt 6 From 6a155e84925f02ff082296e3c8053f6a0bd679f4 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 17 Jul 2023 16:27:06 +0200 Subject: [PATCH 05/45] Rebuild --- zeal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeal.spec b/zeal.spec index 8868c57..1adea8d 100644 --- a/zeal.spec +++ b/zeal.spec @@ -4,7 +4,7 @@ Name: zeal Version: 0.6.2 -Release: 2.20230618.%{shortcommit}%{?dist} +Release: 3.20230618.%{shortcommit}%{?dist} Summary: Offline documentation browser inspired by Dash License: GPLv3+ @@ -81,6 +81,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.z %changelog +* Mon Jul 17 2023 Lumír Balhar - 0.6.2-3.20230618.1cfa7c6 +- Rebuild + * Sun Jun 18 2023 Lumír Balhar - 0.6.2-2.20230618.1cfa7c6 - Don't use obsoleted forge macros From 53d03a74cdb53efa928901035082b60fe54dd384 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:38:48 +0000 Subject: [PATCH 06/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeal.spec b/zeal.spec index 1adea8d..2783618 100644 --- a/zeal.spec +++ b/zeal.spec @@ -4,7 +4,7 @@ Name: zeal Version: 0.6.2 -Release: 3.20230618.%{shortcommit}%{?dist} +Release: 4.20230618.%{shortcommit}%{?dist} Summary: Offline documentation browser inspired by Dash License: GPLv3+ @@ -81,6 +81,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.z %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.6.2-4.20230618.1cfa7c6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jul 17 2023 Lumír Balhar - 0.6.2-3.20230618.1cfa7c6 - Rebuild From a8ecc333cbb555d8b6b3b1c5634a34ae44ece45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 26 Jul 2023 20:39:33 +0200 Subject: [PATCH 07/45] Rebuild(qt6) --- zeal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeal.spec b/zeal.spec index 2783618..a32522a 100644 --- a/zeal.spec +++ b/zeal.spec @@ -4,7 +4,7 @@ Name: zeal Version: 0.6.2 -Release: 4.20230618.%{shortcommit}%{?dist} +Release: 5.20230618.%{shortcommit}%{?dist} Summary: Offline documentation browser inspired by Dash License: GPLv3+ @@ -81,6 +81,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.z %changelog +* Wed Jul 26 2023 Björn Esser - 0.6.2-5.20230618.1cfa7c6 +- Rebuild(qt6) + * Sat Jul 22 2023 Fedora Release Engineering - 0.6.2-4.20230618.1cfa7c6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ca93c51ebe5c11b183f48089414c88f54cd38d4c Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Sun, 24 Sep 2023 09:29:08 +0200 Subject: [PATCH 08/45] Update to 0.7.0 (rhbz#2240281) --- .gitignore | 1 + sources | 2 +- zeal.spec | 13 +++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 77d0ba0..4441fea 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /zeal-00d4b9c.tar.gz /zeal-1cfa7c637f745be9d98777f06b4f8dec90892bf2.tar.gz /zeal-1cfa7c6.tar.gz +/zeal-0.7.0.tar.gz diff --git a/sources b/sources index 3cd02b2..ead26d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeal-1cfa7c6.tar.gz) = 14660191f94fac7e4526207744f893732bf1de65ce3888a599e3c4e7f2d20272dea044f961877dc657258a0a4e3e981e6325d6d05933a60bade58feb89bf36b5 +SHA512 (zeal-0.7.0.tar.gz) = 5980d521ee923e9ef009aafdf24c146f63de5a8dccac63078d1125e86f1f36503d9c1ca2dc1b1365be71e67abfc18f43c48c212a52340ecc96aac25db072047e diff --git a/zeal.spec b/zeal.spec index a32522a..bcaa6cd 100644 --- a/zeal.spec +++ b/zeal.spec @@ -1,15 +1,13 @@ -%global commit 1cfa7c637f745be9d98777f06b4f8dec90892bf2 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global debug_package %{nil} Name: zeal -Version: 0.6.2 -Release: 5.20230618.%{shortcommit}%{?dist} +Version: 0.7.0 +Release: 1%{?dist} Summary: Offline documentation browser inspired by Dash License: GPLv3+ URL: https://zealdocs.org/ -Source: https://github.com/zealdocs/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Source: https://github.com/zealdocs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: 0001-apply-websettings.patch # We should use %%qt6_qtwebengine_arches provided by qt6-srpm-macros @@ -50,7 +48,7 @@ Zeal is a simple offline documentation browser inspired by Dash. %prep -%autosetup -p1 -n %{name}-%{commit} +%autosetup -p1 -n %{name}-%{version} %build @@ -81,6 +79,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.z %changelog +* Sun Sep 24 2023 Lumír Balhar - 0.7.0-1 +- Update to 0.7.0 (rhbz#2240281) + * Wed Jul 26 2023 Björn Esser - 0.6.2-5.20230618.1cfa7c6 - Rebuild(qt6) From a023bb6bb069ccbaaba83b2148140693e63c6f90 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Sat, 7 Oct 2023 15:01:21 +0800 Subject: [PATCH 09/45] Convert to %autorelease and %autochangelog Rebuild (qt6) [skip changelog] --- changelog | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++ zeal.spec | 118 +----------------------------------------------------- 2 files changed, 117 insertions(+), 116 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..1547899 --- /dev/null +++ b/changelog @@ -0,0 +1,115 @@ +* Sun Sep 24 2023 Lumír Balhar - 0.7.0-1 +- Update to 0.7.0 (rhbz#2240281) + +* Wed Jul 26 2023 Björn Esser - 0.6.2-5.20230618.1cfa7c6 +- Rebuild(qt6) + +* Sat Jul 22 2023 Fedora Release Engineering - 0.6.2-4.20230618.1cfa7c6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jul 17 2023 Lumír Balhar - 0.6.2-3.20230618.1cfa7c6 +- Rebuild + +* Sun Jun 18 2023 Lumír Balhar - 0.6.2-2.20230618.1cfa7c6 +- Don't use obsoleted forge macros + +* Sat Jun 10 2023 Zephyr Lykos - 0.6.2-1.git1cfa7c6 +- Update to commit 1cfa7c6 +- Migrate to Qt 6 +- Use forge macros +- Deprecate versioned cmake macros +- Clean up BuildRequires +- Reflect the actual version written in CMakeLists.txt + +* Sat Jan 21 2023 Fedora Release Engineering - 0.6.1-14.20220826.00d4b9c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Aug 26 2022 Lumír Balhar - 0.6.1-13.20220826.00d4b9c +- Update to commit 00d4b9c + +* Sat Jul 23 2022 Fedora Release Engineering - 0.6.1-12.20200821.dbb8eb2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.6.1-11.20200821.dbb8eb2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Aug 21 2021 Lumír Balhar - 0.6.1-10.20210821.dbb8eb2 +- Package the latest version from master branch to fix segfaults + +* Fri Jul 23 2021 Fedora Release Engineering - 0.6.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Feb 02 2021 Lumír Balhar - 0.6.1-8 +- Fix build on rawhide +Resolves: rhbz#1923599 + +* Thu Jan 28 2021 Fedora Release Engineering - 0.6.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 0.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Aug 20 2019 Lumír Balhar - 0.6.1-4 +- Disable ads on the welcome page by default + +* Sat Jul 27 2019 Fedora Release Engineering - 0.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu May 30 2019 Lumír Balhar - 0.6.1-2 +- Specfile improved + +* Wed Nov 7 2018 Michel Alexandre Salim - 0.6.1-1 +- Update to 0.6.1 + +* Fri Aug 24 2018 Michel Alexandre Salim - 0.6.0-1 +- Update to 0.6.0 + +* Sat Jul 14 2018 Fedora Release Engineering - 0.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Jan 21 2018 Michel Alexandre Salim - 0.5.0-3 +- Fix missing dependency on libCore.so - don't build Zeal with shared libs flag + +* Thu Jan 18 2018 Igor Gnatenko - 0.5.0-2 +- Remove obsolete scriptlets + +* Tue Jan 16 2018 Michel Alexandre Salim - 0.5.0-1 +- Update to 0.5.0 +- Switch to cmake; upstream is deprecating qmake +- and its rule for detecting Qt >= 5.5.1 breaks on F28's Qt 5.10 + +* Mon Sep 4 2017 Michel Alexandre Salim - 0.4.0-1 +- Update to 0.4.0 + +* Thu Aug 03 2017 Fedora Release Engineering - 0.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Oct 12 2016 Michel Alexandre Salim - 0.3.1-1 +- Update to 0.3.1 + +* Sat Sep 24 2016 Michel Alexandre Salim - 0.3.0-1 +- Update to 0.3.0 + +* Mon Feb 22 2016 Michel Alexandre Salim - 0.2.1-1 +- Update to 0.2.1 + +* Fri Feb 05 2016 Fedora Release Engineering - 0.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Oct 14 2015 Michel Salim - 0.1.1-2 +- Update license info, add bundled lib metadata + +* Thu Sep 24 2015 Michel Alexandre Salim - 0.1.1-1 +- Initial package diff --git a/zeal.spec b/zeal.spec index bcaa6cd..2cd0e59 100644 --- a/zeal.spec +++ b/zeal.spec @@ -2,7 +2,7 @@ Name: zeal Version: 0.7.0 -Release: 1%{?dist} +Release: %autorelease Summary: Offline documentation browser inspired by Dash License: GPLv3+ @@ -79,118 +79,4 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.z %changelog -* Sun Sep 24 2023 Lumír Balhar - 0.7.0-1 -- Update to 0.7.0 (rhbz#2240281) - -* Wed Jul 26 2023 Björn Esser - 0.6.2-5.20230618.1cfa7c6 -- Rebuild(qt6) - -* Sat Jul 22 2023 Fedora Release Engineering - 0.6.2-4.20230618.1cfa7c6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jul 17 2023 Lumír Balhar - 0.6.2-3.20230618.1cfa7c6 -- Rebuild - -* Sun Jun 18 2023 Lumír Balhar - 0.6.2-2.20230618.1cfa7c6 -- Don't use obsoleted forge macros - -* Sat Jun 10 2023 Zephyr Lykos - 0.6.2-1.git1cfa7c6 -- Update to commit 1cfa7c6 -- Migrate to Qt 6 -- Use forge macros -- Deprecate versioned cmake macros -- Clean up BuildRequires -- Reflect the actual version written in CMakeLists.txt - -* Sat Jan 21 2023 Fedora Release Engineering - 0.6.1-14.20220826.00d4b9c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Aug 26 2022 Lumír Balhar - 0.6.1-13.20220826.00d4b9c -- Update to commit 00d4b9c - -* Sat Jul 23 2022 Fedora Release Engineering - 0.6.1-12.20200821.dbb8eb2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.6.1-11.20200821.dbb8eb2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Aug 21 2021 Lumír Balhar - 0.6.1-10.20210821.dbb8eb2 -- Package the latest version from master branch to fix segfaults - -* Fri Jul 23 2021 Fedora Release Engineering - 0.6.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Feb 02 2021 Lumír Balhar - 0.6.1-8 -- Fix build on rawhide -Resolves: rhbz#1923599 - -* Thu Jan 28 2021 Fedora Release Engineering - 0.6.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.6.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 0.6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Aug 20 2019 Lumír Balhar - 0.6.1-4 -- Disable ads on the welcome page by default - -* Sat Jul 27 2019 Fedora Release Engineering - 0.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu May 30 2019 Lumír Balhar - 0.6.1-2 -- Specfile improved - -* Wed Nov 7 2018 Michel Alexandre Salim - 0.6.1-1 -- Update to 0.6.1 - -* Fri Aug 24 2018 Michel Alexandre Salim - 0.6.0-1 -- Update to 0.6.0 - -* Sat Jul 14 2018 Fedora Release Engineering - 0.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0.5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 21 2018 Michel Alexandre Salim - 0.5.0-3 -- Fix missing dependency on libCore.so - don't build Zeal with shared libs flag - -* Thu Jan 18 2018 Igor Gnatenko - 0.5.0-2 -- Remove obsolete scriptlets - -* Tue Jan 16 2018 Michel Alexandre Salim - 0.5.0-1 -- Update to 0.5.0 -- Switch to cmake; upstream is deprecating qmake -- and its rule for detecting Qt >= 5.5.1 breaks on F28's Qt 5.10 - -* Mon Sep 4 2017 Michel Alexandre Salim - 0.4.0-1 -- Update to 0.4.0 - -* Thu Aug 03 2017 Fedora Release Engineering - 0.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Oct 12 2016 Michel Alexandre Salim - 0.3.1-1 -- Update to 0.3.1 - -* Sat Sep 24 2016 Michel Alexandre Salim - 0.3.0-1 -- Update to 0.3.0 - -* Mon Feb 22 2016 Michel Alexandre Salim - 0.2.1-1 -- Update to 0.2.1 - -* Fri Feb 05 2016 Fedora Release Engineering - 0.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Oct 14 2015 Michel Salim - 0.1.1-2 -- Update license info, add bundled lib metadata - -* Thu Sep 24 2015 Michel Alexandre Salim - 0.1.1-1 -- Initial package +%autochangelog From 01a8e4464fc33adc44005656fb6ceec645e9287d Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 13 Oct 2023 10:06:36 +0200 Subject: [PATCH 10/45] Rebuild (qt6) From 0c6d5ddb08f186a8332fc1cc57602f31811e71d7 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 16 Oct 2023 15:41:36 +0200 Subject: [PATCH 11/45] Replace deprecated qAsConst() with std::as_const() --- zeal-qasconst-deprecated.patch | 126 +++++++++++++++++++++++++++++++++ zeal.spec | 1 + 2 files changed, 127 insertions(+) create mode 100644 zeal-qasconst-deprecated.patch diff --git a/zeal-qasconst-deprecated.patch b/zeal-qasconst-deprecated.patch new file mode 100644 index 0000000..89e08db --- /dev/null +++ b/zeal-qasconst-deprecated.patch @@ -0,0 +1,126 @@ +diff --git a/src/libs/registry/docset.cpp b/src/libs/registry/docset.cpp +index 0c0dbb7..e82c9c9 100644 +--- a/src/libs/registry/docset.cpp ++++ b/src/libs/registry/docset.cpp +@@ -458,7 +458,7 @@ void Docset::loadSymbols(const QString &symbolType) const + // with it.first and it.second respectively pointing to the start and the end + // of the range of nodes having symbolType as key. It effectively represents a + // contiguous view over the nodes with a specified key. +- for (auto it = qAsConst(m_symbolStrings).equal_range(symbolType); it.first != it.second; ++it.first) { ++ for (auto it = std::as_const(m_symbolStrings).equal_range(symbolType); it.first != it.second; ++it.first) { + loadSymbols(symbolType, it.first.value()); + } + } +@@ -519,7 +519,7 @@ void Docset::createIndex() + } + + // Drop old indexes +- for (const QString &oldIndexName : qAsConst(oldIndexes)) { ++ for (const QString &oldIndexName : std::as_const(oldIndexes)) { + m_db->execute(indexDropQuery.arg(oldIndexName)); + } + +diff --git a/src/libs/registry/docsetmetadata.cpp b/src/libs/registry/docsetmetadata.cpp +index f08d891..76f9aa1 100644 +--- a/src/libs/registry/docsetmetadata.cpp ++++ b/src/libs/registry/docsetmetadata.cpp +@@ -33,6 +33,8 @@ + #include + #include + ++#include ++ + using namespace Zeal::Registry; + + DocsetMetadata::DocsetMetadata(const QJsonObject &jsonObject) +@@ -97,7 +99,7 @@ void DocsetMetadata::save(const QString &path, const QString &version) + + if (!m_urls.isEmpty()) { + QJsonArray urls; +- for (const QUrl &url : qAsConst(m_urls)) { ++ for (const QUrl &url : std::as_const(m_urls)) { + urls.append(url.toString()); + } + +diff --git a/src/libs/registry/docsetregistry.cpp b/src/libs/registry/docsetregistry.cpp +index 9776a19..8777474 100644 +--- a/src/libs/registry/docsetregistry.cpp ++++ b/src/libs/registry/docsetregistry.cpp +@@ -38,6 +38,7 @@ + + #include + #include ++#include + + using namespace Zeal::Registry; + +@@ -101,7 +102,7 @@ void DocsetRegistry::setFuzzySearchEnabled(bool enabled) + + m_isFuzzySearchEnabled = enabled; + +- for (Docset *docset : qAsConst(m_docsets)) { ++ for (Docset *docset : std::as_const(m_docsets)) { + docset->setFuzzySearchEnabled(enabled); + } + } +@@ -193,7 +194,7 @@ Docset *DocsetRegistry::docset(int index) const + + Docset *DocsetRegistry::docsetForUrl(const QUrl &url) + { +- for (Docset *docset : qAsConst(m_docsets)) { ++ for (Docset *docset : std::as_const(m_docsets)) { + if (docset->baseUrl().isParentOf(url)) + return docset; + } +@@ -226,7 +227,7 @@ void DocsetRegistry::_runQuery(const QString &query) + + const SearchQuery searchQuery = SearchQuery::fromString(query); + if (searchQuery.hasKeywords()) { +- for (Docset *docset : qAsConst(m_docsets)) { ++ for (Docset *docset : std::as_const(m_docsets)) { + if (searchQuery.hasKeywords(docset->keywords())) + enabledDocsets << docset; + } +diff --git a/src/libs/ui/docsetsdialog.cpp b/src/libs/ui/docsetsdialog.cpp +index 4e3788b..9cfc3fc 100644 +--- a/src/libs/ui/docsetsdialog.cpp ++++ b/src/libs/ui/docsetsdialog.cpp +@@ -47,6 +47,7 @@ + #include + + #include ++#include + + using namespace Zeal; + using namespace Zeal::WidgetUi; +@@ -687,7 +688,7 @@ QNetworkReply *DocsetsDialog::download(const QUrl &url) + + void DocsetsDialog::cancelDownloads() + { +- for (QNetworkReply *reply : qAsConst(m_replies)) { ++ for (QNetworkReply *reply : std::as_const(m_replies)) { + // Hide progress bar + QListWidgetItem *listItem + = ui->availableDocsetList->item(reply->property(ListItemIndexProperty).toInt()); +diff --git a/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp b/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp +index a40c772..b7b8378 100644 +--- a/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp ++++ b/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp +@@ -62,6 +62,8 @@ + #include + #endif + ++#include ++ + #include + #include + #include +@@ -152,7 +154,7 @@ bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativ + } + + bool failed = false; +- for (xcb_void_cookie_t cookie : qAsConst(xcbCookies)) { ++ for (xcb_void_cookie_t cookie : std::as_const(xcbCookies)) { + QScopedPointer error(xcb_request_check(xcbConnection, cookie)); + failed = !error.isNull(); + } diff --git a/zeal.spec b/zeal.spec index 2cd0e59..53ca46a 100644 --- a/zeal.spec +++ b/zeal.spec @@ -9,6 +9,7 @@ License: GPLv3+ URL: https://zealdocs.org/ Source: https://github.com/zealdocs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: 0001-apply-websettings.patch +Patch1: zeal-qasconst-deprecated.patch # We should use %%qt6_qtwebengine_arches provided by qt6-srpm-macros # but one of our dependency qt6-qtwebengine is available only From 46addfac75a67f1980b09c9f0bae199e72241994 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 29 Nov 2023 14:30:22 +0100 Subject: [PATCH 12/45] Rebuild (qt6) From 58584e6307483680f5cc069c9a2991136199ad10 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:02:42 +0000 Subject: [PATCH 13/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b321f2a40c3782ba7129721b5eb92ac55fc45c9c Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 16 Feb 2024 12:31:03 +0100 Subject: [PATCH 14/45] Rebuild (qt6) From 90f07a6c3c15b315f3e103c8e7a6e37d681febbe Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 4 Apr 2024 10:36:13 +0200 Subject: [PATCH 15/45] Rebuild (qt6) From aa66fa046a335259e13527d6c8657ac0b864d1c0 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 4 Apr 2024 14:56:00 +0200 Subject: [PATCH 16/45] Rebuild (qt6) From 4ad0816a6747d02fe521c78f76801a070c385efb Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 21 May 2024 22:12:28 +0200 Subject: [PATCH 17/45] Rebuild (qt6) From f4cc2e45d47bf1446666166e4541aaf92ea7725d Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 28 May 2024 23:36:48 +0200 Subject: [PATCH 18/45] Update to 0.7.1 (rhbz#2283580) --- .gitignore | 1 + sources | 2 +- zeal-qasconst-deprecated.patch | 126 --------------------------------- zeal.spec | 3 +- 4 files changed, 3 insertions(+), 129 deletions(-) delete mode 100644 zeal-qasconst-deprecated.patch diff --git a/.gitignore b/.gitignore index 4441fea..f5b2985 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /zeal-1cfa7c637f745be9d98777f06b4f8dec90892bf2.tar.gz /zeal-1cfa7c6.tar.gz /zeal-0.7.0.tar.gz +/zeal-0.7.1.tar.gz diff --git a/sources b/sources index ead26d6..89eaae5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeal-0.7.0.tar.gz) = 5980d521ee923e9ef009aafdf24c146f63de5a8dccac63078d1125e86f1f36503d9c1ca2dc1b1365be71e67abfc18f43c48c212a52340ecc96aac25db072047e +SHA512 (zeal-0.7.1.tar.gz) = 8d831aaf4d43e55c60b065beda59e7f8377c4aa778f22e4ddc81d025eeb2d90abe6ffd4e26918a61db374b97ba1236a41b55bce8916b22f55f7394fb266d7543 diff --git a/zeal-qasconst-deprecated.patch b/zeal-qasconst-deprecated.patch deleted file mode 100644 index 89e08db..0000000 --- a/zeal-qasconst-deprecated.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff --git a/src/libs/registry/docset.cpp b/src/libs/registry/docset.cpp -index 0c0dbb7..e82c9c9 100644 ---- a/src/libs/registry/docset.cpp -+++ b/src/libs/registry/docset.cpp -@@ -458,7 +458,7 @@ void Docset::loadSymbols(const QString &symbolType) const - // with it.first and it.second respectively pointing to the start and the end - // of the range of nodes having symbolType as key. It effectively represents a - // contiguous view over the nodes with a specified key. -- for (auto it = qAsConst(m_symbolStrings).equal_range(symbolType); it.first != it.second; ++it.first) { -+ for (auto it = std::as_const(m_symbolStrings).equal_range(symbolType); it.first != it.second; ++it.first) { - loadSymbols(symbolType, it.first.value()); - } - } -@@ -519,7 +519,7 @@ void Docset::createIndex() - } - - // Drop old indexes -- for (const QString &oldIndexName : qAsConst(oldIndexes)) { -+ for (const QString &oldIndexName : std::as_const(oldIndexes)) { - m_db->execute(indexDropQuery.arg(oldIndexName)); - } - -diff --git a/src/libs/registry/docsetmetadata.cpp b/src/libs/registry/docsetmetadata.cpp -index f08d891..76f9aa1 100644 ---- a/src/libs/registry/docsetmetadata.cpp -+++ b/src/libs/registry/docsetmetadata.cpp -@@ -33,6 +33,8 @@ - #include - #include - -+#include -+ - using namespace Zeal::Registry; - - DocsetMetadata::DocsetMetadata(const QJsonObject &jsonObject) -@@ -97,7 +99,7 @@ void DocsetMetadata::save(const QString &path, const QString &version) - - if (!m_urls.isEmpty()) { - QJsonArray urls; -- for (const QUrl &url : qAsConst(m_urls)) { -+ for (const QUrl &url : std::as_const(m_urls)) { - urls.append(url.toString()); - } - -diff --git a/src/libs/registry/docsetregistry.cpp b/src/libs/registry/docsetregistry.cpp -index 9776a19..8777474 100644 ---- a/src/libs/registry/docsetregistry.cpp -+++ b/src/libs/registry/docsetregistry.cpp -@@ -38,6 +38,7 @@ - - #include - #include -+#include - - using namespace Zeal::Registry; - -@@ -101,7 +102,7 @@ void DocsetRegistry::setFuzzySearchEnabled(bool enabled) - - m_isFuzzySearchEnabled = enabled; - -- for (Docset *docset : qAsConst(m_docsets)) { -+ for (Docset *docset : std::as_const(m_docsets)) { - docset->setFuzzySearchEnabled(enabled); - } - } -@@ -193,7 +194,7 @@ Docset *DocsetRegistry::docset(int index) const - - Docset *DocsetRegistry::docsetForUrl(const QUrl &url) - { -- for (Docset *docset : qAsConst(m_docsets)) { -+ for (Docset *docset : std::as_const(m_docsets)) { - if (docset->baseUrl().isParentOf(url)) - return docset; - } -@@ -226,7 +227,7 @@ void DocsetRegistry::_runQuery(const QString &query) - - const SearchQuery searchQuery = SearchQuery::fromString(query); - if (searchQuery.hasKeywords()) { -- for (Docset *docset : qAsConst(m_docsets)) { -+ for (Docset *docset : std::as_const(m_docsets)) { - if (searchQuery.hasKeywords(docset->keywords())) - enabledDocsets << docset; - } -diff --git a/src/libs/ui/docsetsdialog.cpp b/src/libs/ui/docsetsdialog.cpp -index 4e3788b..9cfc3fc 100644 ---- a/src/libs/ui/docsetsdialog.cpp -+++ b/src/libs/ui/docsetsdialog.cpp -@@ -47,6 +47,7 @@ - #include - - #include -+#include - - using namespace Zeal; - using namespace Zeal::WidgetUi; -@@ -687,7 +688,7 @@ QNetworkReply *DocsetsDialog::download(const QUrl &url) - - void DocsetsDialog::cancelDownloads() - { -- for (QNetworkReply *reply : qAsConst(m_replies)) { -+ for (QNetworkReply *reply : std::as_const(m_replies)) { - // Hide progress bar - QListWidgetItem *listItem - = ui->availableDocsetList->item(reply->property(ListItemIndexProperty).toInt()); -diff --git a/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp b/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp -index a40c772..b7b8378 100644 ---- a/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp -+++ b/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp -@@ -62,6 +62,8 @@ - #include - #endif - -+#include -+ - #include - #include - #include -@@ -152,7 +154,7 @@ bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativ - } - - bool failed = false; -- for (xcb_void_cookie_t cookie : qAsConst(xcbCookies)) { -+ for (xcb_void_cookie_t cookie : std::as_const(xcbCookies)) { - QScopedPointer error(xcb_request_check(xcbConnection, cookie)); - failed = !error.isNull(); - } diff --git a/zeal.spec b/zeal.spec index 53ca46a..9795141 100644 --- a/zeal.spec +++ b/zeal.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: zeal -Version: 0.7.0 +Version: 0.7.1 Release: %autorelease Summary: Offline documentation browser inspired by Dash @@ -9,7 +9,6 @@ License: GPLv3+ URL: https://zealdocs.org/ Source: https://github.com/zealdocs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: 0001-apply-websettings.patch -Patch1: zeal-qasconst-deprecated.patch # We should use %%qt6_qtwebengine_arches provided by qt6-srpm-macros # but one of our dependency qt6-qtwebengine is available only From 6a380c8f7d239517398f72922f23ccfecd802fe5 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 2 Jul 2024 13:24:45 +0200 Subject: [PATCH 19/45] Rebuild (qt6) From 3a3823d8e395a57dcedbf5cd7d9b482c80b70579 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:49:47 +0000 Subject: [PATCH 20/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 56dd4219b85ff47c4bf91eb8aaead88ac57d9c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 13:36:06 +0200 Subject: [PATCH 21/45] convert GPLv3+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- zeal.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zeal.spec b/zeal.spec index 9795141..5e03fb9 100644 --- a/zeal.spec +++ b/zeal.spec @@ -5,7 +5,8 @@ Version: 0.7.1 Release: %autorelease Summary: Offline documentation browser inspired by Dash -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later URL: https://zealdocs.org/ Source: https://github.com/zealdocs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: 0001-apply-websettings.patch From be59ca3b7391d841496720d5c0646e32b48aa0fe Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 9 Sep 2024 08:36:07 +0200 Subject: [PATCH 22/45] Update to 0.7.2 (rhbz#2310765) --- .gitignore | 1 + sources | 2 +- zeal.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f5b2985..858f23a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /zeal-1cfa7c6.tar.gz /zeal-0.7.0.tar.gz /zeal-0.7.1.tar.gz +/zeal-0.7.2.tar.gz diff --git a/sources b/sources index 89eaae5..355d0f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeal-0.7.1.tar.gz) = 8d831aaf4d43e55c60b065beda59e7f8377c4aa778f22e4ddc81d025eeb2d90abe6ffd4e26918a61db374b97ba1236a41b55bce8916b22f55f7394fb266d7543 +SHA512 (zeal-0.7.2.tar.gz) = 46a0a15a5dd8f1ee18c6b02f2b9c6fbc7cc2f2ddc24d668932d6cbd4bab39228c1f49b58cb6838ba37e92e5fa8f8ab353f5f2ac7083007843940ad075be71919 diff --git a/zeal.spec b/zeal.spec index 5e03fb9..a6150d1 100644 --- a/zeal.spec +++ b/zeal.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: zeal -Version: 0.7.1 +Version: 0.7.2 Release: %autorelease Summary: Offline documentation browser inspired by Dash From 9dd2242fa2032c44147d99d9c0c85cca202b3d7b Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 14 Oct 2024 19:34:43 +0200 Subject: [PATCH 23/45] Rebuild (qt6) From 78fd860ac297bb15ea621178d2da580217628feb Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 4 Dec 2024 09:30:58 +0100 Subject: [PATCH 24/45] Rebuild (qt6) From 0ce2fe41302b2aab3c522cbd7f42369d25ca7679 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:43:13 +0000 Subject: [PATCH 25/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From fa3efb01a9b78191d8d6e52fc05da96855d8262c Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 3 Feb 2025 08:07:07 +0100 Subject: [PATCH 26/45] Rebuild (qt6) From 3c5041c7b4ba265ae7b5d78cb9fcda52271dcdc9 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 25 Mar 2025 15:29:14 +0100 Subject: [PATCH 27/45] Rebuild (qt6) From 3003f6eca64cc3b1a9e7ed3c57f84907c39e63d4 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 28 Mar 2025 15:11:31 -0400 Subject: [PATCH 28/45] Use %qt6_qtwebengine_arches ppc64le is in the process of being enabled in QtWebEngine; using the macro will allow enablement in sync with that. --- zeal.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/zeal.spec b/zeal.spec index a6150d1..515f2d7 100644 --- a/zeal.spec +++ b/zeal.spec @@ -11,12 +11,7 @@ URL: https://zealdocs.org/ Source: https://github.com/zealdocs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: 0001-apply-websettings.patch -# We should use %%qt6_qtwebengine_arches provided by qt6-srpm-macros -# but one of our dependency qt6-qtwebengine is available only -# for aarch64 and x86_64. -# BZ for the macro: https://bugzilla.redhat.com/show_bug.cgi?id=2215703 -# Ticket about the arch supoort: https://bugreports.qt.io/browse/QTBUG-102143 -ExclusiveArch: aarch64 x86_64 +ExclusiveArch: %{qt6_qtwebengine_arches} BuildRequires: cmake(Qt6Core) >= 6.2.0 BuildRequires: cmake(Qt6Gui) From a4a23d08a086ccd8caa778ee0b90125c94a38bcd Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 4 Apr 2025 11:01:00 +0200 Subject: [PATCH 29/45] Rebuild (qt6) From 13641b0665732ca85ae1a229d77173fafd875b66 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 6 Jun 2025 09:17:25 +0200 Subject: [PATCH 30/45] Rebuild (qt6) From 6f694305e0225f8b74a1fc231016b403d2619723 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:16:56 +0000 Subject: [PATCH 31/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 6d232934b33bf1481fedaaaa61e201dd0e8a9a79 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 1 Sep 2025 10:32:07 +0200 Subject: [PATCH 32/45] Rebuild (qt6) From 5bbf8c76e6ab76d97dd94012e2d161faac960b5d Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 30 Sep 2025 06:47:05 +0200 Subject: [PATCH 33/45] Rebuild (qt6) From 299fd643af725206c7a84ae9d95bde27a28ebed6 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 30 Sep 2025 16:44:52 +0200 Subject: [PATCH 34/45] Fix build against Qt 6.10 --- zeal-fix-build-against-qt-6-10.patch | 39 ++++++++++++++++++++++++++++ zeal.spec | 1 + 2 files changed, 40 insertions(+) create mode 100644 zeal-fix-build-against-qt-6-10.patch diff --git a/zeal-fix-build-against-qt-6-10.patch b/zeal-fix-build-against-qt-6-10.patch new file mode 100644 index 0000000..3d815dd --- /dev/null +++ b/zeal-fix-build-against-qt-6-10.patch @@ -0,0 +1,39 @@ +diff --git a/src/libs/ui/docsetsdialog.cpp b/src/libs/ui/docsetsdialog.cpp +index 8c9fe63..bc35375 100644 +--- a/src/libs/ui/docsetsdialog.cpp ++++ b/src/libs/ui/docsetsdialog.cpp +@@ -360,8 +360,8 @@ void DocsetsDialog::downloadCompleted() + QTemporaryFile *tmpFile = m_tmpFiles[docsetName]; + if (!tmpFile) { + tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this); +- tmpFile->open(); +- m_tmpFiles.insert(docsetName, tmpFile); ++ if (tmpFile->open()) ++ m_tmpFiles.insert(docsetName, tmpFile); + } + + while (reply->bytesAvailable()) { +@@ -403,8 +403,8 @@ void DocsetsDialog::downloadProgress(qint64 received, qint64 total) + QTemporaryFile *tmpFile = m_tmpFiles[docsetName]; + if (!tmpFile) { + tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this); +- tmpFile->open(); +- m_tmpFiles.insert(docsetName, tmpFile); ++ if (tmpFile->open()) ++ m_tmpFiles.insert(docsetName, tmpFile); + } + + tmpFile->write(reply->read(received)); +diff --git a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt +index 476c2f5..e88ce73 100644 +--- a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt ++++ b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt +@@ -29,7 +29,7 @@ endif() + + add_library(QxtGlobalShortcut STATIC ${QxtGlobalShortcut_SOURCES}) + +-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui REQUIRED) ++find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui GuiPrivate REQUIRED) + target_link_libraries(QxtGlobalShortcut Qt${QT_VERSION_MAJOR}::Gui) + + if(APPLE) diff --git a/zeal.spec b/zeal.spec index 515f2d7..0b3f2e9 100644 --- a/zeal.spec +++ b/zeal.spec @@ -10,6 +10,7 @@ License: GPL-3.0-or-later URL: https://zealdocs.org/ Source: https://github.com/zealdocs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: 0001-apply-websettings.patch +Patch1: zeal-fix-build-against-qt-6-10.patch ExclusiveArch: %{qt6_qtwebengine_arches} From 9cc324763dd9d586f83cae04d5f22aeaa9d87fa5 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 8 Oct 2025 08:41:51 +0200 Subject: [PATCH 35/45] Rebuild (qt6) From 785b856062c966cbb567af1081c33bb00b92d8b7 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 21 Nov 2025 11:31:29 +0100 Subject: [PATCH 36/45] Rebuild (qt6) From 5cb58800bcd1957ee91105c72ab55cd392077dec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:06:54 +0000 Subject: [PATCH 37/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From f531e72be9938a4f0a7ae411455d130ff924337e Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 11 Feb 2026 09:22:02 +0100 Subject: [PATCH 38/45] Rebuild (qt6) From 7d59cf4797e4970391a3610b68c2ae95e6afe952 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Wed, 11 Mar 2026 17:21:18 +0000 Subject: [PATCH 39/45] Update to 0.8.0 upstream release - Resolves: rhbz#2443508 - Re-enable debuginfo generation - Enable Packit - Verified the SPDX license conversion Commit authored by Packit automation (https://packit.dev/) Signed-off-by: Michel Lind --- .gitignore | 1 + 0001-apply-websettings.patch | 6 ++--- README.packit | 3 +++ packit.yaml | 16 ++++++++++++ sources | 2 +- zeal-fix-build-against-qt-6-10.patch | 39 ---------------------------- zeal.spec | 6 +---- 7 files changed, 24 insertions(+), 49 deletions(-) create mode 100644 README.packit create mode 100644 packit.yaml delete mode 100644 zeal-fix-build-against-qt-6-10.patch diff --git a/.gitignore b/.gitignore index 858f23a..02fd935 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /zeal-0.7.0.tar.gz /zeal-0.7.1.tar.gz /zeal-0.7.2.tar.gz +/zeal-0.8.0.tar.gz diff --git a/0001-apply-websettings.patch b/0001-apply-websettings.patch index 48e585c..58228f8 100644 --- a/0001-apply-websettings.patch +++ b/0001-apply-websettings.patch @@ -1,9 +1,7 @@ -diff --git a/src/libs/ui/mainwindow.cpp b/src/libs/ui/mainwindow.cpp -index d217c54..56ce048 100644 --- a/src/libs/ui/mainwindow.cpp +++ b/src/libs/ui/mainwindow.cpp -@@ -194,7 +194,7 @@ MainWindow::MainWindow(Core::Application *app, QWidget *parent) - ui->splitter->restoreState(m_settings->verticalSplitterGeometry); +@@ -115,7 +115,7 @@ MainWindow::MainWindow(Core::Application + m_splitter->restoreState(m_settings->verticalSplitterGeometry); // Setup web settings. - auto webSettings = new Browser::Settings(m_settings, this); diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..5625fec --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 1.15.0. diff --git a/packit.yaml b/packit.yaml new file mode 100644 index 0000000..fdf84eb --- /dev/null +++ b/packit.yaml @@ -0,0 +1,16 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +copy_upstream_release_description: false + +jobs: +- job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + +- job: koji_build + trigger: commit + allowed_committers: ['packit'] + dist_git_branches: + - fedora-rawhide diff --git a/sources b/sources index 355d0f2..3bd0fc0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeal-0.7.2.tar.gz) = 46a0a15a5dd8f1ee18c6b02f2b9c6fbc7cc2f2ddc24d668932d6cbd4bab39228c1f49b58cb6838ba37e92e5fa8f8ab353f5f2ac7083007843940ad075be71919 +SHA512 (zeal-0.8.0.tar.gz) = d62712550dbb6d45528b176d4dbbbc0961eaebb0422a9938d75cc4de8575a7753059840dda358f7851fd2a3e5d4acad2faa15f0066becc1e4b81b77f47c423fe diff --git a/zeal-fix-build-against-qt-6-10.patch b/zeal-fix-build-against-qt-6-10.patch deleted file mode 100644 index 3d815dd..0000000 --- a/zeal-fix-build-against-qt-6-10.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/libs/ui/docsetsdialog.cpp b/src/libs/ui/docsetsdialog.cpp -index 8c9fe63..bc35375 100644 ---- a/src/libs/ui/docsetsdialog.cpp -+++ b/src/libs/ui/docsetsdialog.cpp -@@ -360,8 +360,8 @@ void DocsetsDialog::downloadCompleted() - QTemporaryFile *tmpFile = m_tmpFiles[docsetName]; - if (!tmpFile) { - tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this); -- tmpFile->open(); -- m_tmpFiles.insert(docsetName, tmpFile); -+ if (tmpFile->open()) -+ m_tmpFiles.insert(docsetName, tmpFile); - } - - while (reply->bytesAvailable()) { -@@ -403,8 +403,8 @@ void DocsetsDialog::downloadProgress(qint64 received, qint64 total) - QTemporaryFile *tmpFile = m_tmpFiles[docsetName]; - if (!tmpFile) { - tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this); -- tmpFile->open(); -- m_tmpFiles.insert(docsetName, tmpFile); -+ if (tmpFile->open()) -+ m_tmpFiles.insert(docsetName, tmpFile); - } - - tmpFile->write(reply->read(received)); -diff --git a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt -index 476c2f5..e88ce73 100644 ---- a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt -+++ b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt -@@ -29,7 +29,7 @@ endif() - - add_library(QxtGlobalShortcut STATIC ${QxtGlobalShortcut_SOURCES}) - --find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui REQUIRED) -+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui GuiPrivate REQUIRED) - target_link_libraries(QxtGlobalShortcut Qt${QT_VERSION_MAJOR}::Gui) - - if(APPLE) diff --git a/zeal.spec b/zeal.spec index 0b3f2e9..008b0ab 100644 --- a/zeal.spec +++ b/zeal.spec @@ -1,16 +1,12 @@ -%global debug_package %{nil} - Name: zeal -Version: 0.7.2 +Version: 0.8.0 Release: %autorelease Summary: Offline documentation browser inspired by Dash -# Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later URL: https://zealdocs.org/ Source: https://github.com/zealdocs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: 0001-apply-websettings.patch -Patch1: zeal-fix-build-against-qt-6-10.patch ExclusiveArch: %{qt6_qtwebengine_arches} From 927a17e5c439336fc0ec6202a41c865d79de5d19 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 2 Apr 2026 21:25:51 +0200 Subject: [PATCH 40/45] Rebuild (qt6) From 33a7ffc6700814fb3b39f6f0a7ef1523e205b5a2 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 16 Apr 2026 12:34:47 +0200 Subject: [PATCH 41/45] Rebuild (qt6) From 789542316c79ae68b00d4ae58eb15d1b9027566a Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Fri, 17 Apr 2026 22:04:59 +0100 Subject: [PATCH 42/45] Update to 0.8.1 upstream release - Resolves: rhbz#2455152 - Remove upstreamed patch Signed-off-by: Michel Lind --- .gitignore | 1 + 0001-apply-websettings.patch | 11 ----------- README.packit | 2 +- sources | 2 +- zeal.spec | 3 +-- 5 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 0001-apply-websettings.patch diff --git a/.gitignore b/.gitignore index 02fd935..3266caa 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /zeal-0.7.1.tar.gz /zeal-0.7.2.tar.gz /zeal-0.8.0.tar.gz +/zeal-0.8.1.tar.gz diff --git a/0001-apply-websettings.patch b/0001-apply-websettings.patch deleted file mode 100644 index 58228f8..0000000 --- a/0001-apply-websettings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/libs/ui/mainwindow.cpp -+++ b/src/libs/ui/mainwindow.cpp -@@ -115,7 +115,7 @@ MainWindow::MainWindow(Core::Application - m_splitter->restoreState(m_settings->verticalSplitterGeometry); - - // Setup web settings. -- auto webSettings = new Browser::Settings(m_settings, this); -+ new Browser::Settings(m_settings, this); - - // Setup web bridge. - m_webBridge = new Browser::WebBridge(this); diff --git a/README.packit b/README.packit index 5625fec..ef3579c 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.15.0. +The file was generated using packit 1.15.2.post1.dev4+g26d226709. diff --git a/sources b/sources index 3bd0fc0..de702f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeal-0.8.0.tar.gz) = d62712550dbb6d45528b176d4dbbbc0961eaebb0422a9938d75cc4de8575a7753059840dda358f7851fd2a3e5d4acad2faa15f0066becc1e4b81b77f47c423fe +SHA512 (zeal-0.8.1.tar.gz) = fcca8b5e84801bbbab43832d60347bb3d17f3e83d35893cedd3f3ca98588ea7b91fad8c9602edd96bebaa56ceedbc2146f48b3c394b69e5028a200162ee2787c diff --git a/zeal.spec b/zeal.spec index 008b0ab..6858f04 100644 --- a/zeal.spec +++ b/zeal.spec @@ -1,12 +1,11 @@ Name: zeal -Version: 0.8.0 +Version: 0.8.1 Release: %autorelease Summary: Offline documentation browser inspired by Dash License: GPL-3.0-or-later URL: https://zealdocs.org/ Source: https://github.com/zealdocs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-apply-websettings.patch ExclusiveArch: %{qt6_qtwebengine_arches} From ef5ea0581624e9591790a199b02a68ebf6c8ac82 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 13 May 2026 21:23:51 +0200 Subject: [PATCH 43/45] Rebuild (qt6) From 264eefc00a3fd7092d271f92bea0192a624286d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:39:22 +0000 Subject: [PATCH 44/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From 99d87ce46854fa646d06f82a1ad80d456b8ee49c Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 25 Aug 2026 11:12:52 +0200 Subject: [PATCH 45/45] Rebuild (qt6)