commit: 207d8bd75d7a02214e01ab1e9327def9484473b9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Oct 21 21:33:51 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Oct 21 21:34:51 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=207d8bd7
x11-libs/tslib: Use upstreamed CMake 3.10 minimum patch Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> x11-libs/tslib/files/tslib-1.23-cmake4-1.patch | 21 +++++++-------------- x11-libs/tslib/tslib-1.23-r1.ebuild | 6 +++--- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/x11-libs/tslib/files/tslib-1.23-cmake4-1.patch b/x11-libs/tslib/files/tslib-1.23-cmake4-1.patch index b8c28114ca82..9bbfca909cd1 100644 --- a/x11-libs/tslib/files/tslib-1.23-cmake4-1.patch +++ b/x11-libs/tslib/files/tslib-1.23-cmake4-1.patch @@ -1,19 +1,15 @@ -From eaa4a100fdcb5e2eac02d8b44a73cd6ad9caafd8 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -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 <[email protected]> +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 <[email protected]> +Co-authored-by: kyehn <[email protected]> --- 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 - diff --git a/x11-libs/tslib/tslib-1.23-r1.ebuild b/x11-libs/tslib/tslib-1.23-r1.ebuild index 6a9d962ecebe..2b448913aa87 100644 --- a/x11-libs/tslib/tslib-1.23-r1.ebuild +++ b/x11-libs/tslib/tslib-1.23-r1.ebuild @@ -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() {
