Skip to content

Commit 896f17f

Browse files
committed
depends: qt: drop unneeded patches
1 parent fa6d0fc commit 896f17f

File tree

6 files changed

+1
-128
lines changed

6 files changed

+1
-128
lines changed

contrib/depends/packages/qt.mk

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,15 @@ $(package)_sha256_hash=ead4623bcb54a32257c5b3e3a5aec6d16ec96f4cda58d2e003f5a0c16
77
$(package)_darwin_dependencies=openssl native_qt
88
$(package)_mingw32_dependencies=openssl native_qt
99
$(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
10-
$(package)_patches += guix_cross_lib_path.patch
11-
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
1210
$(package)_patches += qtmultimedia-fixes.patch
1311
$(package)_patches += rcc_hardcode_timestamp.patch
1412
$(package)_patches += root_CMakeLists.txt
1513
$(package)_patches += v4l2.patch
1614
$(package)_patches += windows_func_fix.patch
1715
$(package)_patches += libxau-fix.patch
1816
$(package)_patches += toolchain.cmake
19-
$(package)_patches += revert-macOS-Silence-warning-about-supporting-secure.patch
2017
$(package)_patches += no-resonance-audio.patch
2118
$(package)_patches += fix_static_qt_darwin_camera_permissions.patch
22-
$(package)_patches += qtmultimedia_macos_fix_include.patch
2319
#$(package)_patches += fix-static-fontconfig-static-linking.patch
2420

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

209205
define $(package)_preprocess_cmds
210206
cp $($(package)_patch_dir)/root_CMakeLists.txt CMakeLists.txt && \
211-
patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
212207
patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
213-
patch -p1 -i $($(package)_patch_dir)/guix_cross_lib_path.patch && \
214208
patch -p1 -i $($(package)_patch_dir)/windows_func_fix.patch && \
215209
mv $($(package)_patch_dir)/toolchain.cmake . && \
216210
sed -i -e 's|@cmake_system_name@|$($(host_os)_cmake_system)|' \
@@ -223,12 +217,10 @@ define $(package)_preprocess_cmds
223217
toolchain.cmake && \
224218
cd qtbase && \
225219
patch -p1 -i $($(package)_patch_dir)/libxau-fix.patch && \
226-
patch -p1 -i $($(package)_patch_dir)/revert-macOS-Silence-warning-about-supporting-secure.patch && \
227220
patch -p1 -i $($(package)_patch_dir)/fix_static_qt_darwin_camera_permissions.patch && \
228221
cd ../qtmultimedia && \
229222
patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
230-
patch -p1 -i $($(package)_patch_dir)/v4l2.patch && \
231-
patch -p1 -i $($(package)_patch_dir)/qtmultimedia_macos_fix_include.patch
223+
patch -p1 -i $($(package)_patch_dir)/v4l2.patch
232224
endef
233225

234226

contrib/depends/patches/qt/guix_cross_lib_path.patch

Lines changed: 0 additions & 17 deletions
This file was deleted.

contrib/depends/patches/qt/qtbase-moc-ignore-gcc-macro.patch

Lines changed: 0 additions & 17 deletions
This file was deleted.

contrib/depends/patches/qt/qtmultimedia_macos_fix_include.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

contrib/depends/patches/qt/revert-macOS-Silence-warning-about-supporting-secure.patch

Lines changed: 0 additions & 42 deletions
This file was deleted.

contrib/depends/patches/qt/xcb-util-image-fix.patch

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)