diff options
| author |   Nicolas Werner <nicolas.werner@hotmail.de> | 2019-10-12 11:27:09 +0200 |
|---|---|---|
| committer |   PureTryOut <bribbers@disroot.org> | 2019-10-18 14:10:36 +0000 |
| commit | 52dcbaffc9664bcb7df8fad9711580a304fd764a (patch) | |
| tree | 2e3465fdcb47febc6f179e5af706ca633bd0834a | |
| parent | net-im/riot-web: upgrade to 1.5.0 (diff) | |
| download | matrix-52dcbaffc9664bcb7df8fad9711580a304fd764a.tar.gz matrix-52dcbaffc9664bcb7df8fad9711580a304fd764a.tar.bz2 matrix-52dcbaffc9664bcb7df8fad9711580a304fd764a.zip | |
dev-libs/mtxclient: drop nlohmann_json patch
It is not needed anymore, since the gentoo repo switched back to
building nlohmann_json with cmake.
| -rw-r--r-- | dev-libs/mtxclient/files/find_nlohmann_json_meson.patch | 37 | ||||
| -rw-r--r-- | dev-libs/mtxclient/mtxclient-0.2.1-r1.ebuild (renamed from dev-libs/mtxclient/mtxclient-0.2.1.ebuild) | 5 | ||||
| -rw-r--r-- | dev-libs/mtxclient/mtxclient-9999.ebuild | 5 |
3 files changed, 2 insertions, 45 deletions
diff --git a/dev-libs/mtxclient/files/find_nlohmann_json_meson.patch b/dev-libs/mtxclient/files/find_nlohmann_json_meson.patch deleted file mode 100644 index 2cde441..0000000 --- a/dev-libs/mtxclient/files/find_nlohmann_json_meson.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 71058f0..5882591 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -81,12 +81,7 @@ set_package_properties(sodium PROPERTIES - TYPE REQUIRED - ) - --find_package(nlohmann_json 3.2.0) --set_package_properties(nlohmann_json PROPERTIES -- DESCRIPTION "JSON for Modern C++, a C++11 header-only JSON class" -- URL "https://nlohmann.github.io/json/" -- TYPE REQUIRED --) -+pkg_search_module(JSON REQUIRED nlohmann_json>=3.2.0) - - set(Boost_USE_STATIC_LIBS OFF) - set(Boost_USE_STATIC_RUNTIME OFF) -@@ -157,7 +152,8 @@ target_include_directories(matrix_client - PUBLIC - ${Boost_INCLUDE_DIRS} - ${OPENSSL_INCLUDE_DIR} -- ${sodium_INCLUDE_DIR}) -+ ${sodium_INCLUDE_DIR} -+ ${JSON_INCLUDE_DIRS}) - target_include_directories( - matrix_client - PUBLIC -@@ -171,7 +167,7 @@ target_link_libraries(matrix_client - OpenSSL::SSL - Olm::Olm - ZLIB::ZLIB -- nlohmann_json::nlohmann_json) -+ ${JSON_LIBRARIES}) - - if(NOT MSVC AND NOT APPLE) - target_link_libraries(matrix_client PUBLIC Threads::Threads) diff --git a/dev-libs/mtxclient/mtxclient-0.2.1.ebuild b/dev-libs/mtxclient/mtxclient-0.2.1-r1.ebuild index da6d62e..a44651d 100644 --- a/dev-libs/mtxclient/mtxclient-0.2.1.ebuild +++ b/dev-libs/mtxclient/mtxclient-0.2.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -DESCRIPTION="An implementation of the Double Ratchet cryptographic ratchet in C++" +DESCRIPTION="Client API library for Matrix, built on top of Boost.Asio" HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient" inherit eutils cmake-utils @@ -20,9 +20,6 @@ LICENSE="GPL-3" SLOT="0" IUSE="-test" -PATCHES=( - "${FILESDIR}/find_nlohmann_json_meson.patch" -) RDEPEND=" dev-libs/libsodium >=dev-libs/boost-1.66.0 diff --git a/dev-libs/mtxclient/mtxclient-9999.ebuild b/dev-libs/mtxclient/mtxclient-9999.ebuild index da6d62e..a44651d 100644 --- a/dev-libs/mtxclient/mtxclient-9999.ebuild +++ b/dev-libs/mtxclient/mtxclient-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -DESCRIPTION="An implementation of the Double Ratchet cryptographic ratchet in C++" +DESCRIPTION="Client API library for Matrix, built on top of Boost.Asio" HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient" inherit eutils cmake-utils @@ -20,9 +20,6 @@ LICENSE="GPL-3" SLOT="0" IUSE="-test" -PATCHES=( - "${FILESDIR}/find_nlohmann_json_meson.patch" -) RDEPEND=" dev-libs/libsodium >=dev-libs/boost-1.66.0 |