From 54d0ccbac3b6fbd01dcd252ea006d4e9e62f8e6e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Dec 2023 01:53:29 +0000 Subject: gentoo auto-resync : 20:12:2023 - 01:53:29 --- net-libs/libquotient/Manifest | 4 -- .../files/libquotient-0.7.0-no-android.patch | 29 ---------- .../files/libquotient-0.7.0-no-tests.patch | 34 ------------ net-libs/libquotient/libquotient-0.7.2-r3.ebuild | 62 ---------------------- 4 files changed, 129 deletions(-) delete mode 100644 net-libs/libquotient/files/libquotient-0.7.0-no-android.patch delete mode 100644 net-libs/libquotient/files/libquotient-0.7.0-no-tests.patch delete mode 100644 net-libs/libquotient/libquotient-0.7.2-r3.ebuild (limited to 'net-libs/libquotient') diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest index f7120a94eca2..4c8c7b7befb1 100644 --- a/net-libs/libquotient/Manifest +++ b/net-libs/libquotient/Manifest @@ -1,10 +1,6 @@ -AUX libquotient-0.7.0-no-android.patch 969 BLAKE2B 775a680ed803047c7bd5fd72a9a40f0a9540921a6004fe8242c0df9a849d868100283a3ebc4e586e0b50de4e3cf7dc1ba8d9731b427515bc4f90196e61fab1a9 SHA512 27d56906e23ae8f56696ca9d7aeafc15398f81286cafd4f2eae54638b16819ec3fcd40a53b96953b3f62eb4982e09db1abc00e8e76abd61a55343752fb5e5ad4 -AUX libquotient-0.7.0-no-tests.patch 1234 BLAKE2B 60a3da8a15c9c77d8c997b0c0d95a6e13e9d332fdcbee2e6a88882269969519a82daea1280721ff6661a410f03fbd43d5233d8f4804896af637dfca67dd7111f SHA512 e2aa9d7ddca5d7cbb9323d3be9551515b726293c14eb34b4374f701082d9ce21af9f39836ecfada4247b25f1fe6b8fdd2f62976c32658e7d48266f02123ff582 AUX libquotient-0.8.0-no-android.patch 993 BLAKE2B 119a902b67ac0c101a84217e52f3438f83c474322d75b9ccc5fa8a2375bbf55c8910da65b6b7eac645eef840fa69e356343bc78fac88d14582fca395867050f7 SHA512 be757da77733eec67111c5e5f96c6459018aabbe863abdfbc7029e548b75f52f7a2754ee6eb93eaea6d08d7a2978ea9470585192ba95186358b02ec1df9f6f10 AUX libquotient-0.8.0-no-tests.patch 1215 BLAKE2B 4749dfb1b6e2be0f59b83a73092e7b4191458ad7220faefe0db71846d3d5fcbd59eb4adfcf97c0d779bc074fb0ccd1faef8eccfc44e4ad53750f79da6524b7dc SHA512 2923d0cec567378e1ddd9c7a50667a28bb79cdf871ce328b6db1ee0eb457b6c7d1a376b7659cb92f13483c29baa4991f410b3c5c478c881f80443a7eb4003b7f -DIST libquotient-0.7.2.tar.gz 671676 BLAKE2B 37a22c01b94bb77b89534e48ebcf8427429760095ecdc9427297c57e1d7dabdaaeaf9c7498b4695d23e468b89e1ac9cd44b9f64593454e5c3f8f452b95745c75 SHA512 ba849b938c0bf93e075da466a8360703fb903ac2735b35a7e83944a1288c9324ff76daaf57164144c55cef450fc658e42e6dcacfd23f87a4db455019e9c21f47 DIST libquotient-0.8.1.2.tar.gz 730435 BLAKE2B 7c43bc394d46ddb600c683d771add48f9a20d205ce61796b27a34933521e38be2b3b331263ffc6bb00fd1197a195b295e3311d52d8d74cdfe51453954cb79ae1 SHA512 ff11f1e9093004461425179fcab630237bf1d28f6e5abe6486d657b455b560884047715fccff5b31f26275ffd423df787014aaac35c556eddb1842e8e68841ce -EBUILD libquotient-0.7.2-r3.ebuild 1266 BLAKE2B 054339e57d68a592ab25e67bb6eb649e8fa9227562227ef1ef17dc6b24ce10c44facd267442b93ad3b1db2f395736368cbb7a8071cf00b24b68935395d4c359f SHA512 ac4433f9f077dc90b044691258015fa21862fba5ae64ac0f485ef9e4a1452c9db6eea659a8c8cda7a5010057a95a8786a624e0cedad90a2a8b16de384969c1e8 EBUILD libquotient-0.8.1.2-r1.ebuild 1934 BLAKE2B c296f7c8f46f45baff3b24179defb2b06639307047b8e9f690e6431fee6911feb85223ee32825caeb4e232443371e76593d44d67144ae82cf80ec91cf4f065b2 SHA512 0af8a34e2e08ba6ab3c8afc784d1c8c895e4a908fc5e86eec6a6e23acac0e43c4da89ac55dbaf68f24e9a61f166559ed71480789a1e1f9cd99057d96f6eb5e8a EBUILD libquotient-0.8.1.2.ebuild 1300 BLAKE2B d8fbf9f6f4fca3c5ff7996ce7eacd74c8c57baa115ac139c5610862da4b0277c6ed7baa729a776b4681f002a56f82b23bd672f8e775ebc9edeafc8299007df07 SHA512 6b8a4ec5db4684ba27935b8469fcee51244a42dd3d35274d972ffc5e0523dd230acaa5698bd0cf6cd072f822a8a51d119ccc000b0f18711643704d6902337f87 MISC metadata.xml 338 BLAKE2B 84af57de6f4faeb65a9a9bd272a29e6cb4491e8eff3d79c4704566baa4af7cfa2f9c6c14a52a0a44e8751848b9e89f30807a6d0c304eb28d8b2cb9f43f0b37c5 SHA512 f93f27e29f09f8e6e6c0038a403990260c8998213c8248c2acbfc1f7e76faa07c296d4b30214c746f30d42b37d636be92720e692280098d4d72d3d542b5004aa diff --git a/net-libs/libquotient/files/libquotient-0.7.0-no-android.patch b/net-libs/libquotient/files/libquotient-0.7.0-no-android.patch deleted file mode 100644 index f6cc8f838f1a..000000000000 --- a/net-libs/libquotient/files/libquotient-0.7.0-no-android.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 41299fe27a428bf02880865b7f8c1a7bee3f8ad5 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 3 Jan 2021 15:18:01 +0100 -Subject: [PATCH] Install EXPORT_ANDROID_MK only if(ANDROID) - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 523f5ae7..613e270c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -381,7 +381,10 @@ install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" - DESTINATION ${CMakeFilesLocation} - ) --install(EXPORT_ANDROID_MK ${PROJECT_NAME}Targets DESTINATION ${CMAKE_INSTALL_DATADIR}/ndk-modules) -+ -+if (ANDROID) -+ install(EXPORT_ANDROID_MK ${PROJECT_NAME}Targets DESTINATION ${CMAKE_INSTALL_DATADIR}/ndk-modules) -+endif () - - if (WIN32) - install(FILES mime/packages/freedesktop.org.xml DESTINATION mime/packages) --- -2.39.0 - diff --git a/net-libs/libquotient/files/libquotient-0.7.0-no-tests.patch b/net-libs/libquotient/files/libquotient-0.7.0-no-tests.patch deleted file mode 100644 index 510b8a0a4d28..000000000000 --- a/net-libs/libquotient/files/libquotient-0.7.0-no-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e5cc442f13aee922f6b2a954ad52b7aa8c558b2c Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sat, 24 Dec 2022 22:51:12 +0100 -Subject: [PATCH] Put Qt5Test dependency behind -DBUILD_TESTING - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 523f5ae7..9ae697b2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -93,7 +93,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) - message(STATUS "Using Qt ${${Qt}_VERSION} at ${Qt_Prefix}") - -@@ -342,6 +342,7 @@ configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME} - # Configure testing - - if (BUILD_TESTING) -+ find_package(${Qt}Test ${QtMinVersion} REQUIRED) - enable_testing() - add_subdirectory(quotest) - add_subdirectory(autotests) --- -2.39.0 - diff --git a/net-libs/libquotient/libquotient-0.7.2-r3.ebuild b/net-libs/libquotient/libquotient-0.7.2-r3.ebuild deleted file mode 100644 index b0cc7f93d0db..000000000000 --- a/net-libs/libquotient/libquotient-0.7.2-r3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Qt-based SDK to develop applications for Matrix" -HOMEPAGE="https://github.com/quotient-im/libQuotient" -SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/libQuotient-${PV}" - -LICENSE="LGPL-2+" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/olm - dev-libs/openssl:= - dev-libs/qtkeychain:=[qt5(+)] - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 -" -DEPEND="${RDEPEND} - test? ( - dev-qt/qtconcurrent:5 - dev-qt/qttest:5 - ) -" - -PATCHES=( - # downstream patches - "${FILESDIR}"/${PN}-0.7.0-no-android.patch - "${FILESDIR}"/${PN}-0.7.0-no-tests.patch -) - -src_configure() { - local mycmakeargs=( - -DBUILD_WITH_QT6=OFF - -DBUILD_TESTING=$(usex test) - -DQuotient_ENABLE_E2EE=ON - ) - use test && mycmakeargs+=( - -DQuotient_INSTALL_TESTS=OFF - ) - cmake_src_configure -} - -src_test() { - # https://github.com/quotient-im/libQuotient/issues/435 - # testolmaccount requires network connection/server set up - local myctestargs=( - -j1 - -E "(testolmaccount)" - ) - cmake_src_test -} -- cgit v1.2.3