MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-14 22:35:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

wxwidget: Upgrade to 3.2.8

Browse Source 
Forward port patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2025-07-12 10:56:02 -07:00
parent 67f80d2034
commit 9117f4f1df
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
View File

@ -22,11 +22,9 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
build/cmake/install.cmake | 12 ++++++------ build/cmake/install.cmake | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-) 4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6ae7f6210..2a13e448db 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/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 # Initialize variables for quick access to wx root dir in sub dirs
set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(wxBINARY_DIR ${CMAKE_CURRENT_BINARY_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 # 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) 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 --- a/build/cmake/config.cmake
+++ b/build/cmake/config.cmake +++ b/build/cmake/config.cmake
@@ -100,7 +100,7 @@ function(wx_write_config_inplace) @@ -100,7 +100,7 @@ function(wx_write_config_inplace)
@ -48,26 +44,9 @@ index addd8d6b81..9ec677534b 100644
"${wxBINARY_DIR}/wx-config" "${wxBINARY_DIR}/wx-config"
) )
endfunction() 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 --- a/build/cmake/install.cmake
+++ b/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() else()
install( install(
DIRECTORY "${wxSETUP_HEADER_PATH}" DIRECTORY "${wxSETUP_HEADER_PATH}"
@ -81,7 +60,7 @@ index 384c6837b8..d3303faabb 100644
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ GROUP_EXECUTE GROUP_READ
WORLD_EXECUTE WORLD_READ WORLD_EXECUTE WORLD_READ
@@ -42,13 +42,13 @@ else() @@ -57,13 +57,13 @@ else()
install(DIRECTORY DESTINATION "bin") install(DIRECTORY DESTINATION "bin")
install(CODE "execute_process( \ install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \ COMMAND ${CMAKE_COMMAND} -E create_symlink \
@ -97,7 +76,7 @@ index 384c6837b8..d3303faabb 100644
# find_package config file # find_package config file
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
@@ -71,11 +71,11 @@ write_basic_package_version_file( @@ -86,11 +86,11 @@ write_basic_package_version_file(
configure_package_config_file( configure_package_config_file(
"${wxSOURCE_DIR}/build/cmake/wxWidgetsConfig.cmake.in" "${wxSOURCE_DIR}/build/cmake/wxWidgetsConfig.cmake.in"
"${projectConfig}" "${projectConfig}"
@ -111,6 +90,3 @@ index 384c6837b8..d3303faabb 100644
) )
# uninstall target # uninstall target
--
2.25.1

3
meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb → meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb
View File

@ -18,7 +18,7 @@ DEPENDS += " \
tiff \ 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://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \
file://0002-fix-libdir-for-multilib.patch \ file://0002-fix-libdir-for-multilib.patch \
file://0003-create-links-with-relative-path.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://0006-Fix-locale-on-musl.patch \
file://0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \ file://0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \
" "
SRCREV = "5ff25322553c1870cf20a2e1ba6f20ed50d9fe9a"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"