* [gentoo-commits] repo/gentoo:master commit in: dev-libs/olm/files/, dev-libs/olm/
@ 2024-10-19 7:30 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2024-10-19 7:30 UTC (permalink / raw
To: gentoo-commits
commit: 0b5a324bd397fc72e02916464875960fc6d7dd6c
Author: Gavin D. Howard <gavin <AT> gavinhoward <DOT> com>
AuthorDate: Mon Oct 7 11:22:39 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 19 07:27:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b5a324b
dev-libs/olm: fix compilation on Clang 19
Bug: https://bugs.gentoo.org/940764
Signed-off-by: Gavin D. Howard <gavin <AT> gavinhoward.com>
Closes: https://github.com/gentoo/gentoo/pull/38900
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/olm/files/olm-3.2.16-clang-19-const.patch | 17 +++++++++++++
dev-libs/olm/olm-3.2.16-r1.ebuild | 28 ++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/dev-libs/olm/files/olm-3.2.16-clang-19-const.patch b/dev-libs/olm/files/olm-3.2.16-clang-19-const.patch
new file mode 100644
index 000000000000..688e3290fb37
--- /dev/null
+++ b/dev-libs/olm/files/olm-3.2.16-clang-19-const.patch
@@ -0,0 +1,17 @@
+Fixes compilation on Clang 19.
+Patch by Marco Rebhan <me@dblsaiko.net>
+Fixes https://bugs.gentoo.org/940764
+
+Signed-off-by: Gavin D. Howard <gavin@gavinhoward.com>
+
+--- a/include/olm/list.hh
++++ b/include/olm/list.hh
+@@ -99,7 +99,7 @@ public:
+ return *this;
+ }
+ T * this_pos = _data;
+- T * const other_pos = other._data;
++ T const * other_pos = other._data;
+ while (other_pos != other._end) {
+ *this_pos = *other;
+ ++this_pos;
diff --git a/dev-libs/olm/olm-3.2.16-r1.ebuild b/dev-libs/olm/olm-3.2.16-r1.ebuild
new file mode 100644
index 000000000000..7a54cba592ae
--- /dev/null
+++ b/dev-libs/olm/olm-3.2.16-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 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
+ "${FILESDIR}/${P}-clang-19-const.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/olm/files/, dev-libs/olm/
@ 2025-03-15 21:01 Petr Vaněk
0 siblings, 0 replies; 3+ messages in thread
From: Petr Vaněk @ 2025-03-15 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 397e32c285311eb7771d09b62a3fcb74bfb16d37
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 15 21:00:17 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Sat Mar 15 21:01:25 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397e32c2
dev-libs/olm: drop 3.2.15
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
dev-libs/olm/Manifest | 1 -
dev-libs/olm/files/olm-3.2.15-cmake.patch | 59 -------------------------------
dev-libs/olm/olm-3.2.15.ebuild | 25 -------------
3 files changed, 85 deletions(-)
diff --git a/dev-libs/olm/Manifest b/dev-libs/olm/Manifest
index f5e4eb869158..7d28bae15a46 100644
--- a/dev-libs/olm/Manifest
+++ b/dev-libs/olm/Manifest
@@ -1,2 +1 @@
-DIST olm-3.2.15.tar.bz2 2744760 BLAKE2B 44486a63217998010a0bb7e01ff3315c88e139d686b97158e67af29b2f052912412541fb944a17c5d8931df9c641a73e521ef8d0ff352b80fe30bd6fb73b2e7b SHA512 81832766e477fc17908e8d1c49b5403d87b5977fd9102605d95ef2a3907619b7301e32fe0e18ec0f575b1f004ce248633307ff43b0f48bc9bb2313cdfefd6ea7
DIST olm-3.2.16.tar.bz2 2744360 BLAKE2B 236cd08cb4f014ef4f90377fe30907490dbf6482629ab47a779114c711de1855c44874a45ee92f4f55d7c100abbbde2c427996ce534dd95ce401a7549db351b7 SHA512 504ddc91297e7aef99e9b25f73b33bac29716ca33eb333bf1217b719d8862438e2cdaadd88cef3dc84e9f618bcc9eeeaf7e513f2d6909cc4a3d98a5dd79b0581
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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/olm/files/, dev-libs/olm/
@ 2025-10-05 17:45 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-10-05 17:45 UTC (permalink / raw
To: gentoo-commits
commit: 849bf56bb3afc2bd4ec834ce789976437b471d13
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 5 14:24:23 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 5 17:44:06 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=849bf56b
dev-libs/olm: Fix build w/ cmake-4, remove unused bundled dir
Raise cmake_minimum_required to 3.31
Closes: https://bugs.gentoo.org/955895
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/olm/files/olm-3.2.16-cmake4.patch | 23 +++++++++++++++++++++++
dev-libs/olm/olm-3.2.16-r1.ebuild | 8 ++++++++
2 files changed, 31 insertions(+)
diff --git a/dev-libs/olm/files/olm-3.2.16-cmake4.patch b/dev-libs/olm/files/olm-3.2.16-cmake4.patch
new file mode 100644
index 000000000000..a480d8d2c552
--- /dev/null
+++ b/dev-libs/olm/files/olm-3.2.16-cmake4.patch
@@ -0,0 +1,23 @@
+From 6447282221084f46a7d39cf5a71ebd063a2302df Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 5 Oct 2025 16:21:57 +0200
+Subject: [PATCH] Raise cmake_minimum_required to 3.31 to fix build w/ cmake-4
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 951965f..24ca631 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.31)
+
+ project(olm VERSION 3.2.16 LANGUAGES CXX C)
+
+--
+2.51.0
+
diff --git a/dev-libs/olm/olm-3.2.16-r1.ebuild b/dev-libs/olm/olm-3.2.16-r1.ebuild
index d00872b902cc..c14640533cfd 100644
--- a/dev-libs/olm/olm-3.2.16-r1.ebuild
+++ b/dev-libs/olm/olm-3.2.16-r1.ebuild
@@ -15,11 +15,19 @@ KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
+BDEPEND=">=dev-build/cmake-3.31"
+
PATCHES=(
"${FILESDIR}/${P}-cmake.patch" # TODO: upstream
+ "${FILESDIR}/${P}-cmake4.patch" # bug 955895
"${FILESDIR}/${P}-clang-19-const.patch"
)
+src_prepare() {
+ rm -rv lib/doctest || die # unused bundled stuff using <CMake-3.5
+ cmake_src_prepare
+}
+
src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-10-05 17:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-05 17:45 [gentoo-commits] repo/gentoo:master commit in: dev-libs/olm/files/, dev-libs/olm/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-03-15 21:01 Petr Vaněk
2024-10-19 7:30 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox