commit:     84702d1150f55f69ddd4a3d9e6e21464a5359b50
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Sat Jun  7 10:06:01 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  7 16:11:44 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84702d11

dev-debug/apitrace: bump cmake_min_required

backport patch from upstream to set compatibility with cmake-4

refresh status of patches

Closes: https://bugs.gentoo.org/957273
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/42483
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-debug/apitrace/apitrace-12.0.ebuild            |  6 ++++--
 .../files/apitrace-12.0-bump_cmake_min.patch       | 24 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/dev-debug/apitrace/apitrace-12.0.ebuild 
b/dev-debug/apitrace/apitrace-12.0.ebuild
index 416ec38f9794..16c4f03c4605 100644
--- a/dev-debug/apitrace/apitrace-12.0.ebuild
+++ b/dev-debug/apitrace/apitrace-12.0.ebuild
@@ -39,13 +39,15 @@ BDEPEND="
 
 PATCHES=(
        "${FILESDIR}"/${PN}-9.0-disable-multiarch.patch
-       "${FILESDIR}"/${PN}-9.0-pkgconfig-waffle.patch
        "${FILESDIR}"/${PN}-12.0-find_snappy.patch
-       "${FILESDIR}"/${PN}-12.0-no_qtnetwork.patch
        "${FILESDIR}"/${PN}-12.0-tests.patch
        "${FILESDIR}"/${PN}-12.0-unbundle.patch
+
        # merged, to be removed for the next version
+       "${FILESDIR}"/${PN}-9.0-pkgconfig-waffle.patch
        "${FILESDIR}"/${PN}-12.0-include-stdint.patch
+       "${FILESDIR}"/${PN}-12.0-no_qtnetwork.patch
+       "${FILESDIR}"/${PN}-12.0-bump_cmake_min.patch
 )
 
 src_prepare() {

diff --git a/dev-debug/apitrace/files/apitrace-12.0-bump_cmake_min.patch 
b/dev-debug/apitrace/files/apitrace-12.0-bump_cmake_min.patch
new file mode 100644
index 000000000000..9ea7db8d15f9
--- /dev/null
+++ b/dev-debug/apitrace/files/apitrace-12.0-bump_cmake_min.patch
@@ -0,0 +1,24 @@
+bump cmake_min_required for cmake-4 compatibility
+https://github.com/apitrace/apitrace/commit/fd643354337000c4d1b4497e1ac2fec381202d40
+From fd643354337000c4d1b4497e1ac2fec381202d40 Mon Sep 17 00:00:00 2001
+From: Jose Fonseca <[email protected]>
+Date: Thu, 6 Mar 2025 16:13:30 +0000
+Subject: [PATCH] Bump cmake_minimum_required.
+
+---
+ thirdparty/libbacktrace.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/thirdparty/libbacktrace.cmake b/thirdparty/libbacktrace.cmake
+index c3d81d975..0e7b4ce51 100644
+--- a/thirdparty/libbacktrace.cmake
++++ b/thirdparty/libbacktrace.cmake
+@@ -29,7 +29,7 @@
+ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ # POSSIBILITY OF SUCH DAMAGE.  */
+ 
+-cmake_minimum_required (VERSION 3.1)
++cmake_minimum_required (VERSION 3.5)
+ 
+ project (libbacktrace)
+ 

Reply via email to