Update CVE-2024-58249 bugID.

Really remove doxygen111.patch
It was already removed from the spec file, and the removal was mentioned in the changelog but the file was left behind which causes factory-auto to complain in SLFO (https://build.suse.de/request/show/378788)
2025-06-10 20:26:37 +08:00 · 2025-06-01 21:14:53 +02:00 · 2025-05-30 02:02:11 +02:00 · 2025-05-30 01:04:53 +02:00 · 2025-05-29 19:13:08 +02:00 · 2025-05-03 01:04:55 +02:00
7 changed files with 87 additions and 159 deletions
--- a/doxygen111.patch
+++ b/doxygen111.patch
@@ -1,48 +0,0 @@
-From 2d79dfc7a2a8dd42021ff0ea3dcc8ed05f7c23ef Mon Sep 17 00:00:00 2001
-From: Scott Talbert <swt@techie.net>
-Date: Mon, 16 Sep 2024 22:38:13 -0400
-Subject: [PATCH] Fix docs generation for datetime with doxygen 1.11.0
-References: https://github.com/wxWidgets/wxWidgets/pull/24814
-
-It seems that as of the below commit, doxygen changed its handling of
-parsing backticks in comments such that it now fails to properly
-generate documentation for the entire datetime.h file.  Fix this by
-closing the open backtick.
-
-Also update the actual, non-documentation, header to match for
-consistency, even if non-matching backticks are not a problem there.
-
-See: https://github.com/doxygen/doxygen/commit/f18767307be20ca8d2ca81f74cc1f3446205282b
-
-Closes #24814.
---
- include/wx/datetime.h   | 2 +-
- interface/wx/datetime.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/wx/datetime.h b/include/wx/datetime.h
-index 445c3dbb3929..55292f008408 100644
--- a/include/wx/datetime.h
-+++ b/include/wx/datetime.h
-@@ -149,7 +149,7 @@ class WXDLLIMPEXP_BASE wxDateTime
-         Local,
- 
-         // zones from GMT (= Greenwich Mean Time): they're guaranteed to be
-        // consequent numbers, so writing something like `GMT0 + offset' is
-+        // consequent numbers, so writing something like `GMT0 + offset` is
-         // safe if abs(offset) <= 12
- 
-         // underscore stands for minus
-diff --git a/interface/wx/datetime.h b/interface/wx/datetime.h
-index ea3df2323338..1a0222435565 100644
--- a/interface/wx/datetime.h
-+++ b/interface/wx/datetime.h
-@@ -96,7 +96,7 @@ class wxDateTime
- 
-         ///@{
-         /// zones from GMT (= Greenwich Mean Time): they're guaranteed to be
-        /// consequent numbers, so writing something like `GMT0 + offset' is
-+        /// consequent numbers, so writing something like `GMT0 + offset` is
-         /// safe if abs(offset) <= 12
- 
-         // underscore stands for minus
--- a/fix_webkit_tests.patch
+++ b/fix_webkit_tests.patch
@@ -1,73 +0,0 @@
-From 1622a5c9c2f123ef27fc3a52938162a68892e725 Mon Sep 17 00:00:00 2001
-From: Scott Talbert <swt@techie.net>
-Date: Thu, 1 Feb 2024 20:36:50 -0500
-Subject: [PATCH 1/4] Fix WebView tests with WebKitGTK 2.43+
-
-It seems that WebKitGTK is now failing to navigate to about: URLs unless
-they are about:blank or about:srcdoc, so use about:srcdoc as the
-alternate URL to fix the WebView tests.
-
-Ref: https://github.com/WebKit/WebKit/commit/3c3163e71f647db507949ecebad35d0f2ffb33f3
---
- tests/controls/webtest.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: wxWidgets-3.2.6/samples/webview/webview.cpp
-===================================================================
--- wxWidgets-3.2.6.orig/samples/webview/webview.cpp
-+++ wxWidgets-3.2.6/samples/webview/webview.cpp
-@@ -992,38 +992,38 @@ void WebFrame::OnToolsClicked(wxCommandE
-     }
-     m_histMenuItems.clear();
- 
-    wxVector<wxSharedPtr<wxWebViewHistoryItem> > back = m_browser->GetBackwardHistory();
-    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forward = m_browser->GetForwardHistory();
-+    // We can't use empty labels for the menu items, so use this helper to give
-+    // them at least some name if we don't have anything better.
-+    const auto makeLabel = [](const wxString& title)
-+    {
-+        return title.empty() ? "(untitled)" : title;
-+    };
- 
-     wxMenuItem* item;
- 
-    unsigned int i;
-    for(i = 0; i < back.size(); i++)
-+    for ( const auto& histItem : m_browser->GetBackwardHistory() )
-     {
-        wxString title = back[i]->GetTitle();
-        if ( title.empty() )
-+	wxString title = histItem->GetTitle()
-+	if ( title.empty() )
-             title = "(untitled)";
-        item = m_tools_history_menu->AppendRadioItem(wxID_ANY, title);
-        m_histMenuItems[item->GetId()] = back[i];
-+        item = m_tools_history_menu->AppendRadioItem(wxID_ANY, makeLabel(title));
-+        m_histMenuItems[item->GetId()] = histItem;
-         Bind(wxEVT_MENU, &WebFrame::OnHistory, this, item->GetId());
-     }
- 
-    wxString title = m_browser->GetCurrentTitle();
-    if ( title.empty() )
-        title = "(untitled)";
-    item = m_tools_history_menu->AppendRadioItem(wxID_ANY, title);
-+    item = m_tools_history_menu->AppendRadioItem(wxID_ANY, makeLabel(m_browser->GetCurrentTitle()));
-     item->Check();
- 
-     //No need to connect the current item
-     m_histMenuItems[item->GetId()] = wxSharedPtr<wxWebViewHistoryItem>(new wxWebViewHistoryItem(m_browser->GetCurrentURL(), m_browser->GetCurrentTitle()));
- 
-    for(i = 0; i < forward.size(); i++)
-+    for ( const auto& histItem : m_browser->GetForwardHistory() )
-     {
-        wxString title = forward[i]->GetTitle();
-+	wxString title = histItem->GetTitle()
-         if ( title.empty() )
-             title = "(untitled)";
-        item = m_tools_history_menu->AppendRadioItem(wxID_ANY, title);
-        m_histMenuItems[item->GetId()] = forward[i];
-+        item = m_tools_history_menu->AppendRadioItem(wxID_ANY, makeLabel(title));
-+        m_histMenuItems[item->GetId()] = histItem;
-         Bind(wxEVT_TOOL, &WebFrame::OnHistory, this, item->GetId());
-     }
- 
--- a/soversion.diff
+++ b/soversion.diff
@@ -22,11 +22,11 @@ signatures.
 build/aclocal/bakefile.m4 |    3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

-Index: wxWidgets-3.2.6/Makefile.in
+Index: wxWidgets-3.2.8/Makefile.in
 ===================================================================
--- wxWidgets-3.2.6.orig/Makefile.in
-+++ wxWidgets-3.2.6/Makefile.in
-@@ -2225,6 +2225,7 @@ LOCALE_LINGUAS = ca cs da de el es fi fr
+--- wxWidgets-3.2.8.orig/Makefile.in
+++ wxWidgets-3.2.8/Makefile.in
+@@ -2226,6 +2226,7 @@ LOCALE_LINGUAS = af an ar ca ca@valencia
 @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \
 @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@	= _gcc$(COMPILER_VERSION)
@@ -34,7 +34,7 @@ Index: wxWidgets-3.2.6/Makefile.in
 @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
 @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
 @COND_BUILD_debug@WXDEBUGFLAG = d
-@@ -2236,7 +2237,7 @@ LOCALE_LINGUAS = ca cs da de el es fi fr
+@@ -2237,7 +2238,7 @@ LOCALE_LINGUAS = af an ar ca ca@valencia
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
 @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
 @COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
@@ -43,19 +43,19 @@ Index: wxWidgets-3.2.6/Makefile.in
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
 COND_wxUSE_REGEX_builtin___wxregex___depname = \
 	$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -13982,7 +13983,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
- @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.3.0.$(SO_SUFFIX)
+@@ -13984,7 +13985,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
+ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.4.1.$(SO_SUFFIX)
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
 -@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0
-+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).12.0.0
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).16.0.0
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
-Index: wxWidgets-3.2.6/build/aclocal/bakefile.m4
+Index: wxWidgets-3.2.8/build/aclocal/bakefile.m4
 ===================================================================
