diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2023-12-07 10:35:39 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-12-07 20:32:28 +0100 |
| commit | dd11df76eced11c58a800052a3ae633d833df329 (patch) | |
| tree | 5b4e364c0cfa0769d91f5ba69518eb93f2238cd0 /net-libs/libquotient/files | |
| parent | afdc377389f60066687f5049e16561b5ec8f68ae (diff) | |
| download | kde-dd11df76eced11c58a800052a3ae633d833df329.tar.gz kde-dd11df76eced11c58a800052a3ae633d833df329.tar.bz2 kde-dd11df76eced11c58a800052a3ae633d833df329.zip | |
net-libs/libquotient: Add IUSE=qt5,qt6
Closes: https://bugs.gentoo.org/914289
Thanks-to: Anton <anton.stay.connected@gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'net-libs/libquotient/files')
| -rw-r--r-- | net-libs/libquotient/files/libquotient-0.8.0-no-android.patch | 29 | ||||
| -rw-r--r-- | net-libs/libquotient/files/libquotient-0.8.0-no-tests.patch | 34 |
2 files changed, 63 insertions, 0 deletions
diff --git a/net-libs/libquotient/files/libquotient-0.8.0-no-android.patch b/net-libs/libquotient/files/libquotient-0.8.0-no-android.patch new file mode 100644 index 00000000000..5b2e3412322 --- /dev/null +++ b/net-libs/libquotient/files/libquotient-0.8.0-no-android.patch @@ -0,0 +1,29 @@ +From ad928b9f34f5e6f42c8555a0a502c35de6cb86b5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 3 Jan 2021 15:18:01 +0100 +Subject: [PATCH 1/2] Install EXPORT_ANDROID_MK only if(ANDROID) + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0a32ee4e..7e03085f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -387,7 +387,10 @@ install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/${QUOTIENT_LIB_NAME}/${QUOTIENT_LIB_NAME}ConfigVersion.cmake" + DESTINATION ${CMakeFilesLocation} + ) +-install(EXPORT_ANDROID_MK ${QUOTIENT_LIB_NAME}Targets DESTINATION ${CMAKE_INSTALL_DATADIR}/ndk-modules) ++ ++if (ANDROID) ++ install(EXPORT_ANDROID_MK ${QUOTIENT_LIB_NAME}Targets DESTINATION ${CMAKE_INSTALL_DATADIR}/ndk-modules) ++endif () + + if (WIN32) + install(FILES mime/packages/freedesktop.org.xml DESTINATION mime/packages) +-- +2.41.0 + diff --git a/net-libs/libquotient/files/libquotient-0.8.0-no-tests.patch b/net-libs/libquotient/files/libquotient-0.8.0-no-tests.patch new file mode 100644 index 00000000000..96fe1029c82 --- /dev/null +++ b/net-libs/libquotient/files/libquotient-0.8.0-no-tests.patch @@ -0,0 +1,34 @@ +From c35f062d1c9975ec0bdfdcbcdeb6b9973b73f86b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sat, 24 Dec 2022 22:51:12 +0100 +Subject: [PATCH 2/2] Put Qt5Test dependency behind -DBUILD_TESTING + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7e03085f..f2ab0ae7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,7 +92,7 @@ else() + set(QtExtraModules "Multimedia") # See #483 + endif() + string(REGEX REPLACE "^(.).*" "Qt\\1" Qt ${QtMinVersion}) # makes "Qt5" or "Qt6" +-find_package(${Qt} ${QtMinVersion} REQUIRED Core Network Gui Test ${QtExtraModules}) ++find_package(${Qt} ${QtMinVersion} REQUIRED Core Network Gui ${QtExtraModules}) + get_filename_component(Qt_Prefix "${${Qt}_DIR}/../../../.." ABSOLUTE) + + find_package(${Qt}Keychain REQUIRED) +@@ -344,6 +344,7 @@ configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${QUOTIENT_LIB_ + # Configure testing + + if (BUILD_TESTING) ++ find_package(${Qt}Test ${QtMinVersion} REQUIRED) + enable_testing() + add_subdirectory(quotest) + add_subdirectory(autotests) +-- +2.41.0 + |