public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/mtxclient/files/, dev-libs/mtxclient/
@ 2020-05-26  3:18 Ronny Gutbrod
  0 siblings, 0 replies; 5+ messages in thread
From: Ronny Gutbrod @ 2020-05-26  3:18 UTC (permalink / raw
  To: gentoo-commits

commit:     87ed97b2d47402cbf0cd457d975dd9a76bb5ee9e
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Tue May 26 03:15:23 2020 +0000
Commit:     Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Tue May 26 03:17:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87ed97b2

dev-libs/mtxclient: Fix GCC 10 compile error.

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>

 .../mtxclient/files/0.3.0_add_missing_header.patch | 22 ++++++++++++++++++++++
 dev-libs/mtxclient/mtxclient-0.3.0.ebuild          |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/dev-libs/mtxclient/files/0.3.0_add_missing_header.patch b/dev-libs/mtxclient/files/0.3.0_add_missing_header.patch
new file mode 100644
index 0000000..fd8769d
--- /dev/null
+++ b/dev-libs/mtxclient/files/0.3.0_add_missing_header.patch
@@ -0,0 +1,22 @@
+From 3692a1dce868cfde29547757b6a8e91a05761b12 Mon Sep 17 00:00:00 2001
+From: Nicolas Werner <nicolas.werner@hotmail.de>
+Date: Sat, 9 May 2020 00:33:29 +0200
+Subject: [PATCH] gcc 10 fixes
+
+---
+ include/mtx/identifiers.hpp | 2 ++
+ tests/messages.cpp          | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/include/mtx/identifiers.hpp b/include/mtx/identifiers.hpp
+index a18b26e9..077099c4 100644
+--- a/include/mtx/identifiers.hpp
++++ b/include/mtx/identifiers.hpp
+@@ -6,4 +6,6 @@
+ #include <nlohmann/json.hpp>
+ #endif
+
++#include <stdexcept>
++
+ namespace mtx {
+ namespace identifiers {

diff --git a/dev-libs/mtxclient/mtxclient-0.3.0.ebuild b/dev-libs/mtxclient/mtxclient-0.3.0.ebuild
index 8690faf..aa3beef 100644
--- a/dev-libs/mtxclient/mtxclient-0.3.0.ebuild
+++ b/dev-libs/mtxclient/mtxclient-0.3.0.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}/0.3.0_remove_network_tests.patch"
 	"${FILESDIR}/0.3.0_remove_failing_tests.patch"
+	"${FILESDIR}/0.3.0_add_missing_header.patch"
 )
 
 src_configure() {
@@ -40,7 +41,7 @@ src_configure() {
 	)
 
 	if use test; then
-		# Upstream uses a toolchain file to set these.
+		# Upstream uses a toolchain file to set these, fixed in >0.3.0.
 		mycmakeargs+=(
 			-DCMAKE_CXX_STANDARD=17
 			-DCMAKE_CXX_STANDARD_REQUIRED=ON


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/mtxclient/files/, dev-libs/mtxclient/
@ 2022-07-23 16:15 Ronny Gutbrod
  0 siblings, 0 replies; 5+ messages in thread
From: Ronny Gutbrod @ 2022-07-23 16:15 UTC (permalink / raw
  To: gentoo-commits

commit:     4039bb8ced536bf115523916b9ff9cd39d5a0b7a
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Sat Jul 23 10:37:37 2022 +0000
Commit:     Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Sat Jul 23 15:46:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4039bb8c

dev-libs/mtxclient: drop 0.6.2-r1

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>

 dev-libs/mtxclient/Manifest                        |  1 -
 .../files/0.3.0_remove_failing_tests.patch         | 38 ------------
 .../files/0.3.0_remove_network_tests.patch         | 72 ----------------------
 dev-libs/mtxclient/mtxclient-0.6.2-r1.ebuild       | 42 -------------
 4 files changed, 153 deletions(-)

diff --git a/dev-libs/mtxclient/Manifest b/dev-libs/mtxclient/Manifest
index 39658452d..6c7b2e542 100644
--- a/dev-libs/mtxclient/Manifest
+++ b/dev-libs/mtxclient/Manifest
@@ -1,3 +1,2 @@
-DIST mtxclient-0.6.2.tar.gz 596675 BLAKE2B c796218849324222e94ecd82336f4bfed25f344c8d01f9de293f5220d43e9c3b2b3921dce5d0d9a0d850e85dcb2e2b74e26ab75000d1fa48601c433d646b90ba SHA512 91ac33b16fb2685f1aee3e76f3fe334a34e8403d11be8a065e10dac0181333131654f26886a8cf5b25ded1960010c06a259e7d2e5f195a28f7cc8041ca9dbff9
 DIST mtxclient-0.7.0.tar.gz 601042 BLAKE2B 05c390d7e3f48d5c02a74fb5783693d5380141b28738b064101f6aaa2fbddf30e0d4b95dc774e68fbad93c642592806d9417344fb9cdd6b01659ec874c3ba67f SHA512 fe015e6532a62fd1d1f5828c7aff08c181a4da1279afe54a502c09ba924a404099d23e74eb176841e774f67c6701e9c0ab666e239f486e4559aaea863ba8f5f9
 DIST mtxclient-0.8.0.tar.gz 606271 BLAKE2B 7a12f1f595d509cb2a0bbf9052393f67e427925875124398bf7fa6fc1f96f78084eb357d8ed1642df15274523b66ac78117ab1d088328131a5103d6a4da9b6d4 SHA512 4156432bf66d00bdabb6feee2521b659ee8b50cbcab8eae9d1c8dd496442822d204f7085baa616e51acd4cb7037994d5746fb37be73e71c1c5a3f882229f1e18

diff --git a/dev-libs/mtxclient/files/0.3.0_remove_failing_tests.patch b/dev-libs/mtxclient/files/0.3.0_remove_failing_tests.patch
deleted file mode 100644
index 55de213f1..000000000
--- a/dev-libs/mtxclient/files/0.3.0_remove_failing_tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b95f9d85f87f78ce5cfbaeed513ea284678eaa83 Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Mon, 25 May 2020 00:57:57 +0200
-Subject: [PATCH] Remove failing tests.
-
----
- CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 689a091..58868b6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -345,13 +345,6 @@ if(BUILD_LIB_TESTS)
- 		GTest::Main)
- 	target_include_directories(utils PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
- 
--	add_executable(pushrules tests/pushrules.cpp)
--	target_link_libraries(pushrules
--		MatrixClient::MatrixClient
--		GTest::GTest
--		GTest::Main)
--	target_include_directories(pushrules PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
--
- 	add_executable(identifiers tests/identifiers.cpp)
- 	target_link_libraries(identifiers
- 		MatrixClient::MatrixClient
-@@ -395,7 +388,6 @@ if(BUILD_LIB_TESTS)
- 		GTest::Main)
- 
- 	add_test(Utilities utils)
--	add_test(Pushrules pushrules)
- 	add_test(Identifiers identifiers)
- 	add_test(Errors errors)
- 	add_test(CryptoStructs crypto)
--- 
-2.26.2
-

diff --git a/dev-libs/mtxclient/files/0.3.0_remove_network_tests.patch b/dev-libs/mtxclient/files/0.3.0_remove_network_tests.patch
deleted file mode 100644
index 32fc72bb6..000000000
--- a/dev-libs/mtxclient/files/0.3.0_remove_network_tests.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From e4e068ba5dd3964c890f25bbe668c8a964562ded Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Mon, 25 May 2020 00:50:30 +0200
-Subject: [PATCH] Remove tests that require a network connection.
-
----
- CMakeLists.txt | 35 -----------------------------------
- 1 file changed, 35 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0073604..689a091 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -338,29 +338,6 @@ if(BUILD_LIB_TESTS)
- 
- 	file(COPY tests/fixtures DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
- 
--	add_executable(client_api tests/client_api.cpp)
--	target_link_libraries(client_api
--		MatrixClient::MatrixClient
--		GTest::GTest
--		GTest::Main)
--	target_include_directories(client_api PRIVATE
--		${CMAKE_CURRENT_SOURCE_DIR}/tests)
--
--	add_executable(media_api tests/media_api.cpp)
--	target_link_libraries(media_api
--		MatrixClient::MatrixClient
--		GTest::GTest
--		GTest::Main)
--	target_include_directories(media_api PRIVATE
--		${CMAKE_CURRENT_SOURCE_DIR}/tests)
--
--	add_executable(e2ee tests/e2ee.cpp)
--	target_link_libraries(e2ee
--		MatrixClient::MatrixClient
--		GTest::GTest
--		GTest::Main)
--	target_include_directories(e2ee PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
--
- 	add_executable(utils tests/utils.cpp)
- 	target_link_libraries(utils
- 		MatrixClient::MatrixClient
-@@ -375,14 +352,6 @@ if(BUILD_LIB_TESTS)
- 		GTest::Main)
- 	target_include_directories(pushrules PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
- 
--	add_executable(connection tests/connection.cpp)
--	target_link_libraries(connection
--		MatrixClient::MatrixClient
--		GTest::GTest
--		GTest::Main)
--	target_include_directories(connection PRIVATE
--		${CMAKE_CURRENT_SOURCE_DIR}/tests)
--
- 	add_executable(identifiers tests/identifiers.cpp)
- 	target_link_libraries(identifiers
- 		MatrixClient::MatrixClient
-@@ -425,10 +394,6 @@ if(BUILD_LIB_TESTS)
- 		GTest::GTest
- 		GTest::Main)
- 
--	add_test(BasicConnectivity connection)
--	add_test(ClientAPI client_api)
--	add_test(MediaAPI media_api)
--	add_test(Encryption e2ee)
- 	add_test(Utilities utils)
- 	add_test(Pushrules pushrules)
- 	add_test(Identifiers identifiers)
--- 
-2.26.2
-

diff --git a/dev-libs/mtxclient/mtxclient-0.6.2-r1.ebuild b/dev-libs/mtxclient/mtxclient-0.6.2-r1.ebuild
deleted file mode 100644
index a7a949bf1..000000000
--- a/dev-libs/mtxclient/mtxclient-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Client API library for Matrix, built on top of Boost.Asio"
-HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient"
-SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}" # ABI may break even on patch version changes
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/olm
-	>=dev-libs/openssl-1.1.0
-	dev-libs/spdlog
-	>=dev-cpp/coeurl-0.1.1:=
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}/0.6.0_remove_network_tests.patch"
-)
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DBUILD_LIB_TESTS="$(usex test)"
-		-DBUILD_LIB_EXAMPLES=OFF
-	)
-
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/mtxclient/files/, dev-libs/mtxclient/
@ 2021-11-19  1:15 Ronny Gutbrod
  0 siblings, 0 replies; 5+ messages in thread
From: Ronny Gutbrod @ 2021-11-19  1:15 UTC (permalink / raw
  To: gentoo-commits

commit:     48ef28dfa8a660c33f16798fe5763b71c3926299
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Wed Nov 17 23:02:46 2021 +0000
Commit:     Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Wed Nov 17 23:02:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=48ef28df

dev-libs/mtxclient: Version bump 0.6.0.

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>

 dev-libs/mtxclient/Manifest                        |  1 +
 .../files/0.6.0_remove_network_tests.patch         | 89 ++++++++++++++++++++++
 dev-libs/mtxclient/mtxclient-0.6.0.ebuild          | 42 ++++++++++
 3 files changed, 132 insertions(+)

diff --git a/dev-libs/mtxclient/Manifest b/dev-libs/mtxclient/Manifest
index ca390a5cf..6a08e74f6 100644
--- a/dev-libs/mtxclient/Manifest
+++ b/dev-libs/mtxclient/Manifest
@@ -1,2 +1,3 @@
 DIST mtxclient-0.5.1.tar.gz 582367 BLAKE2B d30a5e0e16d6783d8d1175e5f4144d845fe62897dcc7952cb1598470befa1da47a2b06cd70a60f511a1c2e7656eca2cf5a87734cbc61b79d2a05df295fd256e0 SHA512 f0a5e823bd7f3cccdf5f919c04c36a1a5ab4d2627a6f8f3fac78e4b300eda3b9e1f5060fb31e6e47267bbafc3a03f6c2a2d16c2323e63ce4889f551860e7703f
 DIST mtxclient-0.5.2_pre20210916.tar.gz 588702 BLAKE2B 643e37c13348d0fff65b38e16581918d1b9555d6d6cc19ce4965eaa5e34620a6d0f60af7bb075ffded4b585f38b889565c3cfd42f02c2749e4a8c8f013b6c125 SHA512 778257173c08930a05d3bef91afe34d4cf963f57e75159f99a2468513df80669215002ecf5f10c3639a8fef944aeb814cb447e4984c5e1c8ffd87d53b8938030
+DIST mtxclient-0.6.0.tar.gz 593602 BLAKE2B 61e9f332e2056727c0d8e6b473e42591e3a8fc4841b8f76a1fe3ac61b1ccc9ba40c0dd248201ae301ce56d21aa0e034d65c5a7e7c33b202361b6ab6fd763aa01 SHA512 8ee9cd6cfab64625029ed18b5de72523a8d7dc1ac67ff8d9f32d730f15e473248ec11447a480ce9f76629d1bd5722785f229857489a63e71e92aae0990a3d20f

diff --git a/dev-libs/mtxclient/files/0.6.0_remove_network_tests.patch b/dev-libs/mtxclient/files/0.6.0_remove_network_tests.patch
new file mode 100644
index 000000000..46a2dc8a4
--- /dev/null
+++ b/dev-libs/mtxclient/files/0.6.0_remove_network_tests.patch
@@ -0,0 +1,89 @@
+From 6fecee0d675e65b75d67c66218a7655cb285bb5c Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Sat, 23 Oct 2021 01:42:27 +0200
+Subject: [PATCH] Remove network tests.
+
+---
+ CMakeLists.txt | 51 --------------------------------------------------
+ 1 file changed, 51 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d13a72..98c2782 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -360,36 +360,6 @@ if(BUILD_LIB_TESTS)
+ 
+ 	file(COPY tests/fixtures DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ 
+-	add_executable(client_api tests/client_api.cpp)
+-	target_link_libraries(client_api
+-		MatrixClient::MatrixClient
+-		GTest::GTest
+-		GTest::Main)
+-	target_include_directories(client_api PRIVATE
+-		${CMAKE_CURRENT_SOURCE_DIR}/tests)
+-
+-	add_executable(media_api tests/media_api.cpp)
+-	target_link_libraries(media_api
+-		MatrixClient::MatrixClient
+-		GTest::GTest
+-		GTest::Main)
+-	target_include_directories(media_api PRIVATE
+-		${CMAKE_CURRENT_SOURCE_DIR}/tests)
+-
+-	add_executable(e2ee tests/e2ee.cpp)
+-	target_link_libraries(e2ee
+-		MatrixClient::MatrixClient
+-		GTest::GTest
+-		GTest::Main)
+-	target_include_directories(e2ee PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+-
+-	add_executable(device tests/device.cpp)
+-	target_link_libraries(device
+-		MatrixClient::MatrixClient
+-		GTest::GTest
+-		GTest::Main)
+-	target_include_directories(device PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+-
+ 	add_executable(utils tests/utils.cpp)
+ 	target_link_libraries(utils
+ 		MatrixClient::MatrixClient
+@@ -397,21 +367,6 @@ if(BUILD_LIB_TESTS)
+ 		GTest::Main)
+ 	target_include_directories(utils PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+ 
+-	add_executable(pushrules tests/pushrules.cpp)
+-	target_link_libraries(pushrules
+-		MatrixClient::MatrixClient
+-		GTest::GTest
+-		GTest::Main)
+-	target_include_directories(pushrules PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+-
+-	add_executable(connection tests/connection.cpp)
+-	target_link_libraries(connection
+-		MatrixClient::MatrixClient
+-		GTest::GTest
+-		GTest::Main)
+-	target_include_directories(connection PRIVATE
+-		${CMAKE_CURRENT_SOURCE_DIR}/tests)
+-
+ 	add_executable(identifiers tests/identifiers.cpp)
+ 	target_link_libraries(identifiers
+ 		MatrixClient::MatrixClient
+@@ -454,13 +409,7 @@ if(BUILD_LIB_TESTS)
+ 		GTest::GTest
+ 		GTest::Main)
+ 
+-	add_test(BasicConnectivity connection)
+-	add_test(ClientAPI client_api)
+-	add_test(MediaAPI media_api)
+-	add_test(Encryption e2ee)
+-	add_test(Devices device)
+ 	add_test(Utilities utils)
+-	add_test(Pushrules pushrules)
+ 	add_test(Identifiers identifiers)
+ 	add_test(Errors errors)
+ 	add_test(CryptoStructs crypto)
+-- 
+2.32.0
+

diff --git a/dev-libs/mtxclient/mtxclient-0.6.0.ebuild b/dev-libs/mtxclient/mtxclient-0.6.0.ebuild
new file mode 100644
index 000000000..525e24dc1
--- /dev/null
+++ b/dev-libs/mtxclient/mtxclient-0.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Client API library for Matrix, built on top of Boost.Asio"
+HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient"
+SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/olm
+	>=dev-libs/openssl-1.1.0
+	dev-libs/spdlog
+	>=dev-cpp/coeurl-0.1.0
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/0.6.0_remove_network_tests.patch"
+)
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DBUILD_LIB_TESTS="$(usex test)"
+		-DBUILD_LIB_EXAMPLES=OFF
+	)
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/mtxclient/files/, dev-libs/mtxclient/
@ 2021-01-20  3:39 Ronny Gutbrod
  0 siblings, 0 replies; 5+ messages in thread
From: Ronny Gutbrod @ 2021-01-20  3:39 UTC (permalink / raw
  To: gentoo-commits

commit:     8c6700cd404bec58ec5cd9d30d24065ba240a74f
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Wed Jan 20 03:32:32 2021 +0000
Commit:     Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Wed Jan 20 03:39:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8c6700cd

dev-libs/mtxclient: Remove old ebuild and patch.

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>

 dev-libs/mtxclient/Manifest                        |  1 -
 .../mtxclient/files/0.3.0_add_missing_header.patch | 22 ---------
 dev-libs/mtxclient/mtxclient-0.3.0.ebuild          | 52 ----------------------
 3 files changed, 75 deletions(-)

diff --git a/dev-libs/mtxclient/Manifest b/dev-libs/mtxclient/Manifest
index 83f44686..22606391 100644
--- a/dev-libs/mtxclient/Manifest
+++ b/dev-libs/mtxclient/Manifest
@@ -1,3 +1,2 @@
-DIST mtxclient-0.3.0.tar.gz 507299 BLAKE2B 4c36762a3a0a3aafebd414d2c967cc5183710c7be34df9b50078538e7971e86182114ed310ed96a452a02f3d8c1c18fa5aa0de414d0c391d97efb1ce7f1b49f9 SHA512 113eb2c1042e0aeea6607fae0b7fd0ff1655d6b902fa11a3492561c53240901e641f53d413810e932ac210e519026016c5fac38bda1592336c95b2d79781557e
 DIST mtxclient-0.3.1.tar.gz 511985 BLAKE2B 5271dc755ea10be2bddd0155b9c3288be2f0cb165989fdebcf237795a12041e8f21f7c54b9f7ec86e5fa08c386daad696f77509ae65b2aa2c30c9a292bb1b682 SHA512 ed4991b0a611be80cef42dec5e4b747787dae6aeaf46dc1cc395b06233efc9a5b1b57b1809eb9dacd7893b4de19f43996bb6d4556fc67697013248d79528a567
 DIST mtxclient-0.4.0.tar.gz 571434 BLAKE2B d836d94f9045f0ca5a0aa9b5fe6f3643e3189d4ee31b797472aca10320678308d51e2c9bc37f4234d00e0c201aeefaf8c4c40072b0ad8c7f5b6a9e0c10163a2a SHA512 8c3538147b9277babbac14aaec6652ff638ae9335c01f786dfec78e3edc5c23591da8ce33c4366329050cf644f71a9fac8d337a2a9fbf7ea2883be05f6ac1a1e

diff --git a/dev-libs/mtxclient/files/0.3.0_add_missing_header.patch b/dev-libs/mtxclient/files/0.3.0_add_missing_header.patch
deleted file mode 100644
index fd8769dd..00000000
--- a/dev-libs/mtxclient/files/0.3.0_add_missing_header.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 3692a1dce868cfde29547757b6a8e91a05761b12 Mon Sep 17 00:00:00 2001
-From: Nicolas Werner <nicolas.werner@hotmail.de>
-Date: Sat, 9 May 2020 00:33:29 +0200
-Subject: [PATCH] gcc 10 fixes
-
----
- include/mtx/identifiers.hpp | 2 ++
- tests/messages.cpp          | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/include/mtx/identifiers.hpp b/include/mtx/identifiers.hpp
-index a18b26e9..077099c4 100644
---- a/include/mtx/identifiers.hpp
-+++ b/include/mtx/identifiers.hpp
-@@ -6,4 +6,6 @@
- #include <nlohmann/json.hpp>
- #endif
-
-+#include <stdexcept>
-+
- namespace mtx {
- namespace identifiers {

diff --git a/dev-libs/mtxclient/mtxclient-0.3.0.ebuild b/dev-libs/mtxclient/mtxclient-0.3.0.ebuild
deleted file mode 100644
index aa3beef8..00000000
--- a/dev-libs/mtxclient/mtxclient-0.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Client API library for Matrix, built on top of Boost.Asio"
-HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient"
-SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/libsodium
-	>=dev-libs/boost-1.70.0
-	dev-libs/olm
-	dev-libs/openssl
-	dev-cpp/nlohmann_json
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/spdlog
-	test? ( dev-cpp/gtest )
-"
-
-# remove_failing_tests depends on remove_network_tests.
-PATCHES=(
-	"${FILESDIR}/0.3.0_remove_network_tests.patch"
-	"${FILESDIR}/0.3.0_remove_failing_tests.patch"
-	"${FILESDIR}/0.3.0_add_missing_header.patch"
-)
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DBUILD_LIB_TESTS="$(usex test)"
-		-DBUILD_LIB_EXAMPLES=OFF
-	)
-
-	if use test; then
-		# Upstream uses a toolchain file to set these, fixed in >0.3.0.
-		mycmakeargs+=(
-			-DCMAKE_CXX_STANDARD=17
-			-DCMAKE_CXX_STANDARD_REQUIRED=ON
-		)
-	fi
-
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/mtxclient/files/, dev-libs/mtxclient/
@ 2020-05-25  1:03 Ronny Gutbrod
  0 siblings, 0 replies; 5+ messages in thread
From: Ronny Gutbrod @ 2020-05-25  1:03 UTC (permalink / raw
  To: gentoo-commits

commit:     655f1afa8d4a5c33c43b9cf6c16f6a7b9f0a3e2c
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Sun May 24 23:32:37 2020 +0000
Commit:     Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Mon May 25 01:01:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=655f1afa

dev-libs/mtxclient: New package.

Dependency for net-im/nheko.

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>

 dev-libs/mtxclient/Manifest                        |  1 +
 .../files/0.3.0_remove_failing_tests.patch         | 38 ++++++++++++
 .../files/0.3.0_remove_network_tests.patch         | 72 ++++++++++++++++++++++
 dev-libs/mtxclient/metadata.xml                    | 11 ++++
 dev-libs/mtxclient/mtxclient-0.3.0.ebuild          | 51 +++++++++++++++
 5 files changed, 173 insertions(+)

diff --git a/dev-libs/mtxclient/Manifest b/dev-libs/mtxclient/Manifest
new file mode 100644
index 0000000..5afa0f8
--- /dev/null
+++ b/dev-libs/mtxclient/Manifest
@@ -0,0 +1 @@
+DIST mtxclient-0.3.0.tar.gz 507299 BLAKE2B 4c36762a3a0a3aafebd414d2c967cc5183710c7be34df9b50078538e7971e86182114ed310ed96a452a02f3d8c1c18fa5aa0de414d0c391d97efb1ce7f1b49f9 SHA512 113eb2c1042e0aeea6607fae0b7fd0ff1655d6b902fa11a3492561c53240901e641f53d413810e932ac210e519026016c5fac38bda1592336c95b2d79781557e

diff --git a/dev-libs/mtxclient/files/0.3.0_remove_failing_tests.patch b/dev-libs/mtxclient/files/0.3.0_remove_failing_tests.patch
new file mode 100644
index 0000000..55de213
--- /dev/null
+++ b/dev-libs/mtxclient/files/0.3.0_remove_failing_tests.patch
@@ -0,0 +1,38 @@
+From b95f9d85f87f78ce5cfbaeed513ea284678eaa83 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Mon, 25 May 2020 00:57:57 +0200
+Subject: [PATCH] Remove failing tests.
+
+---
+ CMakeLists.txt | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 689a091..58868b6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -345,13 +345,6 @@ if(BUILD_LIB_TESTS)
+ 		GTest::Main)
+ 	target_include_directories(utils PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+ 
+-	add_executable(pushrules tests/pushrules.cpp)
+-	target_link_libraries(pushrules
+-		MatrixClient::MatrixClient
+-		GTest::GTest
+-		GTest::Main)
+-	target_include_directories(pushrules PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+-
+ 	add_executable(identifiers tests/identifiers.cpp)
+ 	target_link_libraries(identifiers
+ 		MatrixClient::MatrixClient
+@@ -395,7 +388,6 @@ if(BUILD_LIB_TESTS)
+ 		GTest::Main)
+ 
+ 	add_test(Utilities utils)
+-	add_test(Pushrules pushrules)
+ 	add_test(Identifiers identifiers)
+ 	add_test(Errors errors)
+ 	add_test(CryptoStructs crypto)
+-- 
+2.26.2
+

diff --git a/dev-libs/mtxclient/files/0.3.0_remove_network_tests.patch b/dev-libs/mtxclient/files/0.3.0_remove_network_tests.patch
new file mode 100644
index 0000000..32fc72b
--- /dev/null
+++ b/dev-libs/mtxclient/files/0.3.0_remove_network_tests.patch
@@ -0,0 +1,72 @@
+From e4e068ba5dd3964c890f25bbe668c8a964562ded Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Mon, 25 May 2020 00:50:30 +0200
+Subject: [PATCH] Remove tests that require a network connection.
+
+---
+ CMakeLists.txt | 35 -----------------------------------
+ 1 file changed, 35 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0073604..689a091 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -338,29 +338,6 @@ if(BUILD_LIB_TESTS)
+ 
+ 	file(COPY tests/fixtures DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ 
+-	add_executable(client_api tests/client_api.cpp)
+-	target_link_libraries(client_api
+-		MatrixClient::MatrixClient
+-		GTest::GTest
+-		GTest::Main)
+-	target_include_directories(client_api PRIVATE
+-		${CMAKE_CURRENT_SOURCE_DIR}/tests)
+-
+-	add_executable(media_api tests/media_api.cpp)
+-	target_link_libraries(media_api
+-		MatrixClient::MatrixClient
+-		GTest::GTest
+-		GTest::Main)
+-	target_include_directories(media_api PRIVATE
+-		${CMAKE_CURRENT_SOURCE_DIR}/tests)
+-
+-	add_executable(e2ee tests/e2ee.cpp)
+-	target_link_libraries(e2ee
+-		MatrixClient::MatrixClient
+-		GTest::GTest
+-		GTest::Main)
+-	target_include_directories(e2ee PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+-
+ 	add_executable(utils tests/utils.cpp)
+ 	target_link_libraries(utils
+ 		MatrixClient::MatrixClient
+@@ -375,14 +352,6 @@ if(BUILD_LIB_TESTS)
+ 		GTest::Main)
+ 	target_include_directories(pushrules PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+ 
+-	add_executable(connection tests/connection.cpp)
+-	target_link_libraries(connection
+-		MatrixClient::MatrixClient
+-		GTest::GTest
+-		GTest::Main)
+-	target_include_directories(connection PRIVATE
+-		${CMAKE_CURRENT_SOURCE_DIR}/tests)
+-
+ 	add_executable(identifiers tests/identifiers.cpp)
+ 	target_link_libraries(identifiers
+ 		MatrixClient::MatrixClient
+@@ -425,10 +394,6 @@ if(BUILD_LIB_TESTS)
+ 		GTest::GTest
+ 		GTest::Main)
+ 
+-	add_test(BasicConnectivity connection)
+-	add_test(ClientAPI client_api)
+-	add_test(MediaAPI media_api)
+-	add_test(Encryption e2ee)
+ 	add_test(Utilities utils)
+ 	add_test(Pushrules pushrules)
+ 	add_test(Identifiers identifiers)
+-- 
+2.26.2
+

diff --git a/dev-libs/mtxclient/metadata.xml b/dev-libs/mtxclient/metadata.xml
new file mode 100644
index 0000000..d028932
--- /dev/null
+++ b/dev-libs/mtxclient/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@tastytea.de</email>
+		<name>Ronny (tastytea) Gutbrod</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Nheko-Reborn/mtxclient</remote-id>
+	</upstream>
+</pkgmetadata>

diff --git a/dev-libs/mtxclient/mtxclient-0.3.0.ebuild b/dev-libs/mtxclient/mtxclient-0.3.0.ebuild
new file mode 100644
index 0000000..8690faf
--- /dev/null
+++ b/dev-libs/mtxclient/mtxclient-0.3.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Client API library for Matrix, built on top of Boost.Asio"
+HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient"
+SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/libsodium
+	>=dev-libs/boost-1.70.0
+	dev-libs/olm
+	dev-libs/openssl
+	dev-cpp/nlohmann_json
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/spdlog
+	test? ( dev-cpp/gtest )
+"
+
+# remove_failing_tests depends on remove_network_tests.
+PATCHES=(
+	"${FILESDIR}/0.3.0_remove_network_tests.patch"
+	"${FILESDIR}/0.3.0_remove_failing_tests.patch"
+)
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DBUILD_LIB_TESTS="$(usex test)"
+		-DBUILD_LIB_EXAMPLES=OFF
+	)
+
+	if use test; then
+		# Upstream uses a toolchain file to set these.
+		mycmakeargs+=(
+			-DCMAKE_CXX_STANDARD=17
+			-DCMAKE_CXX_STANDARD_REQUIRED=ON
+		)
+	fi
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-07-23 16:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-26  3:18 [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/mtxclient/files/, dev-libs/mtxclient/ Ronny Gutbrod
  -- strict thread matches above, loose matches on Subject: below --
2022-07-23 16:15 Ronny Gutbrod
2021-11-19  1:15 Ronny Gutbrod
2021-01-20  3:39 Ronny Gutbrod
2020-05-25  1:03 Ronny Gutbrod

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox