millerson.name/gentoo
2
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-06 00:05:54 +03:00
Code Packages Projects Releases Wiki Activity

x11-libs/tslib: Use upstreamed CMake 3.10 minimum patch

Browse Source 
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2025-10-21 23:33:51 +02:00
parent 60c1b263db
commit 207d8bd75d
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
x11-libs/tslib/files/tslib-1.23-cmake4-1.patch
View File

@@ -1,19 +1,15 @@
From eaa4a100fdcb5e2eac02d8b44a73cd6ad9caafd8 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Fri, 17 Oct 2025 12:44:25 +0200
Subject: [PATCH] Bump minimum CMAKE_MINIMUM_REQUIRED version to 3.5, set range
up to 3.31
From 972a8eb7b768a7d4d97ab3364e5da8e612d88068 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 18 Oct 2025 10:21:59 +0200
Subject: [PATCH] CMake: bump minimal required version
CMake 3.31 started to warn about removing < 3.10 compatibility in the future.
CMake 4 dropped < 3.5 compatibility.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Co-authored-by: kyehn <kyehn@users.noreply.github.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 269ea77..6bacc4f 100644
index 269ea77..3fd863c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@
@@ -21,10 +17,7 @@ index 269ea77..6bacc4f 100644
#
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.10..3.31)
+cmake_minimum_required(VERSION 3.10)
project(tslib LANGUAGES C)
--
2.51.0

6
x11-libs/tslib/tslib-1.23-r1.ebuild
View File

@@ -24,9 +24,9 @@ BDEPEND="evdev? ( virtual/pkgconfig )"
DOCS=( AUTHORS NEWS README{,.md} )
PATCHES=(
"${FILESDIR}/${PN}-1.21-optional-utils.patch"
"${FILESDIR}/${P}-cmake4-1.patch" # bug 955696
"${FILESDIR}/${P}-fix-64bit-time_t-printf-ub.patch"
"${FILESDIR}/${PN}-1.21-optional-utils.patch" # downstream
"${FILESDIR}/${P}-cmake4-1.patch" # bug 955696, git master
"${FILESDIR}/${P}-fix-64bit-time_t-printf-ub.patch" # git master
)
src_configure() {