9 files changed, 36 insertions, 39 deletions

diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb b/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb
index 0e51289507..e7cb29289d 100644
--- a/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb
+++ b/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb
@@ -28,7 +28,7 @@ SRCREV_lss = "9719c1e1e676814c456b55f5f070eabad6709d31"
 
 SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=https \
            git://github.com/google/googletest.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/testing/gtest;name=gtest;branch=main;protocol=https \
-           git://github.com/protocolbuffers/protobuf.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/third_party/protobuf/protobuf;name=protobuf;branch=master;protocol=https \
+           git://github.com/protocolbuffers/protobuf.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/third_party/protobuf/protobuf;name=protobuf;branch=main;protocol=https \
            git://chromium.googlesource.com/linux-syscall-support;protocol=https;branch=main;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/third_party/lss;name=lss \
            file://0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch \
            file://0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch \
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
index bc6c4e6f54..cd0417612f 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
@@ -15,9 +15,6 @@ Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with LIB_SUFFIX
 in this patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass.
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
-Update for 3.3.1
-Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
 ---
  CMakeLists.txt                         |  2 +-
  build/cmake/config.cmake               |  2 +-
@@ -26,7 +23,7 @@ Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
  4 files changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6112fb7fac..42c0430598 100644
+index d6a4b49..9e86b87 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -43,7 +43,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE)
@@ -39,7 +36,7 @@ index 6112fb7fac..42c0430598 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 fe6c0f84c7..6845aacbe0 100644
+index addd8d6..9ec6775 100644
 --- a/build/cmake/config.cmake
 +++ b/build/cmake/config.cmake
 @@ -100,7 +100,7 @@ function(wx_write_config_inplace)
@@ -52,10 +49,10 @@ index fe6c0f84c7..6845aacbe0 100644
          )
  endfunction()
 diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
-index a373983043..225a112ca5 100644
+index 202d054..e255e0b 100644
 --- a/build/cmake/install.cmake
 +++ b/build/cmake/install.cmake
-@@ -51,11 +51,11 @@ if(WIN32_MSVC_NAMING)
+@@ -44,11 +44,11 @@ if(WIN32_MSVC_NAMING)
  else()
      install(
          DIRECTORY "${wxSETUP_HEADER_PATH}"
@@ -69,12 +66,12 @@ index a373983043..225a112ca5 100644
          PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
                      GROUP_EXECUTE GROUP_READ
                      WORLD_EXECUTE WORLD_READ
-@@ -64,13 +64,13 @@ else()
+@@ -57,13 +57,13 @@ else()
      install(DIRECTORY DESTINATION "bin")
      install(CODE "execute_process( \
          COMMAND ${CMAKE_COMMAND} -E create_symlink \
--        \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \
-+        \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \
+-        \"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \
++        \"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \
          \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \
          )"
      )
@@ -85,7 +82,7 @@ index a373983043..225a112ca5 100644
  
  # find_package config file
  include(CMakePackageConfigHelpers)
-@@ -93,11 +93,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}"
@@ -100,10 +97,10 @@ index a373983043..225a112ca5 100644
  
  # uninstall target
 diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt
-index 84ba0351d7..e68ab16d1b 100644
+index 2cb35e7..7977a84 100644
 --- a/build/cmake/lib/webview/CMakeLists.txt
 +++ b/build/cmake/lib/webview/CMakeLists.txt
-@@ -153,7 +153,7 @@ if(WXGTK AND wxUSE_WEBVIEW_WEBKIT2)
+@@ -146,7 +146,7 @@ if(WXGTK AND wxUSE_WEBVIEW_WEBKIT2)
          ${WEBKIT2_LIBRARIES}
          )
  
@@ -113,5 +110,5 @@ index 84ba0351d7..e68ab16d1b 100644
      wx_add_dependencies(wxwebview wxwebkit2_ext)
  endif()
 -- 
