summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2024-10-13 12:09:24 +0800
committerKhem Raj <raj.khem@gmail.com>2024-10-13 09:21:55 -0700
commit903ed68669550ccae20bcd0c18c26d0c336da810 (patch)
tree30a8dc1de64ee7001abf09a3fc42eb77e5c485f6
parent94266f795619cb05088c6c7055b3a022a13a6036 (diff)
downloadmeta-openembedded-903ed68669550ccae20bcd0c18c26d0c336da810.tar.gz
wxwidgets: upgrade 3.2.1 -> 3.2.6
ChangeLog: https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.2.6/docs/changes.txt * Drop 0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch as it has been merged upstream * Refresh patches * Add UPSTREAM_CHECK_GITTAGREGEX Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch26
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch8
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch (renamed from meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch)35
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch (renamed from meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch)22
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/0004-don-not-append-system-name-to-lib-name.patch (renamed from meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch)12
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/0005-wx-config-fix-libdir-for-multilib.patch (renamed from meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch)29
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/0006-Fix-locale-on-musl.patch (renamed from meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch)18
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch (renamed from meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch)9
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb (renamed from meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb)17
9 files changed, 100 insertions, 76 deletions
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch
deleted file mode 100644
index 52f4449339..0000000000
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 72c3b7324f00047e6dc5d8380ed2f6ff2494a6f9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 18 Dec 2022 14:51:34 -0800
4Subject: [PATCH] locale: Avoid using glibc specific defines on musl
5
6musl does not provide some glibc-only enum members e.g. _NL_ADDRESS_LANG_NAME
7
8Upstream-Status: Submitted [https://github.com/wxWidgets/wxWidgets/pull/23050]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 src/unix/uilocale.cpp | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/src/unix/uilocale.cpp b/src/unix/uilocale.cpp
15index 57773e17f5..86816ba896 100644
16--- a/src/unix/uilocale.cpp
17+++ b/src/unix/uilocale.cpp
18@@ -619,7 +619,7 @@ wxString
19 wxUILocaleImplUnix::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const
20 {
21 wxString str;
22-#if defined(HAVE_LANGINFO_H) && defined(__LINUX__)
23+#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) && defined(__GLIBC__)
24 switch (name)
25 {
26 case wxLOCALE_NAME_LOCALE:
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
index b3b9e79c53..a3b8d0c0ee 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
@@ -1,4 +1,4 @@
1From a071243763f4b06fc7e71f541c49cecf380b6f27 Mon Sep 17 00:00:00 2001 1From 8f582c0ea40ccdb2d439b7614459d752f3606e15 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Sun, 11 Oct 2020 22:16:55 +0200 3Date: Sun, 11 Oct 2020 22:16:55 +0200
4Subject: [PATCH] wx-config.in: Disable cross magic - it does not work for us 4Subject: [PATCH] wx-config.in: Disable cross magic - it does not work for us
@@ -18,10 +18,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
18 1 file changed, 1 insertion(+), 1 deletion(-) 18 1 file changed, 1 insertion(+), 1 deletion(-)
19 19
20diff --git a/wx-config.in b/wx-config.in 20diff --git a/wx-config.in b/wx-config.in
21index d132e3182f..d0d162e8a3 100755 21index 4df8571d28..1173d89685 100755
22--- a/wx-config.in 22--- a/wx-config.in
23+++ b/wx-config.in 23+++ b/wx-config.in
24@@ -396,7 +396,7 @@ get_mask() 24@@ -394,7 +394,7 @@ get_mask()
25 } 25 }
26 26
27 # Returns true if this script is for a cross compiled config. 27 # Returns true if this script is for a cross compiled config.
@@ -31,5 +31,5 @@ index d132e3182f..d0d162e8a3 100755
31 31
32 # Determine the base directories we require. 32 # Determine the base directories we require.
33-- 33--
342.26.2 342.25.1
35 35
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
index ea204ed3b1..b599f38871 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
@@ -1,12 +1,18 @@
1wxWidgets hardcodes libdir with 'lib' and does not support multilib which will 1From 9487fe5cd271a4bee96ab590509ef38f6972887a Mon Sep 17 00:00:00 2001
2change it. Respect variable wxPLATFORM_LIB_DIR to support libdir be configurable. 2From: Kai Kang <kai.kang@windriver.com>
3Date: Sat, 12 Oct 2024 18:43:25 +0800
4Subject: [PATCH] fix libdir for multilib
5
6wxWidgets hardcodes libdir with 'lib' and does not support multilib
7which will change it. Respect variable wxPLATFORM_LIB_DIR to support
8libdir be configurable.
3 9
4Upstream-Status: Pending 10Upstream-Status: Pending
5 11
6Signed-off-by: Kai Kang <kai.kang@windriver.com> 12Signed-off-by: Kai Kang <kai.kang@windriver.com>
7 13
8Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with LIB_SUFFIX in this 14Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with LIB_SUFFIX
9patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass. 15in this patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass.
10 16
11Signed-off-by: Kai Kang <kai.kang@windriver.com> 17Signed-off-by: Kai Kang <kai.kang@windriver.com>
12--- 18---
@@ -17,36 +23,36 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
17 4 files changed, 10 insertions(+), 10 deletions(-) 23 4 files changed, 10 insertions(+), 10 deletions(-)
18 24
19diff --git a/CMakeLists.txt b/CMakeLists.txt 25diff --git a/CMakeLists.txt b/CMakeLists.txt
20index a49ecd3883..d469471f38 100644 26index f6ae7f6210..2a13e448db 100644
21--- a/CMakeLists.txt 27--- a/CMakeLists.txt
22+++ b/CMakeLists.txt 28+++ b/CMakeLists.txt
23@@ -45,7 +45,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE) 29@@ -45,7 +45,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE)
24 # Initialize variables for quick access to wx root dir in sub dirs 30 # Initialize variables for quick access to wx root dir in sub dirs
25 set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) 31 set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
26 set(wxBINARY_DIR ${CMAKE_BINARY_DIR}) 32 set(wxBINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
27-set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib) 33-set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib)
28+set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib${LIB_SUFFIX}) 34+set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib${LIB_SUFFIX})
29 35
30 # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION 36 # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION
31 file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS) 37 file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS)
32diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake 38diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
33index b359560bc0..c59ea60923 100644 39index addd8d6b81..9ec677534b 100644
34--- a/build/cmake/config.cmake 40--- a/build/cmake/config.cmake
35+++ b/build/cmake/config.cmake 41+++ b/build/cmake/config.cmake
36@@ -76,7 +76,7 @@ function(wx_write_config_inplace) 42@@ -100,7 +100,7 @@ function(wx_write_config_inplace)
37 execute_process( 43 execute_process(
38 COMMAND 44 COMMAND
39 "${CMAKE_COMMAND}" -E ${COPY_CMD} 45 "${CMAKE_COMMAND}" -E ${COPY_CMD}
40- "${CMAKE_CURRENT_BINARY_DIR}/lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}" 46- "${wxBINARY_DIR}/lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
41+ "${CMAKE_CURRENT_BINARY_DIR}/lib${LIB_SUFFIX}/wx/config/inplace-${TOOLCHAIN_FULLNAME}" 47+ "${wxBINARY_DIR}/lib${LIB_SUFFIX}/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
42 "${CMAKE_CURRENT_BINARY_DIR}/wx-config" 48 "${wxBINARY_DIR}/wx-config"
43 ) 49 )
44 endfunction() 50 endfunction()
45diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake 51diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
46index 7182364e5e..55fbebc7ee 100644 52index 72a34f0b4f..81ede7d8ae 100644
47--- a/build/cmake/functions.cmake 53--- a/build/cmake/functions.cmake
48+++ b/build/cmake/functions.cmake 54+++ b/build/cmake/functions.cmake
49@@ -435,8 +435,8 @@ macro(wx_add_library name) 55@@ -462,8 +462,8 @@ macro(wx_add_library name)
50 endif() 56 endif()
51 wx_install(TARGETS ${name} 57 wx_install(TARGETS ${name}
52 EXPORT wxWidgetsTargets 58 EXPORT wxWidgetsTargets
@@ -105,3 +111,6 @@ index 384c6837b8..d3303faabb 100644
105 ) 111 )
106 112
107 # uninstall target 113 # uninstall target
114--
1152.25.1
116
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch
index 6eef0b6790..dbede0304f 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch
@@ -1,18 +1,23 @@
1From b86806ef34d4c9171165c1533064bf34ad822e20 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Sat, 12 Oct 2024 18:43:25 +0800
4Subject: [PATCH] create links with relative path
5
1It fails to build python3-wxgtk4 which depends on wxwidgets: 6It fails to build python3-wxgtk4 which depends on wxwidgets:
2 7
3| ERROR: wxwidgets-native-3.2.1-r0 do_populate_sysroot: sstate found an 8| ERROR: wxwidgets-native-3.2.1-r0 do_populate_sysroot: sstate found an
4 absolute path symlink /path/to/build/tmp-glibc/work/x86_64-linux 9 absolute path symlink /path/to/build/tmp-glibc/work/x86_64-linux
5 /wxwidgets-native/3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work 10 /wxwidgets-native/3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work
6 /x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wx-config 11 /x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wx-config
7 pointing at /path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native/3.2.1-r0 12 pointing at /path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native/3.2.1-r0
8 /recipe-sysroot-native/usr/lib/wx/config/gtk3-unicode-3.2. 13 /recipe-sysroot-native/usr/lib/wx/config/gtk3-unicode-3.2.
9 Please replace this with a relative link. 14 Please replace this with a relative link.
10| ERROR: wxwidgets-native-3.2.1-r0 do_populate_sysroot: sstate found an 15| ERROR: wxwidgets-native-3.2.1-r0 do_populate_sysroot: sstate found an
11 absolute path symlink /path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native 16 absolute path symlink /path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native
12 /3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native 17 /3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native
13 /3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc pointing at /path/to/build/tmp-glibc 18 /3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc pointing at /path/to/build/tmp-glibc
14 /work/x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc-3.2. 19 /work/x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc-3.2.
15 Please replace this with a relative link. 20 Please replace this with a relative link.
16 21
17Create symlink with relative path to fix the issues. 22Create symlink with relative path to fix the issues.
18 23
@@ -50,3 +55,6 @@ index dbed8cc9b3..1dbc3261d3 100644
50 \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \ 55 \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
51 )" 56 )"
52 ) 57 )
58--
592.25.1
60
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0004-don-not-append-system-name-to-lib-name.patch
index 6329256b0c..e3463ba170 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0004-don-not-append-system-name-to-lib-name.patch
@@ -1,3 +1,8 @@
1From 5e9725c1151e2b029066d61ef5dccf1f3e6cb323 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Sat, 12 Oct 2024 18:43:25 +0800
4Subject: [PATCH] don not append system name to lib name
5
1It appends system name to library names for cross compile. For example, the 6It appends system name to library names for cross compile. For example, the
2library name is libwx_baseu-3.1-Linux.so rather than libwx_baseu-3.1.so. It is 7library name is libwx_baseu-3.1-Linux.so rather than libwx_baseu-3.1.so. It is
3not appropriate for oe. 8not appropriate for oe.
@@ -14,10 +19,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
14 1 file changed, 3 insertions(+), 3 deletions(-) 19 1 file changed, 3 insertions(+), 3 deletions(-)
15 20
16diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake 21diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
17index e374d9a273..c6b1908bd6 100644 22index 81ede7d8ae..23eebeb914 100644
18--- a/build/cmake/functions.cmake 23--- a/build/cmake/functions.cmake
19+++ b/build/cmake/functions.cmake 24+++ b/build/cmake/functions.cmake
20@@ -219,9 +219,9 @@ function(wx_set_target_properties target_name) 25@@ -243,9 +243,9 @@ function(wx_set_target_properties target_name)
21 endif() 26 endif()
22 27
23 set(cross_target) 28 set(cross_target)
@@ -30,3 +35,6 @@ index e374d9a273..c6b1908bd6 100644
30 35
31 set(lib_prefix "lib") 36 set(lib_prefix "lib")
32 if(MSVC OR (WIN32 AND wxBUILD_SHARED)) 37 if(MSVC OR (WIN32 AND wxBUILD_SHARED))
38--
392.25.1
40
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0005-wx-config-fix-libdir-for-multilib.patch
index 628f8dee56..b650c50386 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0005-wx-config-fix-libdir-for-multilib.patch
@@ -1,8 +1,14 @@
1It sets 'libdir' with path element 'lib' directly which is not suitable for 1From 4230cd84f156f9eb5c9b80ffbc69dd55fa7c7ca7 Mon Sep 17 00:00:00 2001
2multilib. Add an option '--baselib' for wx-config to support multilib when 2From: Kai Kang <kai.kang@windriver.com>
3cross compile. And set default value of baselib with "lib${wxPLATFORM_LIB_DIR}". 3Date: Sat, 12 Oct 2024 18:43:25 +0800
4Subject: [PATCH] wx-config: fix libdir for multilib
4 5
5Upstream-Status: Pending [oe specific] 6It sets 'libdir' with path element 'lib' directly which is not suitable
7for multilib. Add an option '--baselib' for wx-config to support
8multilib when cross compile. And set default value of baselib with
9"lib${wxPLATFORM_LIB_DIR}".
10
11Upstream-Status: Inappropriate [oe specific]
6 12
7Signed-off-by: Kai Kang <kai.kang@windriver.com> 13Signed-off-by: Kai Kang <kai.kang@windriver.com>
8 14
@@ -15,10 +21,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
15 2 files changed, 5 insertions(+), 3 deletions(-) 21 2 files changed, 5 insertions(+), 3 deletions(-)
16 22
17diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake 23diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
18index 52ae69d3f6..28aa733eb0 100644 24index 9ec677534b..ee61cf7572 100644
19--- a/build/cmake/config.cmake 25--- a/build/cmake/config.cmake
20+++ b/build/cmake/config.cmake 26+++ b/build/cmake/config.cmake
21@@ -86,7 +86,7 @@ function(wx_write_config) 27@@ -110,7 +110,7 @@ function(wx_write_config)
22 set(prefix ${CMAKE_INSTALL_PREFIX}) 28 set(prefix ${CMAKE_INSTALL_PREFIX})
23 set(exec_prefix "\${prefix}") 29 set(exec_prefix "\${prefix}")
24 set(includedir "\${prefix}/include") 30 set(includedir "\${prefix}/include")
@@ -26,9 +32,9 @@ index 52ae69d3f6..28aa733eb0 100644
26+ set(libdir "\${exec_prefix}/\${baselib}") 32+ set(libdir "\${exec_prefix}/\${baselib}")
27 set(bindir "\${exec_prefix}/bin") 33 set(bindir "\${exec_prefix}/bin")
28 34
29 find_program(EGREP egrep) 35 if(wxBUILD_MONOLITHIC)
30diff --git a/wx-config.in b/wx-config.in 36diff --git a/wx-config.in b/wx-config.in
31index e3f7d115bb..0e78af03c7 100755 37index 1173d89685..8364a33e9d 100755
32--- a/wx-config.in 38--- a/wx-config.in
33+++ b/wx-config.in 39+++ b/wx-config.in
34@@ -42,7 +42,8 @@ usage() 40@@ -42,7 +42,8 @@ usage()
@@ -41,7 +47,7 @@ index e3f7d115bb..0e78af03c7 100755
41 [--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT] 47 [--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT]
42 [--universal[=yes|no]] [--unicode[=yes|no]] [--static[=yes|no]] 48 [--universal[=yes|no]] [--unicode[=yes|no]] [--static[=yes|no]]
43 [--debug[=yes|no]] [--version[=VERSION]] [--flavour=FLAVOUR] 49 [--debug[=yes|no]] [--version[=VERSION]] [--flavour=FLAVOUR]
44@@ -137,7 +138,7 @@ wxconfig_output_options="prefix exec_prefix 50@@ -133,7 +134,7 @@ wxconfig_output_options="prefix exec_prefix
45 51
46 # Options that permit the user to supply hints that may affect the output. 52 # Options that permit the user to supply hints that may affect the output.
47 # These options all accept arbitrary values, to interpret as they please. 53 # These options all accept arbitrary values, to interpret as they please.
@@ -50,7 +56,7 @@ index e3f7d115bb..0e78af03c7 100755
50 56
51 # Input options that accept only a yes or no argument. 57 # Input options that accept only a yes or no argument.
52 # 58 #
53@@ -404,6 +405,7 @@ is_cross() { [ "x@cross_compiling@" = "xyes" ]; } 59@@ -400,6 +401,7 @@ is_cross() { [ "xno" = "xyes" ]; }
54 # Determine the base directories we require. 60 # Determine the base directories we require.
55 prefix=${input_option_prefix-${this_prefix:-@prefix@}} 61 prefix=${input_option_prefix-${this_prefix:-@prefix@}}
56 exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}} 62 exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}}
@@ -58,3 +64,6 @@ index e3f7d115bb..0e78af03c7 100755
58 wxconfdir="@libdir@/wx/config" 64 wxconfdir="@libdir@/wx/config"
59 65
60 installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"` 66 installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"`
67--
682.25.1
69
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0006-Fix-locale-on-musl.patch
index e4ca6579f8..37d61dcb3f 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0006-Fix-locale-on-musl.patch
@@ -1,8 +1,19 @@
1Upstream-Status: Pending 1From 64d5d7f68cde208c6f8a5e0b71da93f98e4720f7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 12 Oct 2024 20:30:16 +0800
4Subject: [PATCH] Fix locale on musl
2 5
3these macro'd away functions don't exist in musl (yet) 6these macro'd away functions don't exist in musl (yet)
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 include/wx/xlocale.h | 20 ++++++++++++++++++++
13 1 file changed, 20 insertions(+)
14
4diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h 15diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
5index c433d25..3ab9d84 100644 16index c433d25d05..794cf0b66b 100644
6--- a/include/wx/xlocale.h 17--- a/include/wx/xlocale.h
7+++ b/include/wx/xlocale.h 18+++ b/include/wx/xlocale.h
8@@ -33,6 +33,26 @@ 19@@ -33,6 +33,26 @@
@@ -32,3 +43,6 @@ index c433d25..3ab9d84 100644
32 // The platform-specific locale type 43 // The platform-specific locale type
33 // If wxXLocale_t is not defined, then only "C" locale support is provided 44 // If wxXLocale_t is not defined, then only "C" locale support is provided
34 #ifdef wxHAS_XLOCALE_SUPPORT 45 #ifdef wxHAS_XLOCALE_SUPPORT
46--
472.25.1
48
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch
index 5160f2e1fe..ef94e3551b 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch
@@ -1,4 +1,4 @@
1From e108aff9d6dae613f486c1b1681f4a3cdf17b845 Mon Sep 17 00:00:00 2001 1From 22f70d5bd039b20bfdad522341412ca001c639db Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 19 Dec 2022 15:07:55 -0800 3Date: Mon, 19 Dec 2022 15:07:55 -0800
4Subject: [PATCH] Set HAVE_LARGEFILE_SUPPORT to 1 explicitly 4Subject: [PATCH] Set HAVE_LARGEFILE_SUPPORT to 1 explicitly
@@ -6,16 +6,17 @@ Subject: [PATCH] Set HAVE_LARGEFILE_SUPPORT to 1 explicitly
6nothing sets this to 0, but for some reason it gets undef'd 6nothing sets this to 0, but for some reason it gets undef'd
7 7
8Upstream-Status: Pending 8Upstream-Status: Pending
9
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
10--- 11---
11 build/cmake/setup.h.in | 3 +-- 12 build/cmake/setup.h.in | 3 +--
12 1 file changed, 1 insertion(+), 2 deletions(-) 13 1 file changed, 1 insertion(+), 2 deletions(-)
13 14
14diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in 15diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in
15index bce33a73f3..22afb4cfa0 100644 16index fcc282980d..767adbf658 100644
16--- a/build/cmake/setup.h.in 17--- a/build/cmake/setup.h.in
17+++ b/build/cmake/setup.h.in 18+++ b/build/cmake/setup.h.in
18@@ -869,8 +869,7 @@ 19@@ -867,8 +867,7 @@
19 /* 20 /*
20 * Define if large (64 bit file offsets) files are supported. 21 * Define if large (64 bit file offsets) files are supported.
21 */ 22 */
@@ -26,5 +27,5 @@ index bce33a73f3..22afb4cfa0 100644
26 * Use OpenGL 27 * Use OpenGL
27 */ 28 */
28-- 29--
292.39.0 302.25.1
30 31
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb
index 91653e2852..2ddda142e9 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb
@@ -20,17 +20,18 @@ DEPENDS += " \
20 20
21SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https \ 21SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https \
22 file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ 22 file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \
23 file://fix-libdir-for-multilib.patch \ 23 file://0002-fix-libdir-for-multilib.patch \
24 file://create-links-with-relative-path.patch \ 24 file://0003-create-links-with-relative-path.patch \
25 file://not-append-system-name-to-lib-name.patch \ 25 file://0004-don-not-append-system-name-to-lib-name.patch \
26 file://wx-config-fix-libdir-for-multilib.patch \ 26 file://0005-wx-config-fix-libdir-for-multilib.patch \
27 file://0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch \ 27 file://0006-Fix-locale-on-musl.patch \
28 file://musl-locale-l.patch \ 28 file://0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \
29 file://0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \
30 " 29 "
31SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496" 30SRCREV= "5ff25322553c1870cf20a2e1ba6f20ed50d9fe9a"
32S = "${WORKDIR}/git" 31S = "${WORKDIR}/git"
33 32
33UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
34
34# These can be either 'builtin' or 'sys' and builtin means cloned soures are 35# These can be either 'builtin' or 'sys' and builtin means cloned soures are
35# build. So these cannot be PACKAGECONFIGs and let's use libs where we can (see 36# build. So these cannot be PACKAGECONFIGs and let's use libs where we can (see
36# DEPENDS) 37# DEPENDS)