diff --git a/9688ccc0874c0c513b73d01679b1b426f463477f.patch b/9688ccc0874c0c513b73d01679b1b426f463477f.patch deleted file mode 100644 index bbd8797922b8ccacd93f821a2cbccabdae5e7c15..0000000000000000000000000000000000000000 --- a/9688ccc0874c0c513b73d01679b1b426f463477f.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9688ccc0874c0c513b73d01679b1b426f463477f Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Fri, 31 Mar 2023 18:04:26 -0400 -Subject: [PATCH] WebView tests: Fix Selection test with WebKit 2.40+ - -For some reason, calling HasSelection() immediately after SelectAll() -causes the web extension to get stuck under WebKit 2.40. Instead of -sleeping, call wxYield() a few times to let the event loop run a bit. ---- - tests/controls/webtest.cpp | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/tests/controls/webtest.cpp b/tests/controls/webtest.cpp -index c0eb77f52929..98a817c9971a 100644 ---- a/tests/controls/webtest.cpp -+++ b/tests/controls/webtest.cpp -@@ -232,9 +232,11 @@ TEST_CASE_METHOD(WebViewTestCase, "WebView", "[wxWebView]") - // With WebKit SelectAll() sends a request to perform the selection to - // another process via proxy and there doesn't seem to be any way to - // wait until this request is actually handled, so loop here for some a -- // bit before giving up. -- for ( wxStopWatch sw; !m_browser->HasSelection() && sw.Time() < 50; ) -- wxMilliSleep(1); -+ // bit before giving up. Avoid calling HasSelection() right away -+ // without wxYielding a bit because this seems to cause the extension -+ // to hang with webkit 2.40.0+. -+ for ( wxStopWatch sw; sw.Time() < 50; ) -+ wxYield(); - #endif // wxUSE_WEBVIEW_WEBKIT2 - - CHECK(m_browser->HasSelection()); diff --git a/os-release.patch b/os-release.patch deleted file mode 100644 index 3a0456fdbfa522d85705ae79557affcb1c0f0b65..0000000000000000000000000000000000000000 --- a/os-release.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 1b0c5d63f6269afa46d121c28160a339da5dd5b7 Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Fri, 14 Jul 2023 11:45:19 -0400 -Subject: [PATCH] Read Linux distribution info from os-release file - -The Linux distribution community has somewhat deprecated the lsb_release -utility and has standardized on a new file, os-release, that can be -simply parsed to get the same information. Attempt to read this file in -/etc/os-release, then /usr/lib/os-release, and finally, fall back to -using the lsb_release utility if neither of those files are found. - -See: https://www.freedesktop.org/software/systemd/man/os-release.html -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2184391 - -See #23712. - -(cherry picked from commit aef7df6c9f44f751d97f4f6519ae6e5c3b81019d) ---- - docs/changes.txt | 1 + - src/unix/utilsunx.cpp | 30 ++++++++++++++++++++++++++++++ - 2 files changed, 31 insertions(+) - -diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp -index ac5181e187f3..302aaa25b8f5 100644 ---- a/src/unix/utilsunx.cpp -+++ b/src/unix/utilsunx.cpp -@@ -62,6 +62,8 @@ - #include "wx/evtloop.h" - #include "wx/mstream.h" - #include "wx/private/fdioeventloopsourcehandler.h" -+#include "wx/config.h" -+#include "wx/filename.h" - - #include - #include // waitpid() -@@ -1147,6 +1149,23 @@ wxString wxGetNativeCpuArchitectureName() - - #ifdef __LINUX__ - -+static bool -+wxGetValuesFromOSRelease(const wxString& filename, wxLinuxDistributionInfo& ret) -+{ -+ if ( !wxFileName::Exists(filename) ) -+ { -+ return false; -+ } -+ -+ wxFileConfig fc(wxEmptyString, wxEmptyString, wxEmptyString, filename); -+ ret.Id = fc.Read(wxS("ID"), wxEmptyString).Capitalize(); -+ ret.Description = fc.Read(wxS("PRETTY_NAME"), wxEmptyString); -+ ret.Release = fc.Read(wxS("VERSION_ID"), wxEmptyString); -+ ret.CodeName = fc.Read(wxS("VERSION_CODENAME"), wxEmptyString); -+ -+ return true; -+} -+ - static bool - wxGetValueFromLSBRelease(const wxString& arg, const wxString& lhs, wxString* rhs) - { -@@ -1161,6 +1180,17 @@ wxLinuxDistributionInfo wxGetLinuxDistributionInfo() - { - wxLinuxDistributionInfo ret; - -+ // Read /etc/os-release and fall back to /usr/lib/os-release per below -+ // https://www.freedesktop.org/software/systemd/man/os-release.html -+ if ( wxGetValuesFromOSRelease(wxS("/etc/os-release"), ret) ) -+ { -+ return ret; -+ } -+ if ( wxGetValuesFromOSRelease(wxS("/usr/lib/os-release"), ret) ) -+ { -+ return ret; -+ } -+ - if ( !wxGetValueFromLSBRelease(wxS("--id"), wxS("Distributor ID:\t"), - &ret.Id) ) - { diff --git a/sources b/sources index eb4257d1ed41907a343b491d834ee13819a022e0..7f7d3358f4be49498a368fbe71bb9d6d27957910 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wxWidgets-3.2.2.1.tar.bz2) = 289d61ea2abd75a329aafcbd347ab84b136f31fca01dd902593f661691ecd30a4416286ff501c4257baa6765cf356ade3087eb8609af9a44599cfdc20e2f03a6 +SHA512 (wxWidgets-3.2.3.tar.bz2) = 72e00cea25ab82d5134592f85bedeecb7b9512c00be32f37f6879ca5c437569b3b2b77de61a38e980e5c96baad9b1b0c8ad70773d610afbe9421fa4941d31f99 diff --git a/wxGTK.spec b/wxGTK.spec index df499f4291a45c790d86d372161a2e33b59e6096..ebbf053a57d35034cd54f7fbc68e816731527397 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -5,17 +5,15 @@ Summary: GTK port of the wxWidgets GUI library Name: wxGTK -Version: 3.2.2.1 -Release: 7%{?dist} +Version: 3.2.3 +Release: 1%{?dist} License: wxWidgets URL: https://www.wxwidgets.org/ Source0: https://github.com/%{srcname}/%{srcname}/releases/download/v%{version}/%{srcname}-%{version}.tar.bz2 Source1: wx-config Patch3000: %{name}-3.1.6-abicheck.patch -Patch3001: https://github.com/wxWidgets/wxWidgets/commit/9688ccc0874c0c513b73d01679b1b426f463477f.patch -Patch3002: os-release.patch BuildRequires: make, gcc-c++, gtk3-devel -BuildRequires: webkit2gtk3-devel, zlib-devel, libpng-devel +BuildRequires: webkit2gtk4.1-devel, zlib-devel, libpng-devel BuildRequires: libjpeg-devel, libtiff-devel, expat-devel BuildRequires: SDL2-devel, libGLU-devel, libSM-devel BuildRequires: gstreamer1-plugins-base-devel @@ -257,6 +255,10 @@ fi %doc html %changelog +* Mon Jun 22 2026 PkgAgent Robot - 3.2.3-1 +- [Type] sync +- [DESC] update to Version 3.2.3 + * Fri Jun 13 2025 bbrucezhang - 3.2.2.1-7 - Rebuilt for loongarch64