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-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 9776570..7cbfbe1 100644 --- a/zeal.spec +++ b/zeal.spec @@ -2,13 +2,14 @@ Name: zeal Version: 0.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Offline documentation browser inspired by Dash 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 @@ -79,6 +80,9 @@ 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) @@ -197,3 +201,4 @@ Resolves: rhbz#1923599 * Thu Sep 24 2015 Michel Alexandre Salim - 0.1.1-1 - Initial package +