diff options
Diffstat (limited to 'dev-libs/olm')
-rw-r--r-- | dev-libs/olm/Manifest | 3 | ||||
-rw-r--r-- | dev-libs/olm/files/olm-3.2.15-cmake.patch | 59 | ||||
-rw-r--r-- | dev-libs/olm/olm-3.2.15.ebuild | 25 |
3 files changed, 0 insertions, 87 deletions
diff --git a/dev-libs/olm/Manifest b/dev-libs/olm/Manifest index c30893aa115a..5cea3cd239a5 100644 --- a/dev-libs/olm/Manifest +++ b/dev-libs/olm/Manifest @@ -1,9 +1,6 @@ -AUX olm-3.2.15-cmake.patch 1585 BLAKE2B 4de4f3e6e29792fc697f40dbc303ad630222491a4692a05a953b1db7518ae22a557acdc570e3f0bd3dc080bc46aae128ec380963ee5274506e446f678f26472b SHA512 025fd3dbc26d59d3b5db1ac3a77e72dee396acdf1b3c2ee2d3746a6b1e2cf2c6965083707d3fc7df88a6f0c62729601f5df7e262998c806d98d2159fd6dbbfb2 AUX olm-3.2.16-clang-19-const.patch 501 BLAKE2B a0deafe652091a5600cb046f8bf4dd7a2431dace5779f4ede25f46b93e6db9b54ea4c189d6e7f531775b4e472fe5c31efc625a3c75d43639a3193c505d7ccdd5 SHA512 179ada66d4e2024f30aff1255b6da432c747c0bc743b01e6393fc67f3d18512c3dc1b9857c52f8571dc27288429b9b70420a783ea99cff5317a0e67c97ac3d2c AUX olm-3.2.16-cmake.patch 1573 BLAKE2B e7667c692b017060b20f86e69d3e37ddda7bd6642e60fcb7570b58ce4a4523fec5234635431b17ec0e01650d8935aefec3082433992c4928c92fc22b7f2f1b5f SHA512 a191e607f4c6d48a4692f20e2efd09ec1c4e10156bb60a23f859483d46d2ccd0074b210c80ce4543f22e76eeb4799b8e640706010c5ad1b26549dd310ddb0b46 -DIST olm-3.2.15.tar.bz2 2744760 BLAKE2B 44486a63217998010a0bb7e01ff3315c88e139d686b97158e67af29b2f052912412541fb944a17c5d8931df9c641a73e521ef8d0ff352b80fe30bd6fb73b2e7b SHA512 81832766e477fc17908e8d1c49b5403d87b5977fd9102605d95ef2a3907619b7301e32fe0e18ec0f575b1f004ce248633307ff43b0f48bc9bb2313cdfefd6ea7 DIST olm-3.2.16.tar.bz2 2744360 BLAKE2B 236cd08cb4f014ef4f90377fe30907490dbf6482629ab47a779114c711de1855c44874a45ee92f4f55d7c100abbbde2c427996ce534dd95ce401a7549db351b7 SHA512 504ddc91297e7aef99e9b25f73b33bac29716ca33eb333bf1217b719d8862438e2cdaadd88cef3dc84e9f618bcc9eeeaf7e513f2d6909cc4a3d98a5dd79b0581 -EBUILD olm-3.2.15.ebuild 604 BLAKE2B b3c34c37603490ef1f603d6207fd7edc801c6a42b43ec06f6e48a22690351a657f874c98045ac53b21cbce861a1cb169e9d7e636693a83bf4119dec938005fb3 SHA512 359c1abc4b29c5e14b76044650655ee730d6865ffcaa588082f0b31c3c22d883d79849d185416a144cd450f1924bf5ec65d4bc5ac14c7e39d3a36404cee24365 EBUILD olm-3.2.16-r1.ebuild 649 BLAKE2B fa77431197c9ff4cc986b23d277e886b5041fe4dba2389d3db5d4297d8f4f1dce1bf8088e888eda7ff9498892041df62da4176e4317ab73a3b280d68e490b04f SHA512 2a69e314b58d84dda0cdff1aa9980e5b0905cde66c69edf375f9bc460ae9b651830d2d719c15b218d693b3be9e0c293ffd5bfd2fad0851c6f993a4f64214d4a1 EBUILD olm-3.2.16.ebuild 604 BLAKE2B e5904cddaf06bd6f8b77f54e29dbafd7767d1620700c1a05016e15c412867049b32b8c752abddd663e71827d02f400912be0421861f71f2dbe510430ad1ee5a4 SHA512 f1b66e4f7cd86a6034f6ffd04fb9d384aba5f49089adf0cdc9b673aa02ecabce99b8beab4ac4a9d7f307ff5b9d5bd164f2478dadfe465b4ee10abbedbdf760be MISC metadata.xml 703 BLAKE2B da390f27931e3c95933b24227537294bd33def6b6736b87a6c1accaaa87d354496653ea9dbc08ec17566c99233c89a30a26c6696bd97f8c8e2613ee320705599 SHA512 01845e6fb0f46e1caf04a0bd6025ae339bdbf8bfdb750ded1031917c87f0b8cf220403f49bbfceffd08479bad2ceb1e26b2c81ecbee7d7ab75b35d2195f064be diff --git a/dev-libs/olm/files/olm-3.2.15-cmake.patch b/dev-libs/olm/files/olm-3.2.15-cmake.patch deleted file mode 100644 index d656bcbedbd4..000000000000 --- a/dev-libs/olm/files/olm-3.2.15-cmake.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 5567dc0ef9133df7cea5b9ae29c4fb642a8fbe83 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Thu, 8 Jun 2023 11:40:01 +0200 -Subject: [PATCH] Use CTest module and standard BUILD_TESTING switch - -Improves downstream package testing integration. - -See also: -https://cmake.org/cmake/help/latest/command/enable_testing.html -https://cmake.org/cmake/help/latest/module/CTest.html#module:CTest - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 5 +++-- - tests/CMakeLists.txt | 2 -- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a271b54..a62ea8f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.4) - - project(olm VERSION 3.2.15 LANGUAGES CXX C) - --option(OLM_TESTS "Build tests" ON) - option(BUILD_SHARED_LIBS "Build as a shared library" ON) - - add_definitions(-DOLMLIB_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}) -@@ -52,6 +51,8 @@ add_library(olm - lib/curve25519-donna/curve25519-donna.c) - add_library(Olm::Olm ALIAS olm) - -+include(CTest) -+ - # restrict the exported symbols - include(GenerateExportHeader) - generate_export_header(olm -@@ -137,6 +138,6 @@ export(EXPORT olm-targets - NAMESPACE Olm::) - export(PACKAGE Olm) - --if (OLM_TESTS) -+if (BUILD_TESTING) - add_subdirectory(tests) - endif() -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 0343abb..64585ca 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -1,5 +1,3 @@ --enable_testing() -- - set(TEST_LIST - base64 - crypto --- -2.41.0 - diff --git a/dev-libs/olm/olm-3.2.15.ebuild b/dev-libs/olm/olm-3.2.15.ebuild deleted file mode 100644 index de19b07c052f..000000000000 --- a/dev-libs/olm/olm-3.2.15.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Implementation of the Double Ratchet cryptographic ratchet in C++" -HOMEPAGE="https://gitlab.matrix.org/matrix-org/olm" -SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # TODO: upstream - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - ) - cmake_src_configure -} |