Accepting request 1179557 from devel:tools

OBS-URL: https://build.opensuse.org/request/show/1179557
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zeal?expand=0&rev=12

_service

@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="exclude">.git</param>
     <param name="versionformat">@PARENT_TAG@</param>
-    <param name="revision">v0.7.0</param>
+    <param name="revision">v0.7.1</param>
     <param name="match-tag">*</param>
     <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
     <param name="versionrewrite-replacement">\1</param>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/zealdocs/zeal.git</param>
-              <param name="changesrevision">90ad776e83f182221cafd329f2e58cf0621ea3f1</param></service></servicedata>
+              <param name="changesrevision">7f938cf4e87b22abc5efd4155b78ea8127eefc4b</param></service></servicedata>

zeal-0.7.0.tar.xz

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

zeal-0.7.1.tar.xz

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

zeal-deprecate-qAsConst.patch

@@ -1,107 +0,0 @@
-From 9630cc94c155d87295e51b41fbab2bd5798f8229 Mon Sep 17 00:00:00 2001
-From: Nick Cao <nickcao@nichi.co>
-Date: Sun, 29 Oct 2023 02:50:40 -0400
-Subject: [PATCH] refactor: replace deprecated qAsConst with std::as_const()
- (#1565)
-
-Reference: https://github.com/qt/qtbase/blob/v6.6.0/src/corelib/global/qttypetraits.h#L32
----
- src/libs/registry/docset.cpp                            | 4 ++--
- src/libs/registry/docsetmetadata.cpp                    | 2 +-
- src/libs/registry/docsetregistry.cpp                    | 6 +++---
- src/libs/ui/docsetsdialog.cpp                           | 2 +-
- src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp | 2 +-
- 5 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/libs/registry/docset.cpp b/src/libs/registry/docset.cpp
-index 0c0dbb72..e82c9c9b 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 0678a130..5144e2fe 100644
---- a/src/libs/registry/docsetmetadata.cpp
-+++ b/src/libs/registry/docsetmetadata.cpp
-@@ -97,7 +97,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 9776a19a..17be79ea 100644
---- a/src/libs/registry/docsetregistry.cpp
-+++ b/src/libs/registry/docsetregistry.cpp
-@@ -101,7 +101,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 +193,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 +226,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 4e3788bb..18d0409c 100644
---- a/src/libs/ui/docsetsdialog.cpp
-+++ b/src/libs/ui/docsetsdialog.cpp
-@@ -687,7 +687,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 a40c7720..7a832ad2 100644
---- a/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp
-+++ b/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp
-@@ -152,7 +152,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<xcb_generic_error_t, QScopedPointerPodDeleter> error(xcb_request_check(xcbConnection, cookie));
-         failed = !error.isNull();
-     }

zeal.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Jun 08 09:14:14 UTC 2024 - andrea.manzini@suse.com
+
+- Update to version 0.7.1:
+  * refactor: replace deprecated qAsConst with std::as_const() (#1565)
+  * fix(registry): save non-zero docset revision in meta.json
+  * fix(browser): send key events to web view's focus proxy
+  * fix(ui): use async selection in search edit
+  * fix(ui): add tool tip when global shortcuts are not supported
+- remove patch zeal-deprecate-qAsConst.patch as already merged in upstream
+
 -------------------------------------------------------------------
 Thu Nov  9 09:40:47 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
 

zeal.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package zeal
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %global optflags %{optflags} -Wno-unused-variable
 
 Name:           zeal
-Version:        0.7.0
+Version:        0.7.1
 Release:        0
 Summary:        Offline API documentation browser
 License:        GPL-3.0-only
@@ -28,8 +28,6 @@ URL:            https://zealdocs.org
 Source0:        %{name}-%{version}.tar.xz
 # `help2man zeal > zeal.1` can't be run without X started.
 Source9:        zeal.1
-# PATCH-FIX-UPSTREAM zeal-deprecate-qAsConst.patch gh#zealdocs/zeal#1565 badshah400@gmail.com --  replace deprecated qAsConst with std::as_const()
-Patch0:         https://github.com/zealdocs/zeal/commit/9630cc94c155d87295e51b41fbab2bd5798f8229.patch#/%{name}-deprecate-qAsConst.patch
 BuildRequires:  cmake
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
@@ -49,8 +47,8 @@ BuildRequires:  pkgconfig(xcb-keysyms)
 Requires:       libQt6Sql6 >= 6.2.0
 Requires(post): hicolor-icon-theme
 Requires(post): update-desktop-files
-Requires(postun):hicolor-icon-theme
+Requires(postun): hicolor-icon-theme
-Requires(postun):update-desktop-files
+Requires(postun): update-desktop-files
 
 %description
 Zeal is an offline API documentation browser inspired by Dash