* [gentoo-commits] repo/gentoo:master commit in: net-libs/libquotient/files/, net-libs/libquotient/
@ 2021-01-03 15:53 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-01-03 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 1217bd9a95d2f09e608324896d946f3d47944a21
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 3 14:13:38 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 3 15:52:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1217bd9a
net-libs/libquotient: New package, required by net-im/neochat
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/libquotient/Manifest | 1 +
.../files/libquotient-0.6.3-no-android.patch | 29 +++++++
.../files/libquotient-0.6.3-no-tests.patch | 42 ++++++++++
.../files/libquotient-0.6.3-use-after-free.patch | 92 ++++++++++++++++++++++
net-libs/libquotient/libquotient-0.6.3.ebuild | 40 ++++++++++
net-libs/libquotient/metadata.xml | 8 ++
6 files changed, 212 insertions(+)
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
new file mode 100644
index 00000000000..6e04ad57d67
--- /dev/null
+++ b/net-libs/libquotient/Manifest
@@ -0,0 +1 @@
+DIST libquotient-0.6.3.tar.gz 559142 BLAKE2B 77ba0583a90e9d29d44ce9a70909d6b51462a1f16dbc2e9d321eb9d638329af41fe7b0c4f7569e5d46f3a9c12d32b1ef0b926c5e285bc3ed9b70ba6d4dbe8024 SHA512 a81d88b00edc2af8ad9a6a297f1d65ef5d96fb305f503b46f29381df1bb007b42e44b207fb649316c38c977a5b03c93f884407dccdc48ab066af6b004dd9a9d6
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
new file mode 100644
index 00000000000..5541f4d7133
--- /dev/null
+++ b/net-libs/libquotient/files/libquotient-0.6.3-no-android.patch
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 00000000000..fb884e10ac7
--- /dev/null
+++ b/net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch
@@ -0,0 +1,42 @@
+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
+
diff --git a/net-libs/libquotient/files/libquotient-0.6.3-use-after-free.patch b/net-libs/libquotient/files/libquotient-0.6.3-use-after-free.patch
new file mode 100644
index 00000000000..12046a10212
--- /dev/null
+++ b/net-libs/libquotient/files/libquotient-0.6.3-use-after-free.patch
@@ -0,0 +1,92 @@
+From f286ef4c5b3c71510d6ef15e8cc12cada84f3682 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sun, 27 Dec 2020 21:24:06 +0100
+Subject: [PATCH] Fix use-after-free of QNetworkReply in BaseJob
+
+Usually QNetworkAccessManager expects the user to delete the replies, but when the QNetworkAccessManager itself is deleted it deletes all pending replies (https://code.woboq.org/qt5/qtbase/src/network/access/qnetworkaccessmanager.cpp.html#529).
+
+This can lead to use-after-free crashes when d->reply is accessed. By putting the reply into a QPointer the exiting if(d->reply) checks can work properly.
+
+(cherry picked from commit 9d854e778d8d6ef8e03e1ea74fe958675b24fd45)
+---
+ lib/jobs/basejob.cpp | 33 +++++++++++++++++++--------------
+ 1 file changed, 19 insertions(+), 14 deletions(-)
+
+diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp
+index 3fa1cd94..2ac942f5 100644
+--- a/lib/jobs/basejob.cpp
++++ b/lib/jobs/basejob.cpp
+@@ -24,6 +24,7 @@
+ #include <QtCore/QTimer>
+ #include <QtCore/QStringBuilder>
+ #include <QtCore/QMetaEnum>
++#include <QtCore/QPointer>
+ #include <QtNetwork/QNetworkAccessManager>
+ #include <QtNetwork/QNetworkReply>
+ #include <QtNetwork/QNetworkRequest>
+@@ -76,15 +77,6 @@ QDebug BaseJob::Status::dumpToLog(QDebug dbg) const
+ return dbg << ": " << message;
+ }
+
+-struct NetworkReplyDeleter : public QScopedPointerDeleteLater {
+- static inline void cleanup(QNetworkReply* reply)
+- {
+- if (reply && reply->isRunning())
+- reply->abort();
+- QScopedPointerDeleteLater::cleanup(reply);
+- }
+-};
+-
+ template <typename... Ts>
+ constexpr auto make_array(Ts&&... items)
+ {
+@@ -112,6 +104,16 @@ class BaseJob::Private {
+ retryTimer.setSingleShot(true);
+ }
+
++ ~Private()
++ {
++ if (reply) {
++ if (reply->isRunning()) {
++ reply->abort();
++ }
++ delete reply;
++ }
++ }
++
+ void sendRequest();
+ /*! \brief Parse the response byte array into JSON
+ *
+@@ -140,7 +142,10 @@ class BaseJob::Private {
+
+ QByteArrayList expectedKeys;
+
+- QScopedPointer<QNetworkReply, NetworkReplyDeleter> reply;
++ // When the QNetworkAccessManager is destroyed it destroys all pending replies.
++ // Using QPointer allows us to know when that happend.
++ QPointer<QNetworkReply> reply;
++
+ Status status = Unprepared;
+ QByteArray rawResponse;
+ /// Contains a null document in case of non-JSON body (for a successful
+@@ -315,16 +320,16 @@ void BaseJob::Private::sendRequest()
+
+ switch (verb) {
+ case HttpVerb::Get:
+- reply.reset(connection->nam()->get(req));
++ reply = connection->nam()->get(req);
+ break;
+ case HttpVerb::Post:
+- reply.reset(connection->nam()->post(req, requestData.source()));
++ reply = connection->nam()->post(req, requestData.source());
+ break;
+ case HttpVerb::Put:
+- reply.reset(connection->nam()->put(req, requestData.source()));
++ reply = connection->nam()->put(req, requestData.source());
+ break;
+ case HttpVerb::Delete:
+- reply.reset(connection->nam()->sendCustomRequest(req, "DELETE", requestData.source()));
++ reply = connection->nam()->sendCustomRequest(req, "DELETE", requestData.source());
+ break;
+ }
+ }
diff --git a/net-libs/libquotient/libquotient-0.6.3.ebuild b/net-libs/libquotient/libquotient-0.6.3.ebuild
new file mode 100644
index 00000000000..9ab95317dc7
--- /dev/null
+++ b/net-libs/libquotient/libquotient-0.6.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt5-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"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-use-after-free.patch # 0.6.x branch
+ # downstream patches
+ "${FILESDIR}"/${P}-no-android.patch
+ "${FILESDIR}"/${P}-no-tests.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DQuotient_INSTALL_TESTS=OFF
+ -DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged
+ -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks.
+ )
+ cmake_src_configure
+}
diff --git a/net-libs/libquotient/metadata.xml b/net-libs/libquotient/metadata.xml
new file mode 100644
index 00000000000..2fdbf33d963
--- /dev/null
+++ b/net-libs/libquotient/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libquotient/files/, net-libs/libquotient/
@ 2021-02-25 12:50 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-02-25 12:50 UTC (permalink / raw
To: gentoo-commits
commit: 57b0828d84d626d01ae46e3f3a2155a9e10a9a4c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 11:46:26 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 12:50:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57b0828d
net-libs/libquotient: Drop 0.6.3
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/libquotient/Manifest | 1 -
.../files/libquotient-0.6.3-use-after-free.patch | 92 ----------------------
net-libs/libquotient/libquotient-0.6.3.ebuild | 40 ----------
3 files changed, 133 deletions(-)
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index eca3bedcf5c..b1540c1e88d 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1,2 +1 @@
-DIST libquotient-0.6.3.tar.gz 559142 BLAKE2B 77ba0583a90e9d29d44ce9a70909d6b51462a1f16dbc2e9d321eb9d638329af41fe7b0c4f7569e5d46f3a9c12d32b1ef0b926c5e285bc3ed9b70ba6d4dbe8024 SHA512 a81d88b00edc2af8ad9a6a297f1d65ef5d96fb305f503b46f29381df1bb007b42e44b207fb649316c38c977a5b03c93f884407dccdc48ab066af6b004dd9a9d6
DIST libquotient-0.6.4.tar.gz 559830 BLAKE2B 23a2d5bed5a5bcd30ffa00465291f5670d187d44991fe424bce5a2ce1ffc9d4fc09b0cc1e44e7b2b2470f82f6a3bcf4be2d6d9185d2952761a9a94d6f4fae2ce SHA512 6f505a697b6bd123004faaaae4ea6788ed985dafd965c5768cc838be98d6b27f65d5fb04c02d41c6a9ca2ce622acbd49264a9a14a99a087126d2852a926184ce
diff --git a/net-libs/libquotient/files/libquotient-0.6.3-use-after-free.patch b/net-libs/libquotient/files/libquotient-0.6.3-use-after-free.patch
deleted file mode 100644
index 12046a10212..00000000000
--- a/net-libs/libquotient/files/libquotient-0.6.3-use-after-free.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From f286ef4c5b3c71510d6ef15e8cc12cada84f3682 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 27 Dec 2020 21:24:06 +0100
-Subject: [PATCH] Fix use-after-free of QNetworkReply in BaseJob
-
-Usually QNetworkAccessManager expects the user to delete the replies, but when the QNetworkAccessManager itself is deleted it deletes all pending replies (https://code.woboq.org/qt5/qtbase/src/network/access/qnetworkaccessmanager.cpp.html#529).
-
-This can lead to use-after-free crashes when d->reply is accessed. By putting the reply into a QPointer the exiting if(d->reply) checks can work properly.
-
-(cherry picked from commit 9d854e778d8d6ef8e03e1ea74fe958675b24fd45)
----
- lib/jobs/basejob.cpp | 33 +++++++++++++++++++--------------
- 1 file changed, 19 insertions(+), 14 deletions(-)
-
-diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp
-index 3fa1cd94..2ac942f5 100644
---- a/lib/jobs/basejob.cpp
-+++ b/lib/jobs/basejob.cpp
-@@ -24,6 +24,7 @@
- #include <QtCore/QTimer>
- #include <QtCore/QStringBuilder>
- #include <QtCore/QMetaEnum>
-+#include <QtCore/QPointer>
- #include <QtNetwork/QNetworkAccessManager>
- #include <QtNetwork/QNetworkReply>
- #include <QtNetwork/QNetworkRequest>
-@@ -76,15 +77,6 @@ QDebug BaseJob::Status::dumpToLog(QDebug dbg) const
- return dbg << ": " << message;
- }
-
--struct NetworkReplyDeleter : public QScopedPointerDeleteLater {
-- static inline void cleanup(QNetworkReply* reply)
-- {
-- if (reply && reply->isRunning())
-- reply->abort();
-- QScopedPointerDeleteLater::cleanup(reply);
-- }
--};
--
- template <typename... Ts>
- constexpr auto make_array(Ts&&... items)
- {
-@@ -112,6 +104,16 @@ class BaseJob::Private {
- retryTimer.setSingleShot(true);
- }
-
-+ ~Private()
-+ {
-+ if (reply) {
-+ if (reply->isRunning()) {
-+ reply->abort();
-+ }
-+ delete reply;
-+ }
-+ }
-+
- void sendRequest();
- /*! \brief Parse the response byte array into JSON
- *
-@@ -140,7 +142,10 @@ class BaseJob::Private {
-
- QByteArrayList expectedKeys;
-
-- QScopedPointer<QNetworkReply, NetworkReplyDeleter> reply;
-+ // When the QNetworkAccessManager is destroyed it destroys all pending replies.
-+ // Using QPointer allows us to know when that happend.
-+ QPointer<QNetworkReply> reply;
-+
- Status status = Unprepared;
- QByteArray rawResponse;
- /// Contains a null document in case of non-JSON body (for a successful
-@@ -315,16 +320,16 @@ void BaseJob::Private::sendRequest()
-
- switch (verb) {
- case HttpVerb::Get:
-- reply.reset(connection->nam()->get(req));
-+ reply = connection->nam()->get(req);
- break;
- case HttpVerb::Post:
-- reply.reset(connection->nam()->post(req, requestData.source()));
-+ reply = connection->nam()->post(req, requestData.source());
- break;
- case HttpVerb::Put:
-- reply.reset(connection->nam()->put(req, requestData.source()));
-+ reply = connection->nam()->put(req, requestData.source());
- break;
- case HttpVerb::Delete:
-- reply.reset(connection->nam()->sendCustomRequest(req, "DELETE", requestData.source()));
-+ reply = connection->nam()->sendCustomRequest(req, "DELETE", requestData.source());
- break;
- }
- }
diff --git a/net-libs/libquotient/libquotient-0.6.3.ebuild b/net-libs/libquotient/libquotient-0.6.3.ebuild
deleted file mode 100644
index 9ab95317dc7..00000000000
--- a/net-libs/libquotient/libquotient-0.6.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt5-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"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-use-after-free.patch # 0.6.x branch
- # downstream patches
- "${FILESDIR}"/${P}-no-android.patch
- "${FILESDIR}"/${P}-no-tests.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DQuotient_INSTALL_TESTS=OFF
- -DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged
- -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks.
- )
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libquotient/files/, net-libs/libquotient/
@ 2022-12-24 23:50 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2022-12-24 23:50 UTC (permalink / raw
To: gentoo-commits
commit: f0e8b63ec921dd92192295801d36c1deacac4b32
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 22:00:26 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 23:50:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0e8b63e
net-libs/libquotient: add 0.7.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/libquotient/Manifest | 1 +
.../files/libquotient-0.7.0-no-android.patch | 29 ++++++++++++++++
.../files/libquotient-0.7.0-no-tests.patch | 34 ++++++++++++++++++
net-libs/libquotient/libquotient-0.7.0.ebuild | 40 ++++++++++++++++++++++
4 files changed, 104 insertions(+)
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index 95feba5e741b..1db805f951f8 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1 +1,2 @@
DIST libquotient-0.6.11.tar.gz 562144 BLAKE2B 75be68371ac1873e38f9ff81273419ed1eb773d02408137a7dafc9a60f520a2ba0b5556783272f8902dd98f7f5dac3a92ab393da5dd48acfffeba8b1631a84dd SHA512 76a11c80822ae3279d643559b481a09fe45b1f8effb7b0efeeb7ab54f13dd06997d9220dcb36c13d270f5641f496dba350f528c49e239757f4546de9fbe940fa
+DIST libquotient-0.7.0.tar.gz 667312 BLAKE2B 020baf8bcbbcedd6220e4f3476b152b3a0e88d53786e5b4575f9c096aa36847220a186ca782e068b2fd1f54771e45e1b313d10913af2cc2be3a1c45074acb733 SHA512 6770e3caa6198a77fc33bf7edd2a34d5673e01474b639aa020af989046ff04c44ff5ce26b6418ae31fcca49cc54a147052153ed5c60706f26c177ebd57d452c5
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
new file mode 100644
index 000000000000..f6cc8f838f1a
--- /dev/null
+++ b/net-libs/libquotient/files/libquotient-0.7.0-no-android.patch
@@ -0,0 +1,29 @@
+From 41299fe27a428bf02880865b7f8c1a7bee3f8ad5 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 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
new file mode 100644
index 000000000000..510b8a0a4d28
--- /dev/null
+++ b/net-libs/libquotient/files/libquotient-0.7.0-no-tests.patch
@@ -0,0 +1,34 @@
+From e5cc442f13aee922f6b2a954ad52b7aa8c558b2c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 24 Dec 2022 22:51:12 +0100
+Subject: [PATCH] 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 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.0.ebuild b/net-libs/libquotient/libquotient-0.7.0.ebuild
new file mode 100644
index 000000000000..11ec72e83ea7
--- /dev/null
+++ b/net-libs/libquotient/libquotient-0.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 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"
+IUSE=""
+
+DEPEND="
+ dev-libs/qtkeychain:=[qt5(+)]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5[ssl]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ # downstream patches
+ "${FILESDIR}"/${P}-no-android.patch
+ "${FILESDIR}"/${P}-no-tests.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_WITH_QT6=OFF
+ -DBUILD_TESTING=OFF
+ -DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libquotient/files/, net-libs/libquotient/
@ 2023-01-10 20:01 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2023-01-10 20:01 UTC (permalink / raw
To: gentoo-commits
commit: 564a195f9ceac7382beac3a7c699f84e862c180d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 20:01:07 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 20:01:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564a195f
net-libs/libquotient: drop 0.6.11-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/libquotient/Manifest | 1 -
.../files/libquotient-0.6.3-no-android.patch | 29 ---------------
.../files/libquotient-0.6.3-no-tests.patch | 42 ----------------------
net-libs/libquotient/libquotient-0.6.11-r1.ebuild | 39 --------------------
4 files changed, 111 deletions(-)
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index d5b713bed46e..002b058fad7e 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1,2 +1 @@
-DIST libquotient-0.6.11.tar.gz 562144 BLAKE2B 75be68371ac1873e38f9ff81273419ed1eb773d02408137a7dafc9a60f520a2ba0b5556783272f8902dd98f7f5dac3a92ab393da5dd48acfffeba8b1631a84dd SHA512 76a11c80822ae3279d643559b481a09fe45b1f8effb7b0efeeb7ab54f13dd06997d9220dcb36c13d270f5641f496dba350f528c49e239757f4546de9fbe940fa
DIST libquotient-0.7.1.tar.gz 667590 BLAKE2B 93c601960c43511ba0118ac0224c34064a6c1b1fa9a526ca8a064495e8d5b981ab197ed958ced3ba4bf869e0554ee37d2be82cddb6610e9d5ef371a1d3a144a7 SHA512 88819cafb49712d53c692008be69ea1fc01ca1ac6aedc15696eba2f830956660d185fb07273d50c7dc3e9208314ac24838746d5d9e70b3aad7fccbd15fd7c545
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
-
diff --git a/net-libs/libquotient/libquotient-0.6.11-r1.ebuild b/net-libs/libquotient/libquotient-0.6.11-r1.ebuild
deleted file mode 100644
index 6e9390a92391..000000000000
--- a/net-libs/libquotient/libquotient-0.6.11-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Qt5-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"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE=""
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5[ssl]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- # downstream patches
- "${FILESDIR}"/${PN}-0.6.3-no-android.patch
- "${FILESDIR}"/${PN}-0.6.3-no-tests.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DQuotient_INSTALL_TESTS=OFF
- -DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged
- -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks.
- )
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-10 20:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-10 20:01 [gentoo-commits] repo/gentoo:master commit in: net-libs/libquotient/files/, net-libs/libquotient/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-12-24 23:50 Andreas Sturmlechner
2021-02-25 12:50 Andreas Sturmlechner
2021-01-03 15:53 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox