Compare commits

...

10 Commits

Author SHA1 Message Date
David Abdurachmanov ab32abb583
Skip failing tests on riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2023-12-04 08:44:16 +02:00
Scott Talbert 02731d9463 Update to new upstream release 3.2.4 2023-11-15 21:17:07 -05:00
Scott Talbert 065f1ec8d3 Update to new upstream release 3.2.3 2023-10-11 20:08:13 -04:00
Scott Talbert 0e4b477a78 Rebuild with webkit2gtk4.1 (#2232979) 2023-08-21 22:53:48 -04:00
Scott Talbert fe80f5f50e Make wxGetLinuxDistributionInfo work without lsb_release (#2184391) 2023-07-28 11:08:58 -04:00
Fedora Release Engineering ca0b6d8e7b Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 18:26:23 +00:00
Scott Talbert 91cecbb949 Remove unused BR on GConf2-devel (unused since before 3.0) 2023-06-19 15:43:54 -04:00
Scott Talbert c40df6946c Fix WebView selection test with WebKit 2.40+ 2023-06-16 12:03:40 -04:00
Peter Lemenkov 68a2d21fe7 Revert "Don't require GConf2"
This reverts commit d12c6c69a5.
2023-03-23 16:30:14 +01:00
Peter Lemenkov fd113fb825 Revert "Disable tests on anything but Fedora"
This reverts commit 5ae06d1c8a.
2023-03-23 16:30:00 +01:00
3 changed files with 41 additions and 8 deletions

2
.gitignore vendored
View File

@ -7,3 +7,5 @@
/wxWidgets-3.2.1.tar.bz2
/wxWidgets-3.2.2.tar.bz2
/wxWidgets-3.2.2.1.tar.bz2
/wxWidgets-3.2.3.tar.bz2
/wxWidgets-3.2.4.tar.bz2

View File

@ -1 +1 @@
SHA512 (wxWidgets-3.2.2.1.tar.bz2) = 289d61ea2abd75a329aafcbd347ab84b136f31fca01dd902593f661691ecd30a4416286ff501c4257baa6765cf356ade3087eb8609af9a44599cfdc20e2f03a6
SHA512 (wxWidgets-3.2.4.tar.bz2) = 8592e8b7ddf4afe83c9dd4894faa43bbf8a5d57d1ac408b3b6b3b77a809063493ef3e2eefa3155214e1c91c5fad2dc6c0760dd79ada3e73f73ec4d06021b6fff

View File

@ -4,8 +4,8 @@
%global sover 0
Name: wxGTK
Version: 3.2.2.1
Release: 1%{?dist}
Version: 3.2.4
Release: 1.0.riscv64%{?dist}
Summary: GTK port of the wxWidgets GUI library
License: wxWidgets
URL: https://www.wxwidgets.org/
@ -20,7 +20,8 @@ Patch0: %{name}-3.1.6-abicheck.patch
BuildRequires: make
BuildRequires: gcc-c++
BuildRequires: gtk3-devel
BuildRequires: webkit2gtk3-devel
BuildRequires: autoconf
BuildRequires: webkit2gtk4.1-devel
BuildRequires: zlib-devel
BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
@ -38,14 +39,12 @@ BuildRequires: graphviz
BuildRequires: libsecret-devel
BuildRequires: libcurl-devel
# For Tests
%if 0%{?fedora}
BuildRequires: glibc-langpack-en
BuildRequires: mesa-dri-drivers
BuildRequires: xclock
BuildRequires: xorg-x11-server-Xvfb
BuildRequires: python3-httpbin
BuildRequires: vulkan-loader
%endif
Provides: %{srcname} = %{version}-%{release}
Provides: bundled(scintilla) = 3.7.2
@ -172,6 +171,10 @@ sed -i -e 's|aclocal)|aclocal/wxwin32.m4)|' Makefile.in
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
rm -f configure
./autogen.sh
%build
%global _configure ../configure
@ -221,7 +224,6 @@ mv %{buildroot}%{_datadir}/bakefile/presets/*.* %{buildroot}%{_datadir}/bakefile
%find_lang wxstd-3.2
%check
%if 0%{?fedora}
pushd %{gtk3dir}/tests
make %{?_smp_mflags}
python3 -m httpbin.core &
@ -229,6 +231,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 \
%endif
~WebRequest::SSL::Ignore
LD_LIBRARY_PATH=%{buildroot}%{_libdir} wxUSE_XVFB=1 xvfb-run -a \
@ -238,10 +243,12 @@ 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
%endif
%post -n %{wxbasename}-devel
if [ -f %{_bindir}/wx-config ] && [ ! -h %{_bindir}/wx-config ] ; then
@ -317,6 +324,30 @@ fi
%doc html
%changelog
* Mon Dec 04 2023 David Abdurachmanov <davidlt@rivosinc.com> - 3.2.4-1.0.riscv64
- Skip failing tests on riscv64
* Thu Nov 16 2023 Scott Talbert <swt@techie.net> - 3.2.4-1
- Update to new upstream release 3.2.4
* Wed Oct 11 2023 Scott Talbert <swt@techie.net> - 3.2.3-1
- Update to new upstream release 3.2.3
* Mon Aug 21 2023 Scott Talbert <swt@techie.net> - 3.2.2.1-6
- Rebuild with webkit2gtk4.1 (#2232979)
* Tue Jul 25 2023 Scott Talbert <swt@techie.net> - 3.2.2.1-5
- Make wxGetLinuxDistributionInfo work without lsb_release (#2184391)
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Jun 19 2023 Scott Talbert <swt@techie.net> - 3.2.2.1-3
- Remove unused BR on GConf2-devel (unused since before 3.0)
* Fri Jun 16 2023 Scott Talbert <swt@techie.net> - 3.2.2.1-2
- Fix WebView selection test with WebKit 2.40+
* Tue Feb 21 2023 Scott Talbert <swt@techie.net> - 3.2.2.1-1
- Update to new upstream release 3.2.2.1 (#2170238)