mirror of
https://github.com/termux-pacman/termux-packages.git
synced 2026-02-16 23:01:07 +00:00
6cfbbb430a
Rebase patch file after removal of cmake/templates/android-deployment.json.in.
db0d4a1690
36 lines
1.7 KiB
Diff
36 lines
1.7 KiB
Diff
diff -uNr qtutilities-6.13.2/CMakeLists.txt qtutilities-6.13.2.mod/CMakeLists.txt
|
|
--- qtutilities-6.13.2/CMakeLists.txt 2023-10-30 04:23:28.000000000 +0800
|
|
+++ qtutilities-6.13.2.mod/CMakeLists.txt 2023-11-11 11:01:41.418106816 +0800
|
|
@@ -157,7 +157,7 @@
|
|
# configure support for D-Bus notifications
|
|
if (UNIX
|
|
AND NOT APPLE
|
|
- AND NOT ANDROID)
|
|
+ AND NOT FALSE)
|
|
set(ENABLE_DBUS_NOTIFICATIONS_BY_DEFAULT ON)
|
|
else ()
|
|
set(ENABLE_DBUS_NOTIFICATIONS_BY_DEFAULT OFF)
|
|
diff -uNr qtutilities-6.13.2/cmake/modules/QtGuiConfig.cmake qtutilities-6.13.2.mod/cmake/modules/QtGuiConfig.cmake
|
|
--- qtutilities-6.13.2/cmake/modules/QtGuiConfig.cmake 2023-10-30 04:23:28.000000000 +0800
|
|
+++ qtutilities-6.13.2.mod/cmake/modules/QtGuiConfig.cmake 2023-11-11 11:02:40.761263814 +0800
|
|
@@ -83,6 +83,6 @@
|
|
CACHE STRING "specifies the image format plugins to link against (only relevant when using static Qt)")
|
|
|
|
# always enable the Svg module under Android
|
|
-if (ANDROID)
|
|
+if (FALSE)
|
|
list(APPEND ADDITIONAL_QT_MODULES Svg)
|
|
endif ()
|
|
diff -uNr qtutilities-6.13.2/cmake/modules/QtLinkage.cmake qtutilities-6.13.2.mod/cmake/modules/QtLinkage.cmake
|
|
--- qtutilities-6.13.2/cmake/modules/QtLinkage.cmake 2023-10-30 04:23:28.000000000 +0800
|
|
+++ qtutilities-6.13.2.mod/cmake/modules/QtLinkage.cmake 2023-11-11 11:03:17.549914527 +0800
|
|
@@ -32,7 +32,7 @@
|
|
|
|
# avoid "add_custom_target cannot create target "apk" because another target…" errors produced by Qt's Android support module
|
|
# (which can not cope with Qt CMake modules already pulled in by a dependency)
|
|
-if (ANDROID AND NOT ${PROJECT_NAME}-MultiAbiBuild)
|
|
+if (FALSE AND NOT ${PROJECT_NAME}-MultiAbiBuild)
|
|
set(${PROJECT_NAME}-MultiAbiBuild ON)
|
|
endif ()
|
|
|