Enable EGL-based wxGLCanvas

wxWidgets-3_2.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+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.
+
+-------------------------------------------------------------------
+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

@@ -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"
@@ -84,7 +84,7 @@ Patch0:         soversion.diff
 Patch1:         autoconf-2_72.diff
 Patch2:         textfiletest-fix-file-exists.diff
 Patch3:         doxygen111.patch
-%if "%{flavor}" == "doc"
+%if "%flavor" == "doc"
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  graphviz
@@ -109,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"
@@ -390,7 +390,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
@@ -418,9 +418,9 @@ 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 \
 %if "%flavor" == "GTK3-nostl"
 	--disable-stl \
@@ -434,7 +434,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/
@@ -455,7 +455,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
@@ -485,7 +485,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}