Fix FTBFS w/ GCC 14 (#2261535)

Fix FTBFS w/ WebKitGTK 2.43
This commit is contained in:
Scott Talbert 2024-02-04 11:42:22 -05:00
parent 36a13a283c
commit ea2f0cc33b
3 changed files with 51 additions and 1 deletions

View File

@ -0,0 +1,30 @@
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] 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(+)
diff --git a/tests/controls/webtest.cpp b/tests/controls/webtest.cpp
index c7055d895f07..3f1ad5e0ca06 100644
--- a/tests/controls/webtest.cpp
+++ b/tests/controls/webtest.cpp
@@ -45,7 +45,11 @@ class WebViewTestCase
}
else
#endif
+#if wxUSE_WEBVIEW_WEBKIT2
+ m_alternateHistoryURL = "about:srcdoc";
+#else
m_alternateHistoryURL = "about:";
+#endif
}
~WebViewTestCase()

View File

@ -0,0 +1,14 @@
diff --git a/tests/allheaders.cpp b/tests/allheaders.cpp
index ae0957dd78..e1a462435c 100644
--- a/tests/allheaders.cpp
+++ b/tests/allheaders.cpp
@@ -129,9 +129,6 @@
#endif // 4.7
#if CHECK_GCC_VERSION(9,1)
GCC_TURN_ON(deprecated-copy)
-#endif // 9.1
-#if CHECK_GCC_VERSION(9,1)
- GCC_TURN_ON(deprecated-copy-dtor)
#endif // 9.1
GCC_TURN_ON(disabled-optimization)
GCC_TURN_ON(double-promotion)

View File

@ -5,7 +5,7 @@
Name: wxGTK
Version: 3.2.4
Release: 3%{?dist}
Release: 4%{?dist}
Summary: GTK port of the wxWidgets GUI library
License: wxWidgets
URL: https://www.wxwidgets.org/
@ -16,6 +16,8 @@ Source10: wx-config
# remove abort when ABI check fails
# Backport from wxGTK
Patch0: %{name}-3.1.6-abicheck.patch
Patch1: tests-no-deprecated-copy-dtor.patch
Patch2: https://github.com/wxWidgets/wxWidgets/commit/1622a5c9c2f123ef27fc3a52938162a68892e725.patch
BuildRequires: make
BuildRequires: gcc-c++
@ -318,6 +320,10 @@ fi
%doc html
%changelog
* Wed Jan 31 2024 Scott Talbert <swt@techie.net> - 3.2.4-4
- Fix FTBFS w/ GCC 14 (#2261535)
- Fix FTBFS w/ WebKitGTK 2.43
* Fri Jan 26 2024 Scott Talbert <swt@techie.net> - 3.2.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild