diff mbox series

[meta-oe,2/2] transmission: Fix build with cmake4

Message ID 20250712183435.4123243-2-raj.khem@gmail.com
State New
Headers show
Series [meta-oe,1/2] wxwidget: Upgrade to 3.2.8 | expand

Commit Message

Khem Raj July 12, 2025, 6:34 p.m. UTC 
Backport patches for a few sub-modules

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...crease-minimum-CMake-version-to-3.10.patch | 30 ++++++++++++++++++
 ...1-build-bump-CMake-version-to-3.10-4.patch | 26 ++++++++++++++++
 ...ld-set-minimum-required-CMake-to-3.5.patch | 31 +++++++++++++++++++
 .../files/0001-bump-cmake-to-3.10.patch       | 21 +++++++++++++
 ...miniupnpc-bump-CMake-version-to-3.14.patch | 21 +++++++++++++
 .../transmission/transmission_4.0.6.bb        |  5 +++
 6 files changed, 134 insertions(+)
 create mode 100644 meta-oe/recipes-connectivity/transmission/files/0001-Increase-minimum-CMake-version-to-3.10.patch
 create mode 100644 meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch
 create mode 100644 meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch
 create mode 100644 meta-oe/recipes-connectivity/transmission/files/0001-bump-cmake-to-3.10.patch
 create mode 100644 meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-Increase-minimum-CMake-version-to-3.10.patch b/meta-oe/recipes-connectivity/transmission/files/0001-Increase-minimum-CMake-version-to-3.10.patch
new file mode 100644
index 0000000000..dc293660ff
--- /dev/null
+++ b/meta-oe/recipes-connectivity/transmission/files/0001-Increase-minimum-CMake-version-to-3.10.patch
@@ -0,0 +1,30 @@ 
+From b6a145b5a525d892279d87dec4f35785f7d7c3b9 Mon Sep 17 00:00:00 2001
+From: Eric Biggers <ebiggers@google.com>
+Date: Sun, 17 Nov 2024 18:39:29 -0800
+Subject: [PATCH] Increase minimum CMake version to 3.10
+
+CMake 3.31 warns:
+
+    CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
+      Compatibility with CMake < 3.10 will be removed from a future version of
+      CMake.
+
+      Update the VERSION argument <min> value or use a ...<max> suffix to tell
+      CMake that the project does not need compatibility with older versions.
+
+Upstream-Status: Backport [https://github.com/ebiggers/libdeflate/pull/402]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d3bc08d..3ca6d64 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.7)
++cmake_minimum_required(VERSION 3.10)
+ 
+ # Default to a release build.
+ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch b/meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch
new file mode 100644
index 0000000000..a08366a36d
--- /dev/null
+++ b/meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch
@@ -0,0 +1,26 @@ 
+From a18ae078a32e08a7193d0bae20190060bd1e8b85 Mon Sep 17 00:00:00 2001
+From: Yat Ho <lagoho7@gmail.com>
+Date: Thu, 1 May 2025 09:14:19 +0800
+Subject: [PATCH] build: bump CMake version to 3.10 (#4)
+
+CMake < 3.5 compatibility has been removed from CMake 4.0 and CMake < 3.10 compatibility has been deprecated in CMake 3.31.
+
+https://cmake.org/cmake/help/latest/release/4.0.html
+https://cmake.org/cmake/help/latest/release/3.31.html
+
+Upstream-Status: Backport [https://github.com/transmission/dht/commit/38c9f261d9b58b76b9eaf85f84ec1b35151a1eac]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6d4aa99..596dbfb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.10)
+ project(dht C)
+ 
+ add_library(${PROJECT_NAME} STATIC
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch b/meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch
new file mode 100644
index 0000000000..887bc21114
--- /dev/null
+++ b/meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch
@@ -0,0 +1,31 @@ 
+From 9c5ed3204bdb722b5624f6b9dbfba240a50b336c Mon Sep 17 00:00:00 2001
+From: fanquake <fanquake@gmail.com>
+Date: Fri, 12 Jan 2024 10:25:27 +0000
+Subject: [PATCH] build: set minimum required CMake to 3.5
+
+Avoids:
+```bash
+CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
+  Compatibility with CMake < 3.5 will be removed from a future version of
+  CMake.
+
+  Update the VERSION argument <min> value or use a ...<max> suffix to tell
+  CMake that the project does not need compatibility with older versions.
+```
+
+Upstream-Status: Backport [https://github.com/miniupnp/libnatpmp/pull/43]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3034df8..e7cffe5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ project(natpmp C)
+ 
+ add_definitions(-DNATPMP_STATICLIB -DENABLE_STRNATPMPERR)
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-bump-cmake-to-3.10.patch b/meta-oe/recipes-connectivity/transmission/files/0001-bump-cmake-to-3.10.patch
new file mode 100644
index 0000000000..895013cb1a
--- /dev/null
+++ b/meta-oe/recipes-connectivity/transmission/files/0001-bump-cmake-to-3.10.patch
@@ -0,0 +1,21 @@ 
+From c548c2192c6e4b3129711981d6446afd12dbe6e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C5=93ur?= <coeur@gmx.fr>
+Date: Thu, 1 May 2025 04:53:55 +0200
+Subject: [PATCH] bump cmake to 3.10
+
+Upstream-Status: Submitted [https://github.com/transmission/libb64/pull/3]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ecf6d3b..d500ea6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
+ project(libb64 VERSION 2.0.0 LANGUAGES C)
+ 
+ set(LIBB64_STANDALONE_BUILD OFF)
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch b/meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch
new file mode 100644
index 0000000000..1714ad1b99
--- /dev/null
+++ b/meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch
@@ -0,0 +1,21 @@ 
+From aa19cb131c953e4520be5284d86964f371ee059f Mon Sep 17 00:00:00 2001
+From: Yat Ho <lagoho7@gmail.com>
+Date: Mon, 13 May 2024 16:21:28 +0800
+Subject: [PATCH] miniupnpc: bump CMake version to 3.14
+
+Upstream-Status: Backport [https://github.com/transmission/miniupnpc/commit/e7b0fa83c313c50a66da76ad6fb446e5bfdb482f]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0a53e27..2c713b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required (VERSION 2.6)
++cmake_minimum_required (VERSION 3.14)
+ 
+ project (miniupnpc C)
+ set (MINIUPNPC_VERSION 2.0)
diff --git a/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb b/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb
index 5d0dd6a389..518f8653ca 100644
--- a/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb
+++ b/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb
@@ -9,6 +9,11 @@  RDEPENDS:${PN}-web = "${PN}"
 
 SRC_URI = " \
 	gitsm://github.com/transmission/transmission;branch=4.0.x;protocol=https \
+	file://0001-build-bump-CMake-version-to-3.10-4.patch;patchdir=third-party/dht \
+	file://0001-bump-cmake-to-3.10.patch;patchdir=third-party/libb64 \
+	file://0001-Increase-minimum-CMake-version-to-3.10.patch;patchdir=third-party/libdeflate \
+	file://0001-miniupnpc-bump-CMake-version-to-3.14.patch;patchdir=third-party/miniupnpc \
+	file://0001-build-set-minimum-required-CMake-to-3.5.patch;patchdir=third-party/libnatpmp \
 	file://transmission-daemon \
 "