From: bunk@debian.org
Control: tags 1113527 + patch
Control: tags 1113527 + pending
Dear maintainer,
I've prepared an NMU for sonic-pi (versioned as 3.2.2~repack-12.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it.
cu
Adrian
diffstat for sonic-pi-3.2.2~repack sonic-pi-3.2.2~repack
changelog | 9 +++++++++
control | 2 +-
patches/15-cmake-4.patch | 13 +++++++++++++
patches/series | 1 +
4 files changed, 24 insertions(+), 1 deletion(-)
diff -Nru sonic-pi-3.2.2~repack/debian/changelog sonic-pi-3.2.2~
epack/debian/changelog
--- sonic-pi-3.2.2~repack/debian/changelog 2025-07-06 15:09:15.000000000
+0300
+++ sonic-pi-3.2.2~repack/debian/changelog 2025-10-10 14:52:14.000000000
+0300
@@ -1,3 +1,12 @@
+sonic-pi (3.2.2~repack-12.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream fix for FTBFS with CMake 4. (Closes: #1113527)
+ * Architecture: any instead of hardcoding an architecture list,
+ build dependencies will determine where the package gets built.
+
+ -- Adrian Bunk Fri, 10 Oct 2025 14:52:14 +0300
+
sonic-pi (3.2.2~repack-12) unstable; urgency=medium
* Drop autopkgtest depends on jack-capture (Closes: #1108758)
diff -Nru sonic-pi-3.2.2~repack/debian/control sonic-pi-3.2.2~re
ack/debian/control
--- sonic-pi-3.2.2~repack/debian/control 2025-07-06 14:55:45.000000000 +0300
+++ sonic-pi-3.2.2~repack/debian/control 2025-10-10 14:52:14.000000000 +0300
@@ -41,7 +41,7 @@
Vcs-Git: https://salsa.debian.org/multimedia-team/sonic-pi.git
Package: sonic-pi
-Architecture: i386 amd64 arm64 armhf mipsel
+Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
diff -Nru sonic-pi-3.2.2~repack/debian/patches/15-cmake-4.patch
onic-pi-3.2.2~repack/debian/patches/15-cmake-4.patch
--- sonic-pi-3.2.2~repack/debian/patches/15-cmake-4.patch 1970-01-01
02:00:00.000000000 +0200
+++ sonic-pi-3.2.2~repack/debian/patches/15-cmake-4.patch 2025-10-10
14:52:14.000000000 +0300
@@ -0,0 +1,13 @@
+Description: Fix FTBFS with CMake 4
+Author: Adrian Bunk
+Bug-Debian: https://bugs.debian.org/1113527
+Origin: backport, https://github.com/sonic-pi-net/sonic-pi/comm
t/60aa991654b78214f6d10db521c6a4b9bd141559
+
+--- sonic-pi-3.2.2~repack.orig/app/gui/qt/CMakeLists.txt
++++ sonic-pi-3.2.2~repack/app/gui/qt/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.2)
++cmake_minimum_required(VERSION 3.5)
+
+ message(STATUS " CMakeLists: Sonic Pi")
+
diff -Nru sonic-pi-3.2.2~repack/debian/patches/series sonic-pi-3
2.2~repack/debian/patches/series
--- sonic-pi-3.2.2~repack/debian/patches/series 2025-07-06 14:55:45.
000000000
+0300
+++ sonic-pi-3.2.2~repack/debian/patches/series 2025-10-10 14:52:14.
000000000
+0300
@@ -10,3 +10,4 @@
12-tutorial-language.patch
13-remove-deprecated-ruby-calls.patch
14-update-ruby-mocha.patch
+15-cmake-4.patch
--- SoupGate-Win32 v1.05
* Origin: you cannot sedate... all the things you hate (1:229/2)
|
