Compare commits
17 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0370c8a20d | ||
|
|
496728c714 | ||
|
|
9892600e9a | ||
|
|
4c7c0d49d9 | ||
|
|
a5ac9517a6 | ||
|
|
ea5765d69b | ||
|
|
bf405bff67 | ||
|
|
533ada510e | ||
|
|
99da001bc2 | ||
|
|
2cf0b26969 | ||
|
|
b7c9678128 | ||
|
|
c508a2b625 | ||
|
|
7360eb6dc0 | ||
|
|
d6cb2b9503 | ||
|
|
6788394a37 | ||
|
|
ad1345eb89 | ||
|
|
b9987bfddf |
4 changed files with 80 additions and 37 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -9,3 +9,8 @@
|
|||
/wxWidgets-3.2.2.1.tar.bz2
|
||||
/wxWidgets-3.2.3.tar.bz2
|
||||
/wxWidgets-3.2.4.tar.bz2
|
||||
/wxWidgets-3.2.5.tar.bz2
|
||||
/wxWidgets-3.2.6.tar.bz2
|
||||
/wxWidgets-3.2.7.tar.bz2
|
||||
/wxWidgets-3.2.8.tar.bz2
|
||||
/wxWidgets-3.2.9.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,30 +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] 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()
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (wxWidgets-3.2.4.tar.bz2) = 8592e8b7ddf4afe83c9dd4894faa43bbf8a5d57d1ac408b3b6b3b77a809063493ef3e2eefa3155214e1c91c5fad2dc6c0760dd79ada3e73f73ec4d06021b6fff
|
||||
SHA512 (wxWidgets-3.2.9.tar.bz2) = 6fe5caa3deaa02df0ef1891e417625b7719cffc9968a2d43e5fbca349ec9fdb8d4fc85fb422f835df751af3a816f946fb9d0d008163924be1669e54ce2346df7
|
||||
|
|
|
|||
80
wxGTK.spec
80
wxGTK.spec
|
|
@ -2,12 +2,13 @@
|
|||
%global wxbasename wxBase
|
||||
%global gtk3dir bld_gtk3
|
||||
%global sover 0
|
||||
%bcond_without tests
|
||||
|
||||
Name: wxGTK
|
||||
Version: 3.2.4
|
||||
Release: 5%{?dist}
|
||||
Version: 3.2.9
|
||||
Release: 1%{?dist}
|
||||
Summary: GTK port of the wxWidgets GUI library
|
||||
License: wxWidgets
|
||||
License: LGPL-2.0-or-later WITH WxWindows-exception-3.1
|
||||
URL: https://www.wxwidgets.org/
|
||||
|
||||
Source0: https://github.com/%{srcname}/%{srcname}/releases/download/v%{version}/%{srcname}-%{version}.tar.bz2
|
||||
|
|
@ -17,7 +18,6 @@ Source10: wx-config
|
|||
# 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++
|
||||
|
|
@ -41,12 +41,30 @@ BuildRequires: graphviz
|
|||
BuildRequires: libsecret-devel
|
||||
BuildRequires: libcurl-devel
|
||||
# For Tests
|
||||
%if %{with tests}
|
||||
BuildRequires: glibc-langpack-en
|
||||
BuildRequires: mesa-dri-drivers
|
||||
BuildRequires: mesa-libEGL
|
||||
BuildRequires: xclock
|
||||
BuildRequires: xorg-x11-server-Xvfb
|
||||
BuildRequires: python3-httpbin
|
||||
BuildRequires: vulkan-loader
|
||||
%endif
|
||||
|
||||
# Can be removed in Fedora 42
|
||||
Provides: wxGTK3 = %version-%{release}
|
||||
Obsoletes: wxGTK3 < %version-%{release}
|
||||
Obsoletes: compat-wxGTK3-gtk2 < %version-%{release}
|
||||
Obsoletes: compat-wxGTK3-gtk2-devel < %version-%{release}
|
||||
Obsoletes: compat-wxGTK3-gtk2-gl < %version-%{release}
|
||||
Obsoletes: compat-wxGTK3-gtk2-media < %version-%{release}
|
||||
Obsoletes: wxBase3 < %version-%{release}
|
||||
Obsoletes: wxBase3-devel < %version-%{release}
|
||||
Obsoletes: wxGTK3-devel < %version-%{release}
|
||||
Obsoletes: wxGTK3-docs < %version-%{release}
|
||||
Obsoletes: wxGTK3-gl < %version-%{release}
|
||||
Obsoletes: wxGTK3-i18n < %version-%{release}
|
||||
Obsoletes: wxGTK3-media < %version-%{release}
|
||||
Obsoletes: wxGTK3-webview < %version-%{release}
|
||||
|
||||
Provides: %{srcname} = %{version}-%{release}
|
||||
Provides: bundled(scintilla) = 3.7.2
|
||||
|
|
@ -170,7 +188,7 @@ This package provides documentation for the %{srcname} library.
|
|||
sed -i -e 's|aclocal)|aclocal/wxwin32.m4)|' Makefile.in
|
||||
|
||||
# fix plugin dir for 64-bit
|
||||
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
|
||||
sed -i -e 's|/usr/lib\b|/usr/%{_lib}|' wx-config.in configure
|
||||
sed -i -e 's|/lib|/%{_lib}|' src/unix/stdpaths.cpp
|
||||
|
||||
# Since we're currently patching configure.in
|
||||
|
|
@ -227,6 +245,7 @@ mv %{buildroot}%{_datadir}/bakefile/presets/*.* %{buildroot}%{_datadir}/bakefile
|
|||
%find_lang wxstd-3.2
|
||||
|
||||
%check
|
||||
%if %{with tests}
|
||||
pushd %{gtk3dir}/tests
|
||||
make %{?_smp_mflags}
|
||||
python3 -m httpbin.core &
|
||||
|
|
@ -234,6 +253,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} TZ=UTC wxUSE_XVFB=1 \
|
|||
WX_TEST_WEBREQUEST_URL="http://localhost:5000" xvfb-run -a ./test ~[.] \
|
||||
%ifarch s390x
|
||||
~wxTextFile::Special ~wxFileName::GetSizeSpecial ~wxFile::Special \
|
||||
%endif
|
||||
%ifarch riscv64
|
||||
~wxTextFile::Special ~wxFile::Special ~URLTestCase::GetInputStream ~WebRequest::SSL::Error \
|
||||
%endif
|
||||
~WebRequest::SSL::Ignore
|
||||
LD_LIBRARY_PATH=%{buildroot}%{_libdir} wxUSE_XVFB=1 xvfb-run -a \
|
||||
|
|
@ -241,11 +263,18 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} wxUSE_XVFB=1 xvfb-run -a \
|
|||
%ifarch i686
|
||||
~ImageTestCase \
|
||||
%endif
|
||||
%ifarch ppc64le
|
||||
~VirtListCtrlTestCase \
|
||||
%endif
|
||||
%ifarch s390x
|
||||
~WebView \
|
||||
%endif
|
||||
%ifarch riscv64
|
||||
~TreeCtrlTestCase ~WebView ~wxImage::Paste \
|
||||
%endif
|
||||
~wxHtmlPrintout::Pagination
|
||||
popd
|
||||
%endif
|
||||
|
||||
%post -n %{wxbasename}-devel
|
||||
if [ -f %{_bindir}/wx-config ] && [ ! -h %{_bindir}/wx-config ] ; then
|
||||
|
|
@ -321,6 +350,45 @@ fi
|
|||
%doc html
|
||||
|
||||
%changelog
|
||||
* Tue Dec 16 2025 Scott Talbert <swt@techie.net> - 3.2.9-1
|
||||
- Update to new upstream release 3.2.9
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Tue May 06 2025 Scott Talbert <swt@techie.net> - 3.2.8-1
|
||||
- Update to new upstream release 3.2.8 (#2363255)
|
||||
|
||||
* Wed Apr 09 2025 Scott Talbert <swt@techie.net> - 3.2.7-1
|
||||
- Update to new upstream release 3.2.7
|
||||
|
||||
* Tue Feb 18 2025 Scott Talbert <swt@techie.net> - 3.2.6-3
|
||||
- Add conditional for disabling tests
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Mon Sep 16 2024 Scott Talbert <swt@techie.net> - 3.2.6-1
|
||||
- Update to new upstream release 3.2.6
|
||||
|
||||
* Wed Sep 11 2024 Scott Talbert <swt@techie.net> - 3.2.5-4
|
||||
- Add more wxGTK3 Obsoletes
|
||||
|
||||
* Wed Jul 31 2024 Scott Talbert <swt@techie.net> - 3.2.5-3
|
||||
- Update License tag to use SPDX identifiers
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat May 18 2024 Scott Talbert <swt@techie.net> - 3.2.5-1
|
||||
- Update to new upstream release 3.2.5
|
||||
|
||||
* Wed Feb 21 2024 David Abdurachmanov <davidlt@rivosinc.com> - 3.2.4-7
|
||||
- Skip failing tests on riscv64
|
||||
|
||||
* Fri Feb 16 2024 Scott Talbert <swt@techie.net> - 3.2.4-6
|
||||
- Fix FTBFS with autoconf 2.72 (#2264449)
|
||||
|
||||
* Sun Feb 04 2024 Scott Talbert <swt@techie.net> - 3.2.4-5
|
||||
- Enable wxLZMAInputStream (#2258458)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue