diff --git a/wxWidgets-3.0.2-make-abi-check-not-fatal.patch b/wxWidgets30-3.0.5.1-make-abi-check-not-fatal.patch similarity index 100% rename from wxWidgets-3.0.2-make-abi-check-not-fatal.patch rename to wxWidgets30-3.0.5.1-make-abi-check-not-fatal.patch diff --git a/wxWidgets30.spec b/wxWidgets30.spec index 78bef7b..cbc6984 100644 --- a/wxWidgets30.spec +++ b/wxWidgets30.spec @@ -6,7 +6,7 @@ Name: wxWidgets30 Version: 3.0.5.1 -Release: 1mamba +Release: 2mamba Summary: GTK+ port of the wxWidgets library Group: System/Libraries Vendor: openmamba @@ -14,16 +14,13 @@ Distribution: openmamba Packager: Silvan Calarco URL: http://wxwindows.org/ Source: https://github.com/wxWidgets/wxWidgets/releases/download/v%{version}/wxWidgets-%{version}.tar.bz2 -#Source: http://downloads.sourceforge.net/wxwindows/wxWidgets-%{version}.tar.bz2 Patch0: wxWidgets-3.0.2-gcc-6.1.0.patch -Patch1: wxWidgets-3.0.2-make-abi-check-not-fatal.patch +Patch1: wxWidgets30-3.0.5.1-make-abi-check-not-fatal.patch Patch2: wxWidgets30-3.0.5.1-fix-locales-collision.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: ldconfig BuildRequires: libGConf-devel -BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: libSDL2-devel BuildRequires: libSM-devel @@ -35,17 +32,18 @@ BuildRequires: libexpat-devel BuildRequires: libgcc BuildRequires: libgdk-pixbuf-devel BuildRequires: libglib-devel +BuildRequires: libglvnd-devel BuildRequires: libgnome-vfs-devel BuildRequires: libgst-plugins-base-devel BuildRequires: libgstreamer-devel -BuildRequires: libgtk-devel +BuildRequires: libgtk3-devel BuildRequires: libharfbuzz-devel BuildRequires: libjpeg-devel BuildRequires: libmspack-devel BuildRequires: libnotify-devel BuildRequires: libpango-devel BuildRequires: libpng-devel -BuildRequires: libsoup-devel +BuildRequires: libsoup2-devel BuildRequires: libstdc++6-devel BuildRequires: libtiff-devel BuildRequires: libwebkit2gtk-devel @@ -53,23 +51,9 @@ BuildRequires: libz-devel ## AUTOBUILDREQ-END BuildRequires: xorg-proto-devel BuildRequires: libesound-devel -BuildRequires: libgnomecanvas-devel BuildRequires: bison BuildRequires: flex BuildRequires: libcppunit-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -# FIXME: -# checking for --enable-compat24... no -# checking for --disable-compat26... no -# checking for --enable-mediactrl... no -# checking for --enable-gstreamer8... no -# checking for --enable-graphics_ctx... no -# checking for --enable-dataviewctrl... no -# checking for --enable-accessibility... no -# checking for --enable-iff... no -# -# configure: WARNING: wxMetafile is not available on this system... disabled %description wxWidgets is a free C++ library for cross-platform GUI development. @@ -82,7 +66,6 @@ Requires: %{wxMain}-i18n = %{?epoch:%epoch:}%{version}-%{release} %description -n %{wxBaseu_name} wxBase is a collection of C++ classes providing basic data structures (strings, lists, arrays), powerful wxDateTime class for date manipulations, portable wrappers around many OS-specific functions allowing to build the same program under all supported folders, wxThread class for writing multithreaded programs using either Win32 or POSIX threads and much more. wxBase currently supports the following platforms: Win32, generic Unix (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS. - This package contains the unicode enabled version of wxBase. %package -n %{wxBaseu_name}-devel @@ -95,7 +78,6 @@ Requires: %{wxMain}-devel = %{?epoch:%epoch:}%{version}-%{release} %description -n %{wxBaseu_name}-devel wxBase is a collection of C++ classes providing basic data structures (strings, lists, arrays), powerful wxDateTime class for date manipulations, portable wrappers around many OS-specific functions allowing to build the same program under all supported folders, wxThread class for writing multithreaded programs using either Win32 or POSIX threads and much more. wxBase currently supports the following platforms: Win32, generic Unix (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS. - This package contains static libraries and header files need for development with the unicode enabled version of wxBase. %package -n %{wxGTKu_name} @@ -107,7 +89,6 @@ Provides: libwxGTKu = %{?epoch:%epoch:}%{version}-%{release} %description -n %{wxGTKu_name} wxWidgets is a free C++ library for cross-platform GUI development. With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. - This package contains the unicode enabled version of wxGTK. %package -n %{wxGTKu_name}-devel @@ -120,7 +101,6 @@ Requires: %{wxMain}-devel = %{?epoch:%epoch:}%{version}-%{release} %description -n %{wxGTKu_name}-devel wxWidgets is a free C++ library for cross-platform GUI development. With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. - This package contains static libraries and header files need for development with the unicode enabled version of wxGTK. %package -n %{wxMain}-devel @@ -133,8 +113,7 @@ Conflicts: libWxGTK-devel %description -n %{wxMain}-devel wxWidgets is a free C++ library for cross-platform GUI development. With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. - -This package contains common static libraries and header files need for development. +This package contains common static libraries and header files needed for development. %package -n %{wxMain}-examples Summary: wxGTK example programs @@ -157,9 +136,8 @@ The translations files for the wxWidgets library. %setup -q -n wxWidgets-%{version} #-D -T #:<< _EOF - -#%patch0 -p1 -#%patch1 -p1 +%define _default_patch_fuzz 2 +%patch1 -p1 -b .make-abi-check-not-fatal %patch2 -p1 # FIXME: %{_datadir}/bakefile/presets generates a conflict between wx 2.6 @@ -303,6 +281,9 @@ fi %{_datadir}/bakefile/presets/* %changelog +* Mon Dec 27 2021 Silvan Calarco 3.0.5.1-2mamba +- rebuilt with gcc 11.2.0 and restore make-abi-check-not-fatal patch + * Tue May 19 2020 Silvan Calarco 3.0.5.1-1mamba - update to 3.0.5.1 - add fix-locales-collision patch for i18n package to cohexist with 3.1