diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-01-10 23:43:04 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-10 23:43:04 +0000 |
commit | 113cc6fe7a9adc2baf67f9ef7723db6ed2b24887 (patch) | |
tree | 968fd44d403c54949106d2c90a128f529f7ef3d0 /net-libs/libquotient/files | |
parent | 1fe49f5b3e13481832866b6b1600741bf3a1f024 (diff) |
gentoo auto-resync : 10:01:2023 - 23:43:04
Diffstat (limited to 'net-libs/libquotient/files')
-rw-r--r-- | net-libs/libquotient/files/libquotient-0.6.3-no-android.patch | 29 | ||||
-rw-r--r-- | net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch | 42 |
2 files changed, 0 insertions, 71 deletions
diff --git a/net-libs/libquotient/files/libquotient-0.6.3-no-android.patch b/net-libs/libquotient/files/libquotient-0.6.3-no-android.patch deleted file mode 100644 index 5541f4d7133b..000000000000 --- a/net-libs/libquotient/files/libquotient-0.6.3-no-android.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d82cb1f43cab7976e25c6e9ff3e4ae17789ee11c Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 3 Jan 2021 15:18:01 +0100 -Subject: [PATCH] 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 2ee1cb4..eec27c8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -321,7 +321,10 @@ install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" - DESTINATION ${ConfigFilesLocation} - ) --install(EXPORT_ANDROID_MK ${PROJECT_NAME}Targets DESTINATION share/ndk-modules) -+ -+if (ANDROID) -+ install(EXPORT_ANDROID_MK ${PROJECT_NAME}Targets DESTINATION share/ndk-modules) -+endif () - - if (WIN32) - install(FILES mime/packages/freedesktop.org.xml DESTINATION mime/packages) --- -2.30.0 - diff --git a/net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch b/net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch deleted file mode 100644 index fb884e10ac76..000000000000 --- a/net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ff972d181f0f9e7bfa327c71450d55f951de27c1 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 3 Jan 2021 15:05:59 +0100 -Subject: [PATCH] Put Qt5Test dependency behind -DQuotient_INSTALL_TESTS - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2ee1cb4..2a0908d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,7 +58,7 @@ else() - endforeach () - endif() - --find_package(Qt5 5.9 REQUIRED Network Gui Multimedia Test) -+find_package(Qt5 5.9 REQUIRED Network Gui Multimedia) - get_filename_component(Qt5_Prefix "${Qt5_DIR}/../../../.." ABSOLUTE) - - if (${PROJECT_NAME}_ENABLE_E2EE) -@@ -280,9 +280,12 @@ if (${PROJECT_NAME}_ENABLE_E2EE) - endif() - target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Network Qt5::Gui Qt5::Multimedia) - --set(TEST_BINARY quotest) --add_executable(${TEST_BINARY} ${tests_SRCS}) --target_link_libraries(${TEST_BINARY} Qt5::Core Qt5::Test ${PROJECT_NAME}) -+if(${PROJECT_NAME}_INSTALL_TESTS) -+ find_package(Qt5Test) -+ set(TEST_BINARY quotest) -+ add_executable(${TEST_BINARY} ${tests_SRCS}) -+ target_link_libraries(${TEST_BINARY} Qt5::Core Qt5::Test ${PROJECT_NAME}) -+endif() - - configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY NEWLINE_STYLE UNIX) - --- -2.30.0 - |