wxwidget: Upgrade to 3.2.8
PATCH 1/2 wxwidget: Upgrade to 3.2.8
Forward port patches
Signed-off-by Khem Raj <[email protected]>
---
.../0002-fix-libdir-for-multilib.patch | 32 +++----------------
...{wxwidgets_3.2.6.bb => wxwidgets_3.2.8.bb} | 3 +-
2 files changed, 5 insertions(+), 30 deletions(-)
rename meta-oe/recipes-extended/wxwidgets/{wxwidgets_3.2.6.bb => wxwidgets_3.2.8.bb} (98%)meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch +4 -28
@@ -22,11 +22,9 @@ Signed-off-by: Kai Kang <[email protected]> build/cmake/install.cmake | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f6ae7f6210..2a13e448db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -45,7 +45,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE) +@@ -43,7 +43,7 @@ include(build/cmake/policies.cmake NO_PO # Initialize variables for quick access to wx root dir in sub dirs set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(wxBINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
@@ -35,8 +33,6 @@ index f6ae7f6210..2a13e448db 100644 # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS) -diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake -index addd8d6b81..9ec677534b 100644 --- a/build/cmake/config.cmake +++ b/build/cmake/config.cmake @@ -100,7 +100,7 @@ function(wx_write_config_inplace)
@@ -48,26 +44,9 @@ index addd8d6b81..9ec677534b 100644 "${wxBINARY_DIR}/wx-config" ) endfunction() -diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake -index 72a34f0b4f..81ede7d8ae 100644 ---- a/build/cmake/functions.cmake -+++ b/build/cmake/functions.cmake -@@ -462,8 +462,8 @@ macro(wx_add_library name) - endif() - wx_install(TARGETS ${name} - EXPORT wxWidgetsTargets -- LIBRARY DESTINATION "lib${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}" -- ARCHIVE DESTINATION "lib${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}" -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}" -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}" - RUNTIME DESTINATION "${runtime_dir}${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}" - BUNDLE DESTINATION Applications/wxWidgets - ) -diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake -index 384c6837b8..d3303faabb 100644 --- a/build/cmake/install.cmake +++ b/build/cmake/install.cmake -@@ -29,11 +29,11 @@ if(WIN32_MSVC_NAMING) +@@ -44,11 +44,11 @@ if(WIN32_MSVC_NAMING) else() install( DIRECTORY "${wxSETUP_HEADER_PATH}"
@@ -81,7 +60,7 @@ index 384c6837b8..d3303faabb 100644 PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ -@@ -42,13 +42,13 @@ else() +@@ -57,13 +57,13 @@ else() install(DIRECTORY DESTINATION "bin") install(CODE "execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \
@@ -97,7 +76,7 @@ index 384c6837b8..d3303faabb 100644 # find_package config file include(CMakePackageConfigHelpers) -@@ -71,11 +71,11 @@ write_basic_package_version_file( +@@ -86,11 +86,11 @@ write_basic_package_version_file( configure_package_config_file( "${wxSOURCE_DIR}/build/cmake/wxWidgetsConfig.cmake.in" "${projectConfig}"
@@ -111,6 +90,3 @@ index 384c6837b8..d3303faabb 100644 ) # uninstall target --- -2.25.1 -
meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb renamed from meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb +1 -2
@@ -18,7 +18,7 @@ DEPENDS += " \ tiff \ " -SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https \ +SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https;tag=v${PV} \ file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ file://0002-fix-libdir-for-multilib.patch \ file://0003-create-links-with-relative-path.patch \
@@ -27,7 +27,6 @@ SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https file://0006-Fix-locale-on-musl.patch \ file://0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \ " -SRCREV = "5ff25322553c1870cf20a2e1ba6f20ed50d9fe9a" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
PATCH 2/2 transmission: Fix build with cmake4
Backport patches for a few sub-modules
Signed-off-by Khem Raj <[email protected]>
--- ...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
meta-oe/recipes-connectivity/transmission/files/0001-Increase-minimum-CMake-version-to-3.10.patch new file +30 -0
@@ -0,0 +1,30 @@ +From b6a145b5a525d892279d87dec4f35785f7d7c3b9 Mon Sep 17 00:00:00 2001 +From: Eric Biggers <[email protected]> +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 <[email protected]> +--- + 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)
meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch new file +26 -0
@@ -0,0 +1,26 @@ +From a18ae078a32e08a7193d0bae20190060bd1e8b85 Mon Sep 17 00:00:00 2001 +From: Yat Ho <[email protected]> +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 <[email protected]> +--- + 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
meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 9c5ed3204bdb722b5624f6b9dbfba240a50b336c Mon Sep 17 00:00:00 2001 +From: fanquake <[email protected]> +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 <[email protected]> +--- + 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)
meta-oe/recipes-connectivity/transmission/files/0001-bump-cmake-to-3.10.patch new file +21 -0
@@ -0,0 +1,21 @@ +From c548c2192c6e4b3129711981d6446afd12dbe6e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?C=C5=93ur?= <[email protected]> +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 <[email protected]> +--- + 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)
meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch new file +21 -0
@@ -0,0 +1,21 @@ +From aa19cb131c953e4520be5284d86964f371ee059f Mon Sep 17 00:00:00 2001 +From: Yat Ho <[email protected]> +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 <[email protected]> +--- + 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)
meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb +5 -0
@@ -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 \ "