Compare commits

..

3 commits

Author SHA1 Message Date
Jan Grulich
b92bd39650 Convert to %autorelease and %autochangelog
This change was ignored when merging so this is making stable branches
again synced with Rawhide.
2023-11-08 15:32:14 +01:00
Jan Grulich
ebc95b5dd1 Merge branch 'rawhide' into f39 2023-11-06 13:21:33 +01:00
Jan Grulich
efb5a1441b Rebuild (qt6) 2023-10-06 13:37:14 +02:00
7 changed files with 153 additions and 28 deletions

4
.gitignore vendored
View file

@ -4,7 +4,3 @@
/zeal-1cfa7c637f745be9d98777f06b4f8dec90892bf2.tar.gz
/zeal-1cfa7c6.tar.gz
/zeal-0.7.0.tar.gz
/zeal-0.7.1.tar.gz
/zeal-0.7.2.tar.gz
/zeal-0.8.0.tar.gz
/zeal-0.8.1.tar.gz

View file

@ -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);

View file

@ -1,3 +0,0 @@
This repository is maintained by packit.
https://packit.dev/
The file was generated using packit 1.15.2.post1.dev4+g26d226709.

View file

@ -1,16 +0,0 @@
# 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

View file

@ -1 +1 @@
SHA512 (zeal-0.8.1.tar.gz) = fcca8b5e84801bbbab43832d60347bb3d17f3e83d35893cedd3f3ca98588ea7b91fad8c9602edd96bebaa56ceedbc2146f48b3c394b69e5028a200162ee2787c
SHA512 (zeal-0.7.0.tar.gz) = 5980d521ee923e9ef009aafdf24c146f63de5a8dccac63078d1125e86f1f36503d9c1ca2dc1b1365be71e67abfc18f43c48c212a52340ecc96aac25db072047e

View file

@ -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 <QVariant>
#include <QXmlStreamReader>
+#include <utility>
+
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 <functional>
#include <future>
+#include <utility>
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 <QUrl>
#include <memory>
+#include <utility>
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 <QtGui/private/qtx11extras_p.h>
#endif
+#include <utility>
+
#include <X11/Xlib.h>
#include <xcb/xcb.h>
#include <xcb/xcb_keysyms.h>
@@ -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<xcb_generic_error_t, QScopedPointerPodDeleter> error(xcb_request_check(xcbConnection, cookie));
failed = !error.isNull();
}

View file

@ -1,13 +1,22 @@
%global debug_package %{nil}
Name: zeal
Version: 0.8.1
Version: 0.7.0
Release: %autorelease
Summary: Offline documentation browser inspired by Dash
License: GPL-3.0-or-later
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
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)