--- wxWidgets-3.2.6.orig/build/aclocal/bakefile.m4
-+++ wxWidgets-3.2.6/build/aclocal/bakefile.m4
+--- wxWidgets-3.2.8.orig/build/aclocal/bakefile.m4
+++ wxWidgets-3.2.8/build/aclocal/bakefile.m4
@@ -408,8 +408,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
             SONAME_FLAG="-Wl,-soname,"
         fi
--- a/wxWidgets-3.2.6.tar.bz2
+++ b/wxWidgets-3.2.6.tar.bz2
--- a/wxWidgets-3.2.8.tar.bz2
+++ b/wxWidgets-3.2.8.tar.bz2
--- a/wxWidgets-3_2.changes
+++ b/wxWidgets-3_2.changes
@@ -1,8 +1,56 @@
 -------------------------------------------------------------------
-Mon Oct  7 10:36:47 UTC 2024 - Markéta Machová <mmachova@suse.com>
+Thu May 29 17:11:39 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>

- Add upstream fix_webkit_tests.patch to fix webview tests with
-  WebKitGTK 2.43+.
+- Do not build the Qt flavor in SLE16 where Qt5 will not be
+  available.
+
+-------------------------------------------------------------------
+Mon Apr 28 09:39:40 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 3.2.8
+  * Fix crash in wxPropertyGrid with wxGTK3 after recent change.
+  * Fix key codes in WXK_NUMPADx events in wxGTK.
+  * Add wxVector(std::initializer_list<U> list) constructor.
+  * Add mouse scrolling support to generic wxSpinCtrl.
+  * Compute wxStaticText best size ourselves if GTK does it wrongly.
+
+-------------------------------------------------------------------
+Thu Mar 20 12:11:36 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 3.2.7
+  * Fix crash in wxWebRequestCURL when connection was refused
+  * Fix buffer read overflow when compiling RE ending with
+    backslash
+  * Fix crash in wxWebRequest::Close() with recent libcurl
+  * Improve wxPropGrid checkboxes in high DPI
+  * Many fixes to key event generation (#25053, #25199, #25200)
+  * Fix copy-pasting text under more Wayland compositors (Weston,
+    kwin)
+  * Don't consume Ctrl-C when using SDL-based wxSound
+  * Avoid repaint problems when using wxWindow::Update() with
+    Wayland
+  * Fix crash when connection is refused in wxWebRequestCURL
+   (gh#wxWidgets/wxWidgets#24885, CVE-2024-58249, bsc#1239902)
+- Delete doxygen111.patch (merged)
+
+-------------------------------------------------------------------
+Sun Mar  9 22:04:26 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Build with --enable-secretstore [boo#1239137].
+
+-------------------------------------------------------------------
+Sat Mar  1 09:12:56 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Build with --enable-glcanvasegl [boo#1235150]. This turns off GLX
+  and enables EGL instead. Sibling toolkits need to do this at the
+  same time for this to work, e.g. hugin needs both wx and GLEW to
+  be built for EGL.
+- Bump SO version since the base for wxGLCanvas changed. [boo#1239101]
+
+-------------------------------------------------------------------
+Mon Oct  7 14:14:45 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Use webkit2gtk-4.1 pkgconfig file instead of 4.0

 -------------------------------------------------------------------
 Tue Oct  1 09:33:13 UTC 2024 - Markéta Machová <mmachova@suse.com>
--- a/wxWidgets-3_2.spec
+++ b/wxWidgets-3_2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package wxWidgets-3_2
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,10 +27,10 @@
 %bcond_with webview
 %endif

-%if "%{flavor}" == "doc"
+%if "%flavor" == "doc"
 %define this_spec wxWidgets-3_2-doc
-%define variant %{nil}
-%define toolkit %{nil}
+%define variant %nil
+%define toolkit %nil
 %endif

 %if "%flavor" == "GTK3"
@@ -65,10 +65,10 @@ wxString and instead rely on the wxChar pointer API.
 # At most one Name: line to not confuse quilt(1)
 %define base_name wxWidgets-3_2
 %define wx_minor 3.2
-%define psonum 12_0_0
-%define sonum 12.0.0
+%define psonum 16_0_0
+%define sonum 16.0.0
 Name:           %this_spec
-Version:        3.2.6
+Version:        3.2.8
 Release:        0
 Summary:        C++ Library for Cross-Platform Development
 License:        LGPL-2.1-or-later WITH WxWindows-exception-3.1
@@ -83,11 +83,7 @@ Source6:        wxpython-mkdiff.sh
 Patch0:         soversion.diff
 Patch1:         autoconf-2_72.diff
 Patch2:         textfiletest-fix-file-exists.diff
-# PATCH-FIX-UPSTREAM https://github.com/wxWidgets/wxWidgets/pull/24814 Fix docs generation for datetime with doxygen 1.11.0
-Patch3:         doxygen111.patch
-# PATCH-FIX-UPSTREAM https://github.com/wxWidgets/wxWidgets/pull/24276 Fix WebView tests with WebKitGTK 2.43+
-Patch4:         fix_webkit_tests.patch
-%if "%{flavor}" == "doc"
+%if "%flavor" == "doc"
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  graphviz
@@ -105,6 +101,7 @@ BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libmspack)
 BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(libsecret-1)
 BuildRequires:  pkgconfig(sm)
 %if "%toolkit" == "gtk2"
 BuildRequires:  pkgconfig(gtk+-2.0)
@@ -112,7 +109,7 @@ BuildRequires:  pkgconfig(gtk+-2.0)
 %if "%toolkit" == "gtk3"
 BuildRequires:  pkgconfig(gtk+-3.0)
 %if %{with webview}
-BuildRequires:  pkgconfig(webkit2gtk-4.0)
+BuildRequires:  pkgconfig(webkit2gtk-4.1)
 %endif
 %endif
 %if "%toolkit" == "qt"
@@ -122,6 +119,9 @@ BuildRequires:  pkgconfig(Qt5OpenGL) >= 5.2.1
 BuildRequires:  pkgconfig(Qt5Test) >= 5.2.1
 BuildRequires:  pkgconfig(Qt5Widgets) >= 5.2.1
 BuildRequires:  pkgconfig(cairo)
+%if 0%{?suse_version} >= 1600
+ExclusiveArch:  donotbuild
+%endif
 %endif
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(liblzma)
@@ -393,7 +393,7 @@ This package contains the API documentation in HTML format.
 cp %{S:2} .

 %build
-%if "%{flavor}" == "doc"
+%if "%flavor" == "doc"
 pushd  docs/doxygen
 echo "DOT_IMAGE_FORMAT = svg" >> Doxyfile
 WX_SKIP_DOXYGEN_VERSION_CHECK=1 ./regen.sh xml
@@ -421,10 +421,11 @@ autoconf -f -i
 	--enable-ipv6 \
 	--enable-mediactrl \
 	--enable-optimise \
-	%{wx_debug:--enable-debug=%{wx_debug}} \
+	%{wx_debug:--enable-debug=%wx_debug} \
 	--enable-repro-build \
-        --disable-glcanvasegl \
+	--enable-glcanvasegl \
 	--enable-webrequest \
+	--enable-secretstore \
 %if "%flavor" == "GTK3-nostl"
 	--disable-stl \
 	--disable-plugins
@@ -437,7 +438,7 @@ autoconf -f -i
 %endif

 %install
-%if "%{flavor}" == "doc"
+%if "%flavor" == "doc"
 find docs/doxygen/out/xml/ -iname \*.png -print -delete
 find docs/doxygen/out/html/ -iname \*.dot -print -delete
 %fdupes -s docs/doxygen/out/html/
@@ -458,7 +459,7 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
 %endif

 %check
-%if "%{flavor}" != "doc"
+%if "%flavor" != "doc"
 %make_build -C tests all
 pushd tests
 # Disable webrequest tests requiring network access
@@ -488,7 +489,7 @@ export WX_TEST_WEBREQUEST_URL=0
 %ldconfig_scriptlets -n libwx_%{toolkit}u_webview-%variant%psonum
 %ldconfig_scriptlets -n libwx_%{toolkit}u_xrc-%variant%psonum

-%if "%{flavor}" == "doc"
+%if "%flavor" == "doc"
 %files xml
 %doc docs/doxygen/out/xml/*.{xml,xslt}
Author	SHA256	Message	Date
ZhaoQiang	d336ff7a50	Update CVE-2024-58249 bugID.	2025-06-10 20:26:37 +08:00
Antonio Larrosa	eac178af84	Really remove doxygen111.patch It was already removed from the spec file, and the removal was mentioned in the changelog but the file was left behind which causes factory-auto to complain in SLFO (https://build.suse.de/request/show/378788)	2025-06-01 21:14:53 +02:00
Jan Engelhardt	af5365366b	Synchronize Leap and TW experience	2025-05-30 02:02:11 +02:00
Antonio Larrosa	08e3098154	Add missing %endif	2025-05-30 01:04:53 +02:00
Antonio Larrosa	accc639084	Do not build the Qt flavor in SLE16 Qt5 will not be available in SLE16 so we have to disable the Qt flavor (which can be built in Leap). Also, wxWidgets 3.3 (currently in rc1) will have Qt6 support, so we can enable it back when 3.3 is released.	2025-05-29 19:13:08 +02:00
Jan Engelhardt	b80324c47b	wxWidgets 3.2.8	2025-05-03 01:04:55 +02:00
ZhaoQiang	0c4e48f77e	Add security bugID to the 3.2.7 update to record fix history.	2025-04-16 18:35:08 +08:00
Jan Engelhardt	842b67f926	wxWidgets 3.2.7	2025-03-20 14:50:35 +01:00
Jan Engelhardt	5af5487f2a	Build with --enable-secretstore	2025-03-10 01:05:22 +01:00
Jan Engelhardt	fd86d0bbda	Bump SO version since the base for wxGLCanvas had changed.	2025-03-08 00:23:23 +01:00
Jan Engelhardt	4f73079cf2	Enable EGL-based wxGLCanvas	2025-03-01 10:42:46 +01:00
Jan Engelhardt	79cfb31c27	Run spec-beautifier	2025-03-01 10:11:18 +01:00
Jan Engelhardt	2df551cde5	Use webkit2gtk-4.1	2024-10-07 16:16:27 +02:00