-2.43.0
+2.49.0
 
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch
index f0d22ec56d..dbede0304f 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch
@@ -24,40 +24,37 @@ Create symlink with relative path to fix the issues.
 Upstream-Status: Pending
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
-Update for 3.3.1.
-Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
 ---
  build/cmake/install.cmake        | 2 +-
  build/cmake/utils/CMakeLists.txt | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
-index 5a54fcb895..1dcd1b2886 100644
+index d3303faabb..c79e187f37 100644
 --- a/build/cmake/install.cmake
 +++ b/build/cmake/install.cmake
-@@ -64,7 +64,7 @@ else()
+@@ -42,7 +42,7 @@ else()
      install(DIRECTORY DESTINATION "bin")
      install(CODE "execute_process( \
          COMMAND ${CMAKE_COMMAND} -E create_symlink \
--        \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \
+-        \"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \
 +        \"../lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \
          \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \
          )"
      )
 diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt
-index 15f4339ef9..1dbc3261d3 100644
+index dbed8cc9b3..1dbc3261d3 100644
 --- a/build/cmake/utils/CMakeLists.txt
 +++ b/build/cmake/utils/CMakeLists.txt
 @@ -40,7 +40,7 @@ if(wxUSE_XRC)
          # Don't use wx_install() here to preserve escaping.
          install(CODE "execute_process( \
              COMMAND ${CMAKE_COMMAND} -E create_symlink \
--            \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \
+-            \"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \
 +            \"./${wxrc_output_name}${EXE_SUFFIX}\" \
              \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
              )"
          )
 -- 
-2.43.0
+2.25.1
 
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.3.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.1.bb
index 8e5c3e60c6..e9929a0d71 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.3.1.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.1.bb
@@ -18,7 +18,7 @@ DEPENDS += " \
     tiff \
 "
 
-SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=master;protocol=https;tag=v${PV} \
+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,7 @@ SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=master;protocol=htt
            file://0006-Fix-locale-on-musl.patch \
            file://0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \
            "
