From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3498B1581B9 for ; Sun, 05 Oct 2025 17:45:45 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 220F634198D for ; Sun, 05 Oct 2025 17:45:45 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 629EB110576; Sun, 05 Oct 2025 17:45:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 5923C110576 for ; Sun, 05 Oct 2025 17:45:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 149E5340F8F for ; Sun, 05 Oct 2025 17:45:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C8A13AA9 for ; Sun, 05 Oct 2025 17:45:26 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1759686246.849bf56bb3afc2bd4ec834ce789976437b471d13.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/olm/files/, dev-libs/olm/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/olm/files/olm-3.2.16-cmake4.patch dev-libs/olm/olm-3.2.16-r1.ebuild X-VCS-Directories: dev-libs/olm/files/ dev-libs/olm/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 849bf56bb3afc2bd4ec834ce789976437b471d13 X-VCS-Branch: master Date: Sun, 05 Oct 2025 17:45:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7fe611e6-2fe5-4150-a977-32be8bfbd8b8 X-Archives-Hash: cc60fb8efec5ec50988e34e8368eacb5 commit: 849bf56bb3afc2bd4ec834ce789976437b471d13 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 5 14:24:23 2025 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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 +--- + 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