mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 06:16:04 +01:00
wxwidget: Upgrade to 3.2.8
Forward port patches Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
67f80d2034
commit
9117f4f1df
|
|
@ -22,11 +22,9 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -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+)+)"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user