From efb5a1441b93686ec896dbba579180416b713f3b Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 6 Oct 2023 13:37:14 +0200 Subject: [PATCH 1/6] Rebuild (qt6) --- zeal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeal.spec b/zeal.spec index bcaa6cd..9776570 100644 --- a/zeal.spec +++ b/zeal.spec @@ -2,7 +2,7 @@ Name: zeal Version: 0.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Offline documentation browser inspired by Dash License: GPLv3+ @@ -79,6 +79,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.z %changelog +* Fri Oct 06 2023 Jan Grulich - 0.7.0-2 +- Rebuild (qt6) + * Sun Sep 24 2023 Lumír Balhar - 0.7.0-1 - Update to 0.7.0 (rhbz#2240281) From b92bd396504b520195018880e4daf66a0a8748f0 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 8 Nov 2023 15:32:14 +0100 Subject: [PATCH 2/6] Convert to %autorelease and %autochangelog This change was ignored when merging so this is making stable branches again synced with Rawhide. --- zeal.spec | 125 +----------------------------------------------------- 1 file changed, 2 insertions(+), 123 deletions(-) diff --git a/zeal.spec b/zeal.spec index 7cbfbe1..53ca46a 100644 --- a/zeal.spec +++ b/zeal.spec @@ -2,7 +2,7 @@ Name: zeal Version: 0.7.0 -Release: 3%{?dist} +Release: %autorelease Summary: Offline documentation browser inspired by Dash License: GPLv3+ @@ -80,125 +80,4 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.z %changelog -* Mon Nov 06 2023 Jan Grulich - 0.7.0-3 -- Rebuild (qt6) - -* Fri Oct 06 2023 Jan Grulich - 0.7.0-2 -- Rebuild (qt6) - -* 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 60ac18c3b78bc53cb6b8aa49f7b7b58459aa9251 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 4 Apr 2024 10:36:13 +0200 Subject: [PATCH 3/6] Rebuild (qt6) From a96df4465b2a26067f59e572f9205bec57574822 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 4 Apr 2024 14:56:00 +0200 Subject: [PATCH 4/6] Rebuild (qt6) From 6d549305b553064b1ad3b1d96ea44bf066bf743f Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 21 May 2024 22:12:28 +0200 Subject: [PATCH 5/6] Rebuild (qt6) From 7eac9df0c45a1ef6a3e22290e10eeed83e50cf64 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 28 May 2024 23:36:48 +0200 Subject: [PATCH 6/6] 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