-SRCREV = "49c6810948f40c457e3d0848b9111627b5b61de5"
+SRCREV = "896e4f587615b832ce27b8325357cb504997e1d3"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
@@ -110,7 +110,7 @@ do_install:append() {
     # fix host contamination
     sed -i -e "s#${STAGING_DIR_NATIVE}##g" \
            -e "s#${STAGING_DIR_TARGET}##g" \
-           ${D}${libdir}/wx/config/*-unicode-3.3 \
+           ${D}${libdir}/wx/config/*-unicode-3.2 \
            ${D}${libdir}/cmake/wxWidgets/wxWidgetsTargets.cmake
 }
 
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
index d3a01e444c..439ab800f8 100644
--- a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
@@ -3,8 +3,10 @@ HOMEPAGE = "http://www.gtkmm.org/"
 SECTION = "libs"
 
 LICENSE = "LGPL-2.1-only & GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
-                    file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM = " \
+        file://COPYING;md5=4bf661c1e3793e55c8d1051bc5e0ae21 \
+        file://COPYING.tools;md5=570a9b3749dd0463a1778803b12a6dce \
+"
 
 DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native"
 
@@ -14,7 +16,7 @@ inherit gnomebase features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl x11"
 
-SRC_URI[archive.sha256sum] = "9350a0444b744ca3dc69586ebd1b6707520922b6d9f4f232103ce603a271ecda"
+SRC_URI[archive.sha256sum] = "daad9bf9b70f90975f91781fc7a656c923a91374261f576c883cd3aebd59c833"
 
 EXTRA_OEMESON = "-Dbuild-demos=false"
 
diff --git a/meta-python/recipes-devtools/python/python3-django_4.2.25.bb b/meta-python/recipes-devtools/python/python3-django_4.2.26.bb
index 861f7747d2..ea790e4b7f 100644
--- a/meta-python/recipes-devtools/python/python3-django_4.2.25.bb
+++ b/meta-python/recipes-devtools/python/python3-django_4.2.26.bb
@@ -1,7 +1,7 @@
 require python3-django.inc
 inherit python_setuptools_build_meta
 
-SRC_URI[sha256sum] = "2391ab3d78191caaae2c963c19fd70b99e9751008da22a0adcc667c5a4f8d311"
+SRC_URI[sha256sum] = "9398e487bcb55e3f142cb56d19fbd9a83e15bb03a97edc31f408361ee76d9d7a"
 
 RDEPENDS:${PN} += "\
     python3-sqlparse \
@@ -9,6 +9,6 @@ RDEPENDS:${PN} += "\
 "
 
 # Set DEFAULT_PREFERENCE so that the LTS version of django is built by
-# default. To build the 4.x branch, 
+# default. To build the 4.x branch,
 # PREFERRED_VERSION_python3-django = "4.2.%" can be added to local.conf
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-python/recipes-devtools/python/python3-django_5.2.7.bb b/meta-python/recipes-devtools/python/python3-django_5.2.8.bb
index a0589d9916..f205b5b247 100644
--- a/meta-python/recipes-devtools/python/python3-django_5.2.7.bb
+++ b/meta-python/recipes-devtools/python/python3-django_5.2.8.bb
@@ -1,7 +1,7 @@
 require python3-django.inc
 inherit python_setuptools_build_meta
 
-SRC_URI[sha256sum] = "e0f6f12e2551b1716a95a63a1366ca91bbcd7be059862c1b18f989b1da356cdd"
+SRC_URI[sha256sum] = "23254866a5bb9a2cfa6004e8b809ec6246eba4b58a7589bc2772f1bcc8456c7f"
 
 RDEPENDS:${PN} += "\
     python3-sqlparse \
diff --git a/meta-python/recipes-devtools/python/python3-pytest-picked/0001-adjust-failing-tests-to-capture-only-ptest-output.patch b/meta-python/recipes-devtools/python/python3-pytest-picked/0001-adjust-failing-tests-to-capture-only-ptest-output.patch
index dfb50ace75..b4d7794e47 100644
--- a/meta-python/recipes-devtools/python/python3-pytest-picked/0001-adjust-failing-tests-to-capture-only-ptest-output.patch
+++ b/meta-python/recipes-devtools/python/python3-pytest-picked/0001-adjust-failing-tests-to-capture-only-ptest-output.patch
@@ -5,7 +5,8 @@ Subject: [PATCH] adjust failing tests to capture only ptest output
 
 The tests should only check for warnings emitted by the plugin itself,
 not for any other warnings that may be emitted by other plugins or pytest
-itself.
+itself. This behavior is caused by the fact that pytest might throw some deprecation warnings
+or other warnings that are unrelated to the plugin being tested.
 
 Signed-off-by: Tom Geelen <t.f.g.geelen@gmail.com>
 Upstream-Status: Inappropriate [OE specific]
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.3.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.4.bb
index 35bbd3ffc2..2899f6909e 100644
--- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.3.bb
+++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.4.bb
@@ -8,7 +8,7 @@ DEPENDS = "python3-attrdict3-native python3-six-native wxwidgets-native \
            python3-requests-native wxwidgets \
            "
 
-PYPI_PACKAGE = "wxPython"
+PYPI_PACKAGE = "wxpython"
 UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"
 
 SRC_URI += "file://add-back-option-build-base.patch \
@@ -16,11 +16,11 @@ SRC_URI += "file://add-back-option-build-base.patch \
            file://not-overwrite-cflags-cxxflags.patch \
            file://0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch \
            "
-SRC_URI[sha256sum] = "20d6e0c927e27ced85643719bd63e9f7fd501df6e9a8aab1489b039897fd7c01"
+SRC_URI[sha256sum] = "2eb123979c87bcb329e8a2452269d60ff8f9f651e9bf25c67579e53c4ebbae3c"
 
-S = "${UNPACKDIR}/wxPython-${PV}"
+inherit pypi setuptools3 cython pkgconfig features_check
 
-inherit pypi setuptools3 pkgconfig features_check
+S = "${UNPACKDIR}/wxPython-${PV}"
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
@@ -37,4 +37,4 @@ RDEPENDS:${PN} = "\
     python3-six \
     python3-xml \
     python3-cairocffi \
-" 
+"