diff options
| -rw-r--r-- | meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch | 26 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch | 31 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch | 21 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/transmission/transmission_4.1.0.bb (renamed from meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb) | 15 |
4 files changed, 6 insertions, 87 deletions
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 deleted file mode 100644 index a08366a36d..0000000000 --- a/meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | From a18ae078a32e08a7193d0bae20190060bd1e8b85 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yat Ho <lagoho7@gmail.com> | ||
| 3 | Date: Thu, 1 May 2025 09:14:19 +0800 | ||
| 4 | Subject: [PATCH] build: bump CMake version to 3.10 (#4) | ||
| 5 | |||
| 6 | CMake < 3.5 compatibility has been removed from CMake 4.0 and CMake < 3.10 compatibility has been deprecated in CMake 3.31. | ||
| 7 | |||
| 8 | https://cmake.org/cmake/help/latest/release/4.0.html | ||
| 9 | https://cmake.org/cmake/help/latest/release/3.31.html | ||
| 10 | |||
| 11 | Upstream-Status: Backport [https://github.com/transmission/dht/commit/38c9f261d9b58b76b9eaf85f84ec1b35151a1eac] | ||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | CMakeLists.txt | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 18 | index 6d4aa99..596dbfb 100644 | ||
| 19 | --- a/CMakeLists.txt | ||
| 20 | +++ b/CMakeLists.txt | ||
| 21 | @@ -1,4 +1,4 @@ | ||
| 22 | -cmake_minimum_required(VERSION 2.8) | ||
| 23 | +cmake_minimum_required(VERSION 3.10) | ||
| 24 | project(dht C) | ||
| 25 | |||
| 26 | 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 deleted file mode 100644 index 887bc21114..0000000000 --- a/meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 9c5ed3204bdb722b5624f6b9dbfba240a50b336c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: fanquake <fanquake@gmail.com> | ||
| 3 | Date: Fri, 12 Jan 2024 10:25:27 +0000 | ||
| 4 | Subject: [PATCH] build: set minimum required CMake to 3.5 | ||
| 5 | |||
| 6 | Avoids: | ||
| 7 | ```bash | ||
| 8 | CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required): | ||
| 9 | Compatibility with CMake < 3.5 will be removed from a future version of | ||
| 10 | CMake. | ||
| 11 | |||
| 12 | Update the VERSION argument <min> value or use a ...<max> suffix to tell | ||
| 13 | CMake that the project does not need compatibility with older versions. | ||
| 14 | ``` | ||
| 15 | |||
| 16 | Upstream-Status: Backport [https://github.com/miniupnp/libnatpmp/pull/43] | ||
| 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 18 | --- | ||
| 19 | CMakeLists.txt | 2 +- | ||
| 20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 21 | |||
| 22 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 23 | index 3034df8..e7cffe5 100644 | ||
| 24 | --- a/CMakeLists.txt | ||
| 25 | +++ b/CMakeLists.txt | ||
| 26 | @@ -1,4 +1,4 @@ | ||
| 27 | -cmake_minimum_required(VERSION 2.8) | ||
| 28 | +cmake_minimum_required(VERSION 3.5) | ||
| 29 | project(natpmp C) | ||
| 30 | |||
| 31 | add_definitions(-DNATPMP_STATICLIB -DENABLE_STRNATPMPERR) | ||
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 deleted file mode 100644 index 1714ad1b99..0000000000 --- a/meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | From aa19cb131c953e4520be5284d86964f371ee059f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yat Ho <lagoho7@gmail.com> | ||
| 3 | Date: Mon, 13 May 2024 16:21:28 +0800 | ||
| 4 | Subject: [PATCH] miniupnpc: bump CMake version to 3.14 | ||
| 5 | |||
| 6 | Upstream-Status: Backport [https://github.com/transmission/miniupnpc/commit/e7b0fa83c313c50a66da76ad6fb446e5bfdb482f] | ||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | --- | ||
| 9 | CMakeLists.txt | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 13 | index 0a53e27..2c713b5 100644 | ||
| 14 | --- a/CMakeLists.txt | ||
| 15 | +++ b/CMakeLists.txt | ||
| 16 | @@ -1,4 +1,4 @@ | ||
| 17 | -cmake_minimum_required (VERSION 2.6) | ||
| 18 | +cmake_minimum_required (VERSION 3.14) | ||
| 19 | |||
| 20 | project (miniupnpc C) | ||
| 21 | 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.1.0.bb index 518f8653ca..aed1e2e32a 100644 --- a/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb +++ b/meta-oe/recipes-connectivity/transmission/transmission_4.1.0.bb | |||
| @@ -2,23 +2,20 @@ DESCRIPTION = "Transmission is a fast, easy, and free BitTorrent client" | |||
| 2 | SECTION = "network" | 2 | SECTION = "network" |
| 3 | HOMEPAGE = "https://transmissionbt.com/" | 3 | HOMEPAGE = "https://transmissionbt.com/" |
| 4 | LICENSE = "MIT & GPL-2.0-only" | 4 | LICENSE = "MIT & GPL-2.0-only" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=ba8199e739948e198310093de27175fa" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d54f298b276b8cc5f20168e43a0e8103" |
| 6 | 6 | ||
| 7 | DEPENDS = "curl libevent libpsl gnutls openssl libtool intltool-native glib-2.0-native" | 7 | DEPENDS = "curl libevent libpsl gnutls openssl libtool intltool-native glib-2.0-native" |
| 8 | RDEPENDS:${PN}-web = "${PN}" | 8 | RDEPENDS:${PN}-web = "${PN}" |
| 9 | 9 | ||
| 10 | SRC_URI = " \ | 10 | SRC_URI = " \ |
| 11 | gitsm://github.com/transmission/transmission;branch=4.0.x;protocol=https \ | 11 | gitsm://github.com/transmission/transmission;branch=4.1.x;protocol=https;tag=${PV} \ |
| 12 | file://0001-build-bump-CMake-version-to-3.10-4.patch;patchdir=third-party/dht \ | ||
| 13 | file://0001-bump-cmake-to-3.10.patch;patchdir=third-party/libb64 \ | 12 | file://0001-bump-cmake-to-3.10.patch;patchdir=third-party/libb64 \ |
| 14 | file://0001-Increase-minimum-CMake-version-to-3.10.patch;patchdir=third-party/libdeflate \ | 13 | file://0001-Increase-minimum-CMake-version-to-3.10.patch;patchdir=third-party/libdeflate \ |
| 15 | file://0001-miniupnpc-bump-CMake-version-to-3.14.patch;patchdir=third-party/miniupnpc \ | ||
| 16 | file://0001-build-set-minimum-required-CMake-to-3.5.patch;patchdir=third-party/libnatpmp \ | ||
| 17 | file://transmission-daemon \ | 14 | file://transmission-daemon \ |
| 18 | " | 15 | " |
| 19 | 16 | ||
| 20 | # Transmission release 4.0.6 | 17 | # Transmission release 4.1.0 |
| 21 | SRCREV = "38c164933e9f77c110b48fe745861c3b98e3d83e" | 18 | SRCREV = "272401184f0736e6063f9da90be7d037e907508a" |
| 22 | 19 | ||
| 23 | 20 | ||
| 24 | inherit cmake gettext update-rc.d pkgconfig systemd mime-xdg | 21 | inherit cmake gettext update-rc.d pkgconfig systemd mime-xdg |
| @@ -45,9 +42,9 @@ do_install:append() { | |||
| 45 | fi | 42 | fi |
| 46 | 43 | ||
| 47 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 44 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
| 48 | sed -i '/User=/c\User=${TRANSMISSION_USER}' ${S}/daemon/transmission-daemon.service | 45 | sed -i '/User=/c\User=${TRANSMISSION_USER}' ${B}/daemon/transmission-daemon.service |
| 49 | install -d ${D}${systemd_unitdir}/system | 46 | install -d ${D}${systemd_unitdir}/system |
| 50 | install -m 0644 ${S}/daemon/transmission-daemon.service ${D}${systemd_unitdir}/system | 47 | install -m 0644 ${B}/daemon/transmission-daemon.service ${D}${systemd_unitdir}/system |
| 51 | fi | 48 | fi |
| 52 | } | 49 | } |
| 53 | 50 | ||
