From 8f5e21b33028aa83b749f0d583c1b5937bab3707 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Wed, 18 Dec 2024 13:02:44 -0800 Subject: [PATCH 1/5] Rebuild (qt6) From 6ed7563be9033fa7a60245ba6bf283bc72659d31 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 28 Mar 2025 15:11:31 -0400 Subject: [PATCH 2/5] Use %qt6_qtwebengine_arches ppc64le is in the process of being enabled in QtWebEngine; using the macro will allow enablement in sync with that. (cherry picked from commit 3003f6eca64cc3b1a9e7ed3c57f84907c39e63d4) --- 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 6bb581109066705319cac9223fbd4989d825649a Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 30 Sep 2025 16:44:52 +0200 Subject: [PATCH 3/5] Fix build against Qt 6.10 (cherry picked from commit 299fd643af725206c7a84ae9d95bde27a28ebed6) --- 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 8859cac12ae6ae909b37e5d75791119bf5bce3e7 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Wed, 11 Mar 2026 17:21:18 +0000 Subject: [PATCH 4/5] 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 (cherry picked from commit 7d59cf4797e4970391a3610b68c2ae95e6afe952) --- .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 e7aa68edf3216e908feb9171f4454bcb20dc495b Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Fri, 17 Apr 2026 22:04:59 +0100 Subject: [PATCH 5/5] Update to 0.8.1 upstream release - Resolves: rhbz#2455152 - Remove upstreamed patch Signed-off-by: Michel Lind (cherry picked from commit 789542316c79ae68b00d4ae58eb15d1b9027566a) --- .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}