Control: tags 1113393 + patch
Control: tags 1113393 + pending

Dear maintainer,

I've prepared an NMU for pcsx2 (versioned as 1.6.0+dfsg-3.1) and 
uploaded it to DELAYED/14. Please feel free to tell me if I should 
cancel it.

cu
Adrian
diffstat for pcsx2-1.6.0+dfsg pcsx2-1.6.0+dfsg

 changelog             |    7 +++++++
 patches/cmake-4.patch |   16 ++++++++++++++++
 patches/series        |    1 +
 3 files changed, 24 insertions(+)

diff -Nru pcsx2-1.6.0+dfsg/debian/changelog pcsx2-1.6.0+dfsg/debian/changelog
--- pcsx2-1.6.0+dfsg/debian/changelog	2024-12-23 16:57:26.000000000 +0200
+++ pcsx2-1.6.0+dfsg/debian/changelog	2025-10-25 21:00:13.000000000 +0300
@@ -1,3 +1,10 @@
+pcsx2 (1.6.0+dfsg-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream fix for FTBFS with CMake 4. (Closes: #1113393)
+
+ -- Adrian Bunk <[email protected]>  Sat, 25 Oct 2025 21:00:13 +0300
+
 pcsx2 (1.6.0+dfsg-3) unstable; urgency=medium
 
   * Team Upload
diff -Nru pcsx2-1.6.0+dfsg/debian/patches/cmake-4.patch pcsx2-1.6.0+dfsg/debian/patches/cmake-4.patch
--- pcsx2-1.6.0+dfsg/debian/patches/cmake-4.patch	1970-01-01 02:00:00.000000000 +0200
+++ pcsx2-1.6.0+dfsg/debian/patches/cmake-4.patch	2025-10-25 21:00:13.000000000 +0300
@@ -0,0 +1,16 @@
+Description: Fix FTBFS with CMake 4
+Author: Adrian Bunk <[email protected]>
+Bug-Debian: https://bugs.debian.org/1113393
+Origin: backport, https://github.com/PCSX2/pcsx2/commit/5c60f66890afeb8d2e762a9a7c34013895def630
+
+--- pcsx2-1.6.0+dfsg.orig/CMakeLists.txt
++++ pcsx2-1.6.0+dfsg/CMakeLists.txt
+@@ -4,7 +4,7 @@ project(Pcsx2)
+ # Debian-based distributions require at least 2.8.5 due to multiarch.
+ # Bumping up to 3.0 seems reasonable at this point, and will let us modernize
+ # things a bit.
+-cmake_minimum_required(VERSION 3.0.2)
++cmake_minimum_required(VERSION 3.0.2...3.5)
+ 
+ # Variable to check that people use the good file
+ set(TOP_CMAKE_WAS_SOURCED TRUE)
diff -Nru pcsx2-1.6.0+dfsg/debian/patches/series pcsx2-1.6.0+dfsg/debian/patches/series
--- pcsx2-1.6.0+dfsg/debian/patches/series	2024-12-23 16:37:39.000000000 +0200
+++ pcsx2-1.6.0+dfsg/debian/patches/series	2025-10-25 21:00:13.000000000 +0300
@@ -1,2 +1,3 @@
 wxwidgets3.2.patch
 cpp_error_ftbfs.patch
+cmake-4.patch

Reply via email to