3 Commits

Author SHA256 Message Date
1a0cffea45 Accepting request 1312885 from devel:tools
- Fixes for Qt 6.10:
  * Patch fix-qt-6.10.patch
  * Thanks to Christophe Marin for simple patch example
  * As well as to JaimeMF for inspiration on another fix
    https://github.com/zealdocs/zeal/pull/1728/files

OBS-URL: https://build.opensuse.org/request/show/1312885
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zeal?expand=0&rev=15
2025-10-22 10:16:37 +00:00
c96ca8b4a7 * Patch fix-qt-6.10.patch
OBS-URL: https://build.opensuse.org/package/show/devel:tools/zeal?expand=0&rev=42
2025-10-21 19:19:36 +00:00
682ee12164 - Fixes for Qt 6.10:
* Thanks to Christophe Marin for simple patch example
  * As well as to JaimeMF for inspiration on another fix
    https://github.com/zealdocs/zeal/pull/1728/files
- Fixes for Qt 6.10:
  * Thanks to Christophe Marin for simple patch example
  * As well as to JaimeMF for inspiration on another fix
    https://github.com/zealdocs/zeal/pull/1728/files

OBS-URL: https://build.opensuse.org/package/show/devel:tools/zeal?expand=0&rev=41
2025-10-21 19:10:50 +00:00
3 changed files with 71 additions and 1 deletions

60
fix-qt-6.10.patch Normal file
View File

@@ -0,0 +1,60 @@
diff -rubN zeal-0.7.2/CMakeLists.txt zeal-0.7.2-patched/CMakeLists.txt
--- zeal-0.7.2/CMakeLists.txt 2024-09-08 11:33:39.000000000 -0400
+++ zeal-0.7.2-patched/CMakeLists.txt 2025-10-17 17:43:48.995946922 -0400
@@ -27,6 +27,10 @@
set(QT_MINIMUM_VERSION 6.2.0)
endif()
+IF(Qt6Core_VERSION VERSION_GREATER_EQUAL 6.10)
+ FIND_PACKAGE(Qt6 REQUIRED COMPONENTS GuiPrivate)
+ENDIF()
+
if(NOT QT_FOUND)
find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core)
set(QT_MINIMUM_VERSION 5.9.5)
diff -rubN zeal-0.7.2/src/libs/ui/docsetsdialog.cpp zeal-0.7.2-patched/src/libs/ui/docsetsdialog.cpp
--- zeal-0.7.2/src/libs/ui/docsetsdialog.cpp 2024-09-08 11:33:39.000000000 -0400
+++ zeal-0.7.2-patched/src/libs/ui/docsetsdialog.cpp 2025-10-17 18:45:17.473187967 -0400
@@ -360,7 +360,8 @@
QTemporaryFile *tmpFile = m_tmpFiles[docsetName];
if (!tmpFile) {
tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this);
- tmpFile->open();
+ if (!tmpFile->open())
+ return;
m_tmpFiles.insert(docsetName, tmpFile);
}
@@ -403,7 +404,8 @@
QTemporaryFile *tmpFile = m_tmpFiles[docsetName];
if (!tmpFile) {
tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this);
- tmpFile->open();
+ if (!tmpFile->open())
+ return;
m_tmpFiles.insert(docsetName, tmpFile);
}
diff -rubN zeal-0.7.2/src/libs/ui/qxtglobalshortcut/CMakeLists.txt zeal-0.7.2-patched/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
--- zeal-0.7.2/src/libs/ui/qxtglobalshortcut/CMakeLists.txt 2024-09-08 11:33:39.000000000 -0400
+++ zeal-0.7.2-patched/src/libs/ui/qxtglobalshortcut/CMakeLists.txt 2025-10-17 18:05:38.054568685 -0400
@@ -32,6 +32,10 @@
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui REQUIRED)
target_link_libraries(QxtGlobalShortcut Qt${QT_VERSION_MAJOR}::Gui)
+IF(Qt6Core_VERSION VERSION_GREATER_EQUAL 6.10)
+ FIND_PACKAGE(Qt6 REQUIRED COMPONENTS GuiPrivate)
+ENDIF()
+
if(APPLE)
find_library(CARBON_LIBRARY Carbon)
target_link_libraries(QxtGlobalShortcut ${CARBON_LIBRARY})
@@ -42,7 +46,7 @@
find_package(Qt5 COMPONENTS X11Extras REQUIRED)
target_link_libraries(QxtGlobalShortcut Qt5::X11Extras)
else()
- target_link_libraries(QxtGlobalShortcut Qt${QT_VERSION_MAJOR}::GuiPrivate)
+ target_link_libraries(QxtGlobalShortcut Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::GuiPrivate)
endif()
find_package(ECM REQUIRED NO_MODULE)

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Oct 21 15:40:08 UTC 2025 - Holden Fried <holden@opensuse.org>
- Fixes for Qt 6.10:
* Patch fix-qt-6.10.patch
* Thanks to Christophe Marin for simple patch example
* As well as to JaimeMF for inspiration on another fix
https://github.com/zealdocs/zeal/pull/1728/files
-------------------------------------------------------------------
Sat Sep 21 15:26:23 UTC 2024 - andrea.manzini@suse.com

View File

@@ -1,7 +1,7 @@
#
# spec file for package zeal
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,6 +30,7 @@ Source0: %{name}-%{version}.tar.xz
Source9: zeal.1
# PATCH-FIX-UPSTREAM zeal-cmake-find-qt-components.patch gh#zealdocs/zeal#1643 badshah400@gmail.com -- Explicitly find necessary Qt6 components to fix build with Qt 6.7.2
Patch0: zeal-cmake-find-qt-components.patch
Patch1: fix-qt-6.10.patch
BuildRequires: cmake
BuildRequires: extra-cmake-modules
BuildRequires: fdupes