From b9987bfddf6fd1b4a5deee0e136481d9d9553128 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 15 Feb 2024 19:14:14 -0500 Subject: [PATCH 01/17] Fix FTBFS with autoconf 2.72 (#2264449) --- fix-ftbfs-autoconf-2.72.patch | 36 +++++++++++++++++++++++++++++++++++ wxGTK.spec | 6 +++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 fix-ftbfs-autoconf-2.72.patch diff --git a/fix-ftbfs-autoconf-2.72.patch b/fix-ftbfs-autoconf-2.72.patch new file mode 100644 index 0000000..38ef4b4 --- /dev/null +++ b/fix-ftbfs-autoconf-2.72.patch @@ -0,0 +1,36 @@ +From 00dff6e3bce72cc444c0602e13cf346a3340746b Mon Sep 17 00:00:00 2001 +From: Vadim Zeitlin +Date: Wed, 27 Dec 2023 16:08:37 +0100 +Subject: [PATCH] Stop using $EGREP in configure.ac unnecessarily + +We don't have DISABLED_UTILS or DISABLED_DEMOS variables, so it's +useless to exclude them from the makefiles list -- just stop doing it. + +This fixes a problem with using EGREP without preceding AC_PROG_EGREP +with autoconf 2.72, as EGREP is not defined any longer with this +version. + +See #24168. +--- + configure | 5 +---- + configure.ac | 7 +------ + 2 files changed, 2 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 606333376711..c608f9f4cfdf 100644 +--- a/configure.in ++++ b/configure.in +@@ -8048,12 +8048,7 @@ for subdir in $SUBDIRS; do + done + else + dnl assume that everything compiles for utils &c +- dnl any that shouldn't be built can be added to +- dnl DISABLED_UTILS, DISABLED_DEMOS +- disabled_var=DISABLED_`echo $subdir | tr '[[a-z]]' '[[A-Z]]'` +- eval "disabled=\$$disabled_var" +- disabled=/`echo X $disabled | sed 's@ @/|/@g'`/ +- makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"` ++ makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` + fi + else + dnl we build wxBase only diff --git a/wxGTK.spec b/wxGTK.spec index 3040c8b..b29af7f 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -5,7 +5,7 @@ Name: wxGTK Version: 3.2.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets URL: https://www.wxwidgets.org/ @@ -18,6 +18,7 @@ Source10: wx-config Patch0: %{name}-3.1.6-abicheck.patch Patch1: tests-no-deprecated-copy-dtor.patch Patch2: https://github.com/wxWidgets/wxWidgets/commit/1622a5c9c2f123ef27fc3a52938162a68892e725.patch +Patch3: fix-ftbfs-autoconf-2.72.patch BuildRequires: make BuildRequires: gcc-c++ @@ -321,6 +322,9 @@ fi %doc html %changelog +* Fri Feb 16 2024 Scott Talbert - 3.2.4-6 +- Fix FTBFS with autoconf 2.72 (#2264449) + * Sun Feb 04 2024 Scott Talbert - 3.2.4-5 - Enable wxLZMAInputStream (#2258458) From ad1345eb890e10883aaf4cc4162ab2151f56cffc Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Wed, 21 Feb 2024 16:12:37 +0800 Subject: [PATCH 02/17] Skip failing tests on riscv64 --- wxGTK.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/wxGTK.spec b/wxGTK.spec index b29af7f..cc92b39 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -5,7 +5,7 @@ Name: wxGTK Version: 3.2.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets URL: https://www.wxwidgets.org/ @@ -235,6 +235,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 \ @@ -244,6 +247,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} wxUSE_XVFB=1 xvfb-run -a \ %endif %ifarch s390x ~WebView \ +%endif +%ifarch riscv64 + ~TreeCtrlTestCase ~WebView ~wxImage::Paste \ %endif ~wxHtmlPrintout::Pagination popd @@ -322,6 +328,9 @@ fi %doc html %changelog +* Wed Feb 21 2024 David Abdurachmanov - 3.2.4-7 +- Skip failing tests on riscv64 + * Fri Feb 16 2024 Scott Talbert - 3.2.4-6 - Fix FTBFS with autoconf 2.72 (#2264449) From 6788394a376feae8170dfe525d17b70389ee8ff9 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Sat, 18 May 2024 13:46:14 -0400 Subject: [PATCH 03/17] Update to new upstream release 3.2.5 --- .gitignore | 1 + ...a5c9c2f123ef27fc3a52938162a68892e725.patch | 30 ---------------- fix-ftbfs-autoconf-2.72.patch | 36 ------------------- sources | 2 +- wxGTK.spec | 9 ++--- 5 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 1622a5c9c2f123ef27fc3a52938162a68892e725.patch delete mode 100644 fix-ftbfs-autoconf-2.72.patch diff --git a/.gitignore b/.gitignore index 4c51048..820852d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /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 diff --git a/1622a5c9c2f123ef27fc3a52938162a68892e725.patch b/1622a5c9c2f123ef27fc3a52938162a68892e725.patch deleted file mode 100644 index 9b88e50..0000000 --- a/1622a5c9c2f123ef27fc3a52938162a68892e725.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1622a5c9c2f123ef27fc3a52938162a68892e725 Mon Sep 17 00:00:00 2001 -From: Scott Talbert -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() diff --git a/fix-ftbfs-autoconf-2.72.patch b/fix-ftbfs-autoconf-2.72.patch deleted file mode 100644 index 38ef4b4..0000000 --- a/fix-ftbfs-autoconf-2.72.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 00dff6e3bce72cc444c0602e13cf346a3340746b Mon Sep 17 00:00:00 2001 -From: Vadim Zeitlin -Date: Wed, 27 Dec 2023 16:08:37 +0100 -Subject: [PATCH] Stop using $EGREP in configure.ac unnecessarily - -We don't have DISABLED_UTILS or DISABLED_DEMOS variables, so it's -useless to exclude them from the makefiles list -- just stop doing it. - -This fixes a problem with using EGREP without preceding AC_PROG_EGREP -with autoconf 2.72, as EGREP is not defined any longer with this -version. - -See #24168. ---- - configure | 5 +---- - configure.ac | 7 +------ - 2 files changed, 2 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 606333376711..c608f9f4cfdf 100644 ---- a/configure.in -+++ b/configure.in -@@ -8048,12 +8048,7 @@ for subdir in $SUBDIRS; do - done - else - dnl assume that everything compiles for utils &c -- dnl any that shouldn't be built can be added to -- dnl DISABLED_UTILS, DISABLED_DEMOS -- disabled_var=DISABLED_`echo $subdir | tr '[[a-z]]' '[[A-Z]]'` -- eval "disabled=\$$disabled_var" -- disabled=/`echo X $disabled | sed 's@ @/|/@g'`/ -- makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"` -+ makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` - fi - else - dnl we build wxBase only diff --git a/sources b/sources index 655631e..4477154 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wxWidgets-3.2.4.tar.bz2) = 8592e8b7ddf4afe83c9dd4894faa43bbf8a5d57d1ac408b3b6b3b77a809063493ef3e2eefa3155214e1c91c5fad2dc6c0760dd79ada3e73f73ec4d06021b6fff +SHA512 (wxWidgets-3.2.5.tar.bz2) = b5bd8e4b53b7c44f79b76a39de0071d14e1f0325e66b7a9f2c7f1934a4146be3c78332f610119f7ba46ca4cd1055272a3d8937ad46665ce5abd867a803f22c86 diff --git a/wxGTK.spec b/wxGTK.spec index cc92b39..a496699 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -4,8 +4,8 @@ %global sover 0 Name: wxGTK -Version: 3.2.4 -Release: 7%{?dist} +Version: 3.2.5 +Release: 1%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets URL: https://www.wxwidgets.org/ @@ -17,8 +17,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 -Patch3: fix-ftbfs-autoconf-2.72.patch BuildRequires: make BuildRequires: gcc-c++ @@ -328,6 +326,9 @@ fi %doc html %changelog +* Sat May 18 2024 Scott Talbert - 3.2.5-1 +- Update to new upstream release 3.2.5 + * Wed Feb 21 2024 David Abdurachmanov - 3.2.4-7 - Skip failing tests on riscv64 From d6cb2b9503e517967d299bbdad11f4a6ad6d05a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:36:36 +0000 Subject: [PATCH 04/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- wxGTK.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxGTK.spec b/wxGTK.spec index a496699..8e62a7c 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -5,7 +5,7 @@ Name: wxGTK Version: 3.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets URL: https://www.wxwidgets.org/ @@ -326,6 +326,9 @@ fi %doc html %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat May 18 2024 Scott Talbert - 3.2.5-1 - Update to new upstream release 3.2.5 From 7360eb6dc024c03cef713c1f7861c074ba01b10b Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 30 Jul 2024 20:14:47 -0400 Subject: [PATCH 05/17] Update License tag to use SPDX identifiers --- wxGTK.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wxGTK.spec b/wxGTK.spec index 8e62a7c..f538f37 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -5,9 +5,9 @@ Name: wxGTK Version: 3.2.5 -Release: 2%{?dist} +Release: 3%{?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 @@ -326,6 +326,9 @@ fi %doc html %changelog +* Wed Jul 31 2024 Scott Talbert - 3.2.5-3 +- Update License tag to use SPDX identifiers + * Sat Jul 20 2024 Fedora Release Engineering - 3.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c508a2b62547d6088e642765cf23ac631decbbdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 18:07:20 +0000 Subject: [PATCH 06/17] 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 --- wxGTK.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/wxGTK.spec b/wxGTK.spec index f538f37..b6bda8a 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -47,6 +47,14 @@ BuildRequires: xorg-x11-server-Xvfb BuildRequires: python3-httpbin BuildRequires: vulkan-loader +# Can be removed in Fedora 42 +Provides: wxGTK3 = %version-%{release} +Obsoletes: wxGTK3 < %version-%{release} +Obsoletes: compat-wxGTK3-gtk2 < %version-%{release} +Obsoletes: wxGTK3-media < %version-%{release} +Obsoletes: wxGTK3-gl < %version-%{release} +Obsoletes: wxGTK3-i18n < %version-%{release} + Provides: %{srcname} = %{version}-%{release} Provides: bundled(scintilla) = 3.7.2 Requires: %{wxbasename}%{?_isa} = %{version}-%{release} From b7c9678128cf30cdc88712cebdb7ab74cabe9684 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 10 Sep 2024 23:34:12 -0400 Subject: [PATCH 07/17] Add more wxGTK3 Obsoletes --- wxGTK.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/wxGTK.spec b/wxGTK.spec index b6bda8a..0a0d386 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -5,7 +5,7 @@ Name: wxGTK Version: 3.2.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK port of the wxWidgets GUI library License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: https://www.wxwidgets.org/ @@ -51,9 +51,17 @@ BuildRequires: vulkan-loader Provides: wxGTK3 = %version-%{release} Obsoletes: wxGTK3 < %version-%{release} Obsoletes: compat-wxGTK3-gtk2 < %version-%{release} -Obsoletes: wxGTK3-media < %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 @@ -334,6 +342,9 @@ fi %doc html %changelog +* Wed Sep 11 2024 Scott Talbert - 3.2.5-4 +- Add more wxGTK3 Obsoletes + * Wed Jul 31 2024 Scott Talbert - 3.2.5-3 - Update License tag to use SPDX identifiers From 2cf0b269696b995ee4708682262bce4b2c22ea2f Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Sun, 15 Sep 2024 21:55:59 -0400 Subject: [PATCH 08/17] Update to new upstream release 3.2.6 --- .gitignore | 1 + sources | 2 +- wxGTK.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 820852d..e8719ad 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /wxWidgets-3.2.3.tar.bz2 /wxWidgets-3.2.4.tar.bz2 /wxWidgets-3.2.5.tar.bz2 +/wxWidgets-3.2.6.tar.bz2 diff --git a/sources b/sources index 4477154..757b87e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wxWidgets-3.2.5.tar.bz2) = b5bd8e4b53b7c44f79b76a39de0071d14e1f0325e66b7a9f2c7f1934a4146be3c78332f610119f7ba46ca4cd1055272a3d8937ad46665ce5abd867a803f22c86 +SHA512 (wxWidgets-3.2.6.tar.bz2) = 87830a73df096ab35d4ff7e131872131153da76f76c58d70e57558915c3faea280af193104163ce24e9e249a62b8e65d19ebfa20046ce0d2c45b2368b108619f diff --git a/wxGTK.spec b/wxGTK.spec index 0a0d386..b4093ab 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -4,8 +4,8 @@ %global sover 0 Name: wxGTK -Version: 3.2.5 -Release: 4%{?dist} +Version: 3.2.6 +Release: 1%{?dist} Summary: GTK port of the wxWidgets GUI library License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: https://www.wxwidgets.org/ @@ -342,6 +342,9 @@ fi %doc html %changelog +* Mon Sep 16 2024 Scott Talbert - 3.2.6-1 +- Update to new upstream release 3.2.6 + * Wed Sep 11 2024 Scott Talbert - 3.2.5-4 - Add more wxGTK3 Obsoletes From 99da001bc25747910de879ae7201d951adf8a91b Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 6 Oct 2024 23:22:03 -0400 Subject: [PATCH 09/17] Fix wx-config for flatpak builds When built in the /app prefix for flatpaks, we want the -L%_libdir flag in wx-config --libs so that the libraries are found. --- wxGTK.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wxGTK.spec b/wxGTK.spec index b4093ab..e69a590 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -185,7 +185,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 From 533ada510ee5672f40ae192100f819f0cf5a8efd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:19:14 +0000 Subject: [PATCH 10/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- wxGTK.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxGTK.spec b/wxGTK.spec index e69a590..28287cf 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -5,7 +5,7 @@ Name: wxGTK Version: 3.2.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK port of the wxWidgets GUI library License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: https://www.wxwidgets.org/ @@ -342,6 +342,9 @@ fi %doc html %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 16 2024 Scott Talbert - 3.2.6-1 - Update to new upstream release 3.2.6 From bf405bff67d2e341cd662ea4ae547ddf0bb87f0d Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mon, 17 Feb 2025 22:52:40 -0500 Subject: [PATCH 11/17] Add conditional for disabling tests --- wxGTK.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/wxGTK.spec b/wxGTK.spec index 28287cf..f1555a9 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -2,10 +2,11 @@ %global wxbasename wxBase %global gtk3dir bld_gtk3 %global sover 0 +%bcond_without tests Name: wxGTK Version: 3.2.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK port of the wxWidgets GUI library License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: https://www.wxwidgets.org/ @@ -40,12 +41,14 @@ BuildRequires: graphviz BuildRequires: libsecret-devel BuildRequires: libcurl-devel # For Tests +%if %{with tests} BuildRequires: glibc-langpack-en 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} @@ -242,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 & @@ -267,6 +271,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} wxUSE_XVFB=1 xvfb-run -a \ %endif ~wxHtmlPrintout::Pagination popd +%endif %post -n %{wxbasename}-devel if [ -f %{_bindir}/wx-config ] && [ ! -h %{_bindir}/wx-config ] ; then @@ -342,6 +347,9 @@ fi %doc html %changelog +* Tue Feb 18 2025 Scott Talbert - 3.2.6-3 +- Add conditional for disabling tests + * Sun Jan 19 2025 Fedora Release Engineering - 3.2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ea5765d69bbbed4a7aeb986dc233affca90e6a71 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 18 Mar 2025 13:39:24 -0400 Subject: [PATCH 12/17] Update mesa test dependencies mesa-libEGL is needed as an implementation behind libglvnd-egl to run some GUI tests; while usually required thereby, it is not for flatpak builds in order to separate mesa as an extension from the runtime. However, mesa-libEGL now requires mesa-dri-drivers since 25.0: https://src.fedoraproject.org/rpms/mesa/c/7f5395e84998c17715e566e7fd14fa72c47dfd4e --- wxGTK.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wxGTK.spec b/wxGTK.spec index f1555a9..40bc76e 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -43,7 +43,7 @@ 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 From a5ac9517a606600c8600987df271312cb9bb86af Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 18 Mar 2025 13:50:36 -0400 Subject: [PATCH 13/17] Skip VirtListCtrlTestCase on ppc64le This test started failing recently. --- wxGTK.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wxGTK.spec b/wxGTK.spec index 40bc76e..8636b29 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -263,6 +263,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} wxUSE_XVFB=1 xvfb-run -a \ %ifarch i686 ~ImageTestCase \ %endif +%ifarch ppc64le + ~VirtListCtrlTestCase \ +%endif %ifarch s390x ~WebView \ %endif From 4c7c0d49d90a7fbe13d6fd864ef85cc0bc04d10f Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 8 Apr 2025 20:16:27 -0400 Subject: [PATCH 14/17] Update to new upstream release 3.2.7 --- .gitignore | 1 + sources | 2 +- wxGTK.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e8719ad..4eb8e96 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /wxWidgets-3.2.4.tar.bz2 /wxWidgets-3.2.5.tar.bz2 /wxWidgets-3.2.6.tar.bz2 +/wxWidgets-3.2.7.tar.bz2 diff --git a/sources b/sources index 757b87e..d5ff39e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wxWidgets-3.2.6.tar.bz2) = 87830a73df096ab35d4ff7e131872131153da76f76c58d70e57558915c3faea280af193104163ce24e9e249a62b8e65d19ebfa20046ce0d2c45b2368b108619f +SHA512 (wxWidgets-3.2.7.tar.bz2) = 7b2a8ec2dfcd8e816ac6fee9fe74c3f20d8e81422fe044fb5d701ab257fae6fc31871ab1e099b3cdce1d83a54b6edd547c8b155a4b84658dcaac123390a7b82b diff --git a/wxGTK.spec b/wxGTK.spec index 8636b29..6a1d890 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -5,8 +5,8 @@ %bcond_without tests Name: wxGTK -Version: 3.2.6 -Release: 3%{?dist} +Version: 3.2.7 +Release: 1%{?dist} Summary: GTK port of the wxWidgets GUI library License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: https://www.wxwidgets.org/ @@ -350,6 +350,9 @@ fi %doc html %changelog +* Wed Apr 09 2025 Scott Talbert - 3.2.7-1 +- Update to new upstream release 3.2.7 + * Tue Feb 18 2025 Scott Talbert - 3.2.6-3 - Add conditional for disabling tests From 9892600e9aa527636cd6ba75ff8f4b3e4bb1f245 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mon, 5 May 2025 20:30:41 -0400 Subject: [PATCH 15/17] Update to new upstream release 3.2.8 (#2363255) --- .gitignore | 1 + sources | 2 +- wxGTK.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4eb8e96..85e5b49 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /wxWidgets-3.2.5.tar.bz2 /wxWidgets-3.2.6.tar.bz2 /wxWidgets-3.2.7.tar.bz2 +/wxWidgets-3.2.8.tar.bz2 diff --git a/sources b/sources index d5ff39e..266945f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wxWidgets-3.2.7.tar.bz2) = 7b2a8ec2dfcd8e816ac6fee9fe74c3f20d8e81422fe044fb5d701ab257fae6fc31871ab1e099b3cdce1d83a54b6edd547c8b155a4b84658dcaac123390a7b82b +SHA512 (wxWidgets-3.2.8.tar.bz2) = 3ac5c8f689c771ea27fedcfc4c4416c936f279f8dbf87476a9d8e454d9ecd8c4ed7f9072d7c1e33273128dbfc3fea22954c466ba538bbe5868745d14e882df63 diff --git a/wxGTK.spec b/wxGTK.spec index 6a1d890..cfd954f 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -5,7 +5,7 @@ %bcond_without tests Name: wxGTK -Version: 3.2.7 +Version: 3.2.8 Release: 1%{?dist} Summary: GTK port of the wxWidgets GUI library License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 @@ -350,6 +350,9 @@ fi %doc html %changelog +* Tue May 06 2025 Scott Talbert - 3.2.8-1 +- Update to new upstream release 3.2.8 (#2363255) + * Wed Apr 09 2025 Scott Talbert - 3.2.7-1 - Update to new upstream release 3.2.7 From 496728c71401f38ec21b166281e371f763ec1a97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:34:35 +0000 Subject: [PATCH 16/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- wxGTK.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxGTK.spec b/wxGTK.spec index cfd954f..dc1f778 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -6,7 +6,7 @@ Name: wxGTK Version: 3.2.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK port of the wxWidgets GUI library License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: https://www.wxwidgets.org/ @@ -350,6 +350,9 @@ fi %doc html %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.2.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue May 06 2025 Scott Talbert - 3.2.8-1 - Update to new upstream release 3.2.8 (#2363255) From 0370c8a20d567ef381b3fdb28aaa69ab4062f26a Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mon, 15 Dec 2025 23:17:51 -0500 Subject: [PATCH 17/17] Update to new upstream release 3.2.9 --- .gitignore | 1 + sources | 2 +- wxGTK.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 85e5b49..f18c14f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /wxWidgets-3.2.6.tar.bz2 /wxWidgets-3.2.7.tar.bz2 /wxWidgets-3.2.8.tar.bz2 +/wxWidgets-3.2.9.tar.bz2 diff --git a/sources b/sources index 266945f..fccf811 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wxWidgets-3.2.8.tar.bz2) = 3ac5c8f689c771ea27fedcfc4c4416c936f279f8dbf87476a9d8e454d9ecd8c4ed7f9072d7c1e33273128dbfc3fea22954c466ba538bbe5868745d14e882df63 +SHA512 (wxWidgets-3.2.9.tar.bz2) = 6fe5caa3deaa02df0ef1891e417625b7719cffc9968a2d43e5fbca349ec9fdb8d4fc85fb422f835df751af3a816f946fb9d0d008163924be1669e54ce2346df7 diff --git a/wxGTK.spec b/wxGTK.spec index dc1f778..09cc32c 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -5,8 +5,8 @@ %bcond_without tests Name: wxGTK -Version: 3.2.8 -Release: 2%{?dist} +Version: 3.2.9 +Release: 1%{?dist} Summary: GTK port of the wxWidgets GUI library License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: https://www.wxwidgets.org/ @@ -350,6 +350,9 @@ fi %doc html %changelog +* Tue Dec 16 2025 Scott Talbert - 3.2.9-1 +- Update to new upstream release 3.2.9 + * Fri Jul 25 2025 Fedora Release Engineering - 3.2.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild