Compare commits

..

3 commits

Author SHA1 Message Date
Scott Talbert
0af71d64cb Add more wxGTK3 Obsoletes 2024-09-10 23:30:44 -04:00
Miroslav Suchý
b7f7410cd4 Add migration path from wxGTK3
Addressing error during upgrade from F39 to F40:

Error:
  Problem 1: package wxGTK3-3.0.5.1-10.fc38.x86_64 from @System requires
libtiff.so.5()(64bit), but none of the providers can be installed
2024-09-03 23:18:45 -04:00
Fabio Valentini
e13ddf884e
Rebuild for gstreamer-plugins-bad 1.24 2024-05-25 12:53:26 +02:00
4 changed files with 42 additions and 60 deletions

5
.gitignore vendored
View file

@ -9,8 +9,3 @@
/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

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

@ -1 +1 @@
SHA512 (wxWidgets-3.2.9.tar.bz2) = 6fe5caa3deaa02df0ef1891e417625b7719cffc9968a2d43e5fbca349ec9fdb8d4fc85fb422f835df751af3a816f946fb9d0d008163924be1669e54ce2346df7
SHA512 (wxWidgets-3.2.4.tar.bz2) = 8592e8b7ddf4afe83c9dd4894faa43bbf8a5d57d1ac408b3b6b3b77a809063493ef3e2eefa3155214e1c91c5fad2dc6c0760dd79ada3e73f73ec4d06021b6fff

View file

@ -2,13 +2,12 @@
%global wxbasename wxBase
%global gtk3dir bld_gtk3
%global sover 0
%bcond_without tests
Name: wxGTK
Version: 3.2.9
Release: 1%{?dist}
Version: 3.2.4
Release: 8%{?dist}
Summary: GTK port of the wxWidgets GUI library
License: LGPL-2.0-or-later WITH WxWindows-exception-3.1
License: wxWidgets
URL: https://www.wxwidgets.org/
Source0: https://github.com/%{srcname}/%{srcname}/releases/download/v%{version}/%{srcname}-%{version}.tar.bz2
@ -18,6 +17,7 @@ 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,14 +41,12 @@ BuildRequires: graphviz
BuildRequires: libsecret-devel
BuildRequires: libcurl-devel
# For Tests
%if %{with tests}
BuildRequires: glibc-langpack-en
BuildRequires: mesa-libEGL
BuildRequires: mesa-dri-drivers
BuildRequires: xclock
BuildRequires: xorg-x11-server-Xvfb
BuildRequires: python3-httpbin
BuildRequires: vulkan-loader
%endif
# Can be removed in Fedora 42
Provides: wxGTK3 = %version-%{release}
@ -188,7 +186,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|/usr/%{_lib}|' wx-config.in configure
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
sed -i -e 's|/lib|/%{_lib}|' src/unix/stdpaths.cpp
# Since we're currently patching configure.in
@ -245,7 +243,6 @@ 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 &
@ -253,9 +250,6 @@ 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 \
@ -263,18 +257,11 @@ 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
@ -350,44 +337,14 @@ 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
* Wed Sep 11 2024 Scott Talbert <swt@techie.net> - 3.2.4-8
- Add more wxGTK3 Obsoletes
* Wed Jul 31 2024 Scott Talbert <swt@techie.net> - 3.2.5-3
- Update License tag to use SPDX identifiers
* Wed Sep 04 2024 Scott Talbert <swt@techie.net> - 3.2.4-7
- Add migration path from wxGTK3
* 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)
* Sat May 25 2024 Fabio Valentini <decathorpe@gmail.com> - 3.2.4-6
- Rebuild for gstreamer-plugins-bad 1.24.
* Sun Feb 04 2024 Scott Talbert <swt@techie.net> - 3.2.4-5
- Enable wxLZMAInputStream (#2258458)