depends: qt: drop unneeded patches

2026-10-17 07:11:29 +02:00 · 2025-11-12 16:26:14 +01:00
parent fa6d0fc830
commit 896f17f477
6 changed files with 1 additions and 128 deletions
@@ -7,8 +7,6 @@ $(package)_sha256_hash=ead4623bcb54a32257c5b3e3a5aec6d16ec96f4cda58d2e003f5a0c16
 $(package)_darwin_dependencies=openssl native_qt
 $(package)_mingw32_dependencies=openssl native_qt
 $(package)_linux_dependencies=openssl native_qt freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm libxcb_util_cursor dbus wayland native_wayland
-$(package)_patches += guix_cross_lib_path.patch
-$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
 $(package)_patches += qtmultimedia-fixes.patch
 $(package)_patches += rcc_hardcode_timestamp.patch
 $(package)_patches += root_CMakeLists.txt
@@ -16,10 +14,8 @@ $(package)_patches += v4l2.patch
 $(package)_patches += windows_func_fix.patch
 $(package)_patches += libxau-fix.patch
 $(package)_patches += toolchain.cmake
-$(package)_patches += revert-macOS-Silence-warning-about-supporting-secure.patch
 $(package)_patches += no-resonance-audio.patch
 $(package)_patches += fix_static_qt_darwin_camera_permissions.patch
-$(package)_patches += qtmultimedia_macos_fix_include.patch
 #$(package)_patches += fix-static-fontconfig-static-linking.patch

 $(package)_qttools_file_name=qttools-$($(package)_suffix)
@@ -208,9 +204,7 @@ endef

 define $(package)_preprocess_cmds
  cp $($(package)_patch_dir)/root_CMakeLists.txt CMakeLists.txt && \
-  patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
  patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
-  patch -p1 -i $($(package)_patch_dir)/guix_cross_lib_path.patch && \
  patch -p1 -i $($(package)_patch_dir)/windows_func_fix.patch && \
  mv $($(package)_patch_dir)/toolchain.cmake . && \
  sed -i -e 's|@cmake_system_name@|$($(host_os)_cmake_system)|' \
@@ -223,12 +217,10 @@ define $(package)_preprocess_cmds
      toolchain.cmake && \
  cd qtbase && \
  patch -p1 -i $($(package)_patch_dir)/libxau-fix.patch && \
-  patch -p1 -i $($(package)_patch_dir)/revert-macOS-Silence-warning-about-supporting-secure.patch && \
  patch -p1 -i $($(package)_patch_dir)/fix_static_qt_darwin_camera_permissions.patch && \
  cd ../qtmultimedia && \
  patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
-  patch -p1 -i $($(package)_patch_dir)/v4l2.patch && \
-  patch -p1 -i $($(package)_patch_dir)/qtmultimedia_macos_fix_include.patch
+  patch -p1 -i $($(package)_patch_dir)/v4l2.patch
 endef


