Build with --enable-secretstore

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());
-     }
- 

soversion.diff

@@ -48,7 +48,7 @@ Index: wxWidgets-3.2.6/Makefile.in
  @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).14.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 \

wxWidgets-3_2.changes

@@ -1,8 +1,21 @@
 -------------------------------------------------------------------
-Mon Oct  7 10:36:47 UTC 2024 - Markéta Machová <mmachova@suse.com>
+Sun Mar  9 22:04:26 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
 
-- Add upstream fix_webkit_tests.patch to fix webview tests with
+- Build with --enable-secretstore [boo#1239137].
-  WebKitGTK 2.43+.
+
+-------------------------------------------------------------------
+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>

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 variant %nil
-%define toolkit %{nil}
+%define toolkit %nil
 %endif
 
 %if "%flavor" == "GTK3"
@@ -65,8 +65,8 @@ 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 psonum 14_0_0
-%define sonum 12.0.0
+%define sonum 14.0.0
 Name:           %this_spec
 Version:        3.2.6
 Release:        0
@@ -83,11 +83,8 @@ 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+
+%if "%flavor" == "doc"
-Patch4:         fix_webkit_tests.patch
-%if "%{flavor}" == "doc"
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  graphviz
@@ -105,6 +102,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 +110,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"
@@ -393,7 +391,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 +419,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 +436,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 +457,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 +487,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}