@@ -1,17 +0,0 @@
-Facilitate guix building with CROSS_LIBRARY_PATH
-
-See discussion in https://github.com/bitcoin/bitcoin/pull/15277.
-
--- a/qtbase/mkspecs/features/toolchain.prf
-+++ b/qtbase/mkspecs/features/toolchain.prf
-@@ -236,8 +236,8 @@ isEmpty($${target_prefix}.INCDIRS) {
-             add_libraries = false
-             for (line, output) {
-                 line ~= s/^[ \\t]*//  # remove leading spaces
-                contains(line, "LIBRARY_PATH=.*") {
-                    line ~= s/^LIBRARY_PATH=//  # remove leading LIBRARY_PATH=
-+                contains(line, "(CROSS_)?LIBRARY_PATH=.*") {
-+                    line ~= s/^(CROSS_)?LIBRARY_PATH=//  # remove leading (CROSS_)?LIBRARY_PATH=
-                     equals(QMAKE_HOST.os, Windows): \
-                         paths = $$split(line, ;)
-                     else: \
@@ -1,17 +0,0 @@
-The moc executable loops through headers on CPLUS_INCLUDE_PATH and stumbles
-on the GCC internal _GLIBCXX_VISIBILITY macro.  Tell it to ignore it as it is
-not supposed to be looking there to begin with.
-
-Upstream report: https://bugreports.qt.io/browse/QTBUG-83160
-
-diff --git a/qtbase/src/tools/moc/main.cpp b/qtbase/src/tools/moc/main.cpp
--- a/qtbase/src/tools/moc/main.cpp
-+++ b/qtbase/src/tools/moc/main.cpp
-@@ -197,6 +197,7 @@ int runMoc(int argc, char **argv)
-     dummyVariadicFunctionMacro.arguments += Symbol(0, PP_IDENTIFIER, "__VA_ARGS__");
-     pp.macros["__attribute__"] = dummyVariadicFunctionMacro;
-     pp.macros["__declspec"] = dummyVariadicFunctionMacro;
-+    pp.macros["_GLIBCXX_VISIBILITY"] = dummyVariadicFunctionMacro;
- 
-     QString filename;
-     QString output;
@@ -1,12 +0,0 @@
-diff --git a/src/plugins/multimedia/darwin/mediaplayer/avfdisplaylink_p.h b/src/plugins/multimedia/darwin/mediaplayer/avfdisplaylink_p.h
-index 113d37a3e..d2c608443 100644
--- a/src/plugins/multimedia/darwin/mediaplayer/avfdisplaylink_p.h
-+++ b/src/plugins/multimedia/darwin/mediaplayer/avfdisplaylink_p.h
-@@ -25,6 +25,7 @@
- #endif
- 
- #include <optional>
-+#include <mutex>
- 
- QT_BEGIN_NAMESPACE
- 
@@ -1,42 +0,0 @@
-From 06cbaff877b0a5fc7e093494ee76eb32df31443f Mon Sep 17 00:00:00 2001
-From: tobtoht <tob@featherwallet.org>
-Date: Mon, 27 Nov 2023 23:36:07 +0200
-Subject: [PATCH] Revert "macOS: Silence warning about supporting secure state
- restoration"
-
-This reverts commit 546dae9285fe97defdab73437d6ae2bf19b806d8.
---
- .../cocoa/qcocoaapplicationdelegate.mm          | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
-index 581777f240..6e5bcc01af 100644
--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
-+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
-@@ -346,23 +346,6 @@ QT_USE_NAMESPACE
-     else
-         QWindowSystemInterface::handleFileOpenEvent(qurlString);
- }
-
-- (BOOL)applicationSupportsSecureRestorableState:(NSApplication *)application
-{
-    if (@available(macOS 12, *)) {
-        if ([reflectionDelegate respondsToSelector:_cmd])
-            return [reflectionDelegate applicationSupportsSecureRestorableState:application];
-    }
-
-    // We don't support or implement state restorations via the AppKit
-    // state restoration APIs, but if we did, we would/should support
-    // secure state restoration. This is the default for apps linked
-    // against the macOS 14 SDK, but as we target versions below that
-    // as well we need to return YES here explicitly to silence a runtime
-    // warning.
-    return YES;
-}
-
- @end
- 
- @implementation QCocoaApplicationDelegate (Menus)
-- 
-2.43.0
-
@@ -1,31 +0,0 @@
-undefined reference to `xcb_aux_create_gc'
-
-diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
-index dc60289401..703f7739d8 100644
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
-+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
-@@ -108,7 +108,6 @@ set(XCB_known_components
-     EWMH
-     GLX
-     ICCCM
-    IMAGE
-     KEYSYMS
-     PRESENT
-     RANDR
-@@ -118,6 +117,7 @@ set(XCB_known_components
-     SCREENSAVER
-     SYNC
-     UTIL
-+    IMAGE
-     XEVIE
-     XF86DRI
-     XINERAMA
-@@ -142,7 +142,7 @@ endforeach()
- set(XCB_XCB_component_deps)
- set(XCB_COMPOSITE_component_deps XCB XFIXES)
- set(XCB_DAMAGE_component_deps XCB XFIXES)
-set(XCB_IMAGE_component_deps XCB SHM)
-+set(XCB_IMAGE_component_deps XCB SHM UTIL)
- set(XCB_RENDERUTIL_component_deps XCB RENDER)
- set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
- set(XCB_XVMC_component_deps XCB XV)