Update to new upstream release 3.0.4

Conflicts:
	wxGTK3.spec

.gitignore

@@ -0,0 +1,8 @@
+/wxWidgets-3.0.0-docs-html.tar.bz2
+/wxWidgets-3.0.0.tar.bz2
+/wxWidgets-3.0.1-docs-html.tar.bz2
+/wxWidgets-3.0.1.tar.bz2
+/wxWidgets-3.0.2-docs-html.tar.bz2
+/wxWidgets-3.0.2.tar.bz2
+/wxWidgets-3.0.4-docs-html.tar.bz2
+/wxWidgets-3.0.4.tar.bz2

dead.package

@@ -1 +0,0 @@
-Replaced by wxGTK (wxWidgets 3.2)

sources

@@ -0,0 +1,2 @@
+SHA512 (wxWidgets-3.0.4-docs-html.tar.bz2) = 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd
+SHA512 (wxWidgets-3.0.4.tar.bz2) = c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158

wx-config

@@ -0,0 +1,45 @@
+#! /bin/sh
+#
+# Multilib-aware wrapper for the wx-config script
+#
+# Usage: wx-config [--arch <arch>] <regular wx-config options>
+#
+
+version=3.0
+
+if [ $# -ge 2 ]; then
+    if [ $1 = "--arch" ]; then
+	arch=$2
+	shift 2
+    fi
+fi
+
+if [ -z $arch ]; then
+    arch=`uname -m`
+fi
+
+case $arch in
+    i?86|ppc|s390|sparc|arm*|ia64|mips|mipsel)
+        libdir=/usr/lib
+        ;;
+    x86_64|ppc64|s390x|sparc64|aarch64|ppc64le|mips64*)
+        libdir=/usr/lib64
+        ;;
+    *)
+        echo "Unsupported architecture '$arch'"
+        exit 8
+        ;;
+esac
+
+wxconfig=$libdir/wx/config/gtk3-unicode-$version
+# special case when using 32-bit userspace and 64-bit kernel
+if [ ! -f $wxconfig -a \( $arch = ppc64 -o $arch = sparc64 \) ]; then
+    wxconfig=/usr/lib/wx/config/gtk3-unicode-$version
+fi
+
+if [ -x $wxconfig ]; then
+    exec $wxconfig $@
+else
+    echo "wxWidgets3-devel isn't installed for architecture '$arch'"
+    exit 9
+fi

wxGTK3-3.0.2-abicheck.patch

@@ -0,0 +1,14 @@
+--- wxWidgets-3.0.2/src/common/appbase.cpp.abicheck	2015-05-28 12:36:40.697163073 +0900
++++ wxWidgets-3.0.2/src/common/appbase.cpp	2015-05-28 12:38:30.597154298 +0900
+@@ -762,10 +762,7 @@
+         msg.Printf(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+                    lib.c_str(), progName.c_str(), prog.c_str());
+ 
+-        wxLogFatalError(msg.c_str());
+-
+-        // normally wxLogFatalError doesn't return
+-        return false;
++        wxLogWarning(msg.c_str());
+     }
+ 
+     return true;

wxGTK3.spec

@@ -0,0 +1,358 @@
+%global srcname wxWidgets
+%global wxgtkname wxGTK3
+%global wxbasename wxBase3
+#RHEL 6 does not have gtk3
+#RHEL prior to 6 is unsupported by this package
+%if 0%{?el6}
+%global gtkver 2
+%else
+%global gtkver 3
+%endif
+
+Name:           %{wxgtkname}
+Version:        3.0.4
+Release:        1%{?dist}
+Summary:        GTK port of the wxWidgets GUI library
+License:        wxWidgets
+Group:          System Environment/Libraries
+URL:            https://www.wxwidgets.org/
+Source0:        https://github.com/%{srcname}/%{srcname}/releases/download/v%{version}/%{srcname}-%{version}.tar.bz2
+Source1:        https://github.com/%{srcname}/%{srcname}/releases/download/v%{version}/%{srcname}-%{version}-docs-html.tar.bz2
+Source10:       wx-config
+# https://bugzilla.redhat.com/show_bug.cgi?id=1225148
+# remove abort when ABI check fails
+# Backport from wxGTK
+Patch0:         %{name}-3.0.2-abicheck.patch
+BuildRequires:  gtk%{gtkver}-devel
+#Note webkitgtk (GTK2) does not appear to be supported
+%if %{gtkver} == 3
+BuildRequires:  webkitgtk4-devel
+%endif
+BuildRequires:  zlib-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  expat-devel
+BuildRequires:  SDL-devel
+BuildRequires:  libGLU-devel
+BuildRequires:  libSM-devel
+BuildRequires:  gstreamer1-plugins-base-devel
+BuildRequires:  GConf2-devel
+BuildRequires:  gettext
+BuildRequires:  cppunit-devel
+BuildRequires:  libmspack-devel
+
+Provides:       %{srcname} = %{version}-%{release}
+Provides:       bundled(scintilla) = 3.2.1
+Requires:       %{wxbasename}%{?_isa} = %{version}-%{release}
+
+%description
+wxWidgets is the GTK port of the C++ cross-platform wxWidgets
+GUI library, offering classes for all common GUI controls as well as a
+comprehensive set of helper classes for most common application tasks,
+ranging from networking to HTML display and image manipulation.
+
+
+%package        devel
+Group:          Development/Libraries
+Summary:        Development files for the wxGTK3 library
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-gl = %{version}-%{release}
+Requires:       %{name}-media = %{version}-%{release}
+Requires:       %{name}-webview = %{version}-%{release}
+Requires:       %{wxbasename} = %{version}-%{release}
+Requires:       gtk%{gtkver}-devel
+Requires:       libGLU-devel
+Provides:       %{srcname}-devel = %{version}-%{release}
+
+%description devel
+This package include files needed to link with the wxGTK3 library.
+wxWidgets is the GTK port of the C++ cross-platform wxWidgets
+GUI library, offering classes for all common GUI controls as well as a
+comprehensive set of helper classes for most common application tasks,
+ranging from networking to HTML display and image manipulation.
+
+
+%package        gl
+Summary:        OpenGL add-on for the wxWidgets library
+Group:          System Environment/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description gl
+OpenGL (a 3D graphics API) add-on for the wxWidgets library.
+wxWidgets is the GTK port of the C++ cross-platform wxWidgets
+GUI library, offering classes for all common GUI controls as well as a
+comprehensive set of helper classes for most common application tasks,
+ranging from networking to HTML display and image manipulation.
+
+
+%package        media
+Summary:        Multimedia add-on for the wxWidgets library
+Group:          System Environment/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description media
+Multimedia add-on for the wxWidgets library.
+wxWidgets is the GTK port of the C++ cross-platform wxWidgets
+GUI library, offering classes for all common GUI controls as well as a
+comprehensive set of helper classes for most common application tasks,
+ranging from networking to HTML display and image manipulation.
+
+
+%package        webview
+Summary:        WebView add-on for the wxWidgets library
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description webview
+WebView add-on for the wxWidgets library.
+wxWidgets is the GTK port of the C++ cross-platform wxWidgets
+GUI library, offering classes for all common GUI controls as well as a
+comprehensive set of helper classes for most common application tasks,
+ranging from networking to HTML display and image manipulation.
+
+
+%package -n     %{wxbasename}
+Summary:        Non-GUI support classes from the wxWidgets library
+Group:          System Environment/Libraries
+
+%description -n %{wxbasename}
+Every wxWidgets application must link against this library. It contains
+mandatory classes that any wxWidgets code depends on (like wxString) and
+portability classes that abstract differences between platforms. wxBase can
+be used to develop console mode applications -- it does not require any GUI
+libraries or the X Window System.
+
+
+%package        docs
+Group:          Development/Libraries
+Summary:        Documentation for the wxGTK3 library
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{srcname}-docs = %{version}-%{release}
+BuildArch:      noarch
+
+%description docs
+This package provides documentation for the %{srcname} library.
+
+
+%prep
+%setup -q -n %{srcname}-%{version} -a 1
+%patch0 -p1 -b .abicheck
+
+# patch some installed files to avoid conflicts with 2.8.*
+sed -i -e 's|aclocal)|aclocal/wxwin3.m4)|' Makefile.in
+sed -i -e 's|wxstd.mo|wxstd3.mo|' Makefile.in
+sed -i -e 's|wxmsw.mo|wxmsw3.mo|' Makefile.in
+
+# rename docs directory
+mv %{srcname}-%{version}-docs-html html
+
+
+# fix plugin dir for 64-bit
+sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
+sed -i -e 's|/lib|/%{_lib}|' src/unix/stdpaths.cpp
+
+
+%build
+# likely still dereferences type-punned pointers
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+# fix unused-direct-shlib-dependency error:
+export LDFLAGS="-Wl,--as-needed"
+
+%configure \
+  --with-gtk=%{gtkver} \
+  --with-opengl \
+  --with-sdl \
+  --with-gnomeprint \
+  --with-libmspack \
+  --enable-intl \
+  --enable-no_deps \
+  --disable-rpath \
+  --enable-ipv6
+
+make %{?_smp_mflags}
+
+%install
+%makeinstall
+
+# install our multilib-aware wrapper
+##Remove installed
+rm %{buildroot}%{_bindir}/wx-config
+##Install new and symlink
+install -p -D -m 755 %{SOURCE10} %{buildroot}%{_libexecdir}/%{name}/wx-config
+ln -s ../..%{_libexecdir}/%{name}/wx-config %{buildroot}%{_bindir}/wx-config-3.0
+##If gtk2
+%if %{gtkver} == 2
+sed -i -e 's|gtk3|gtk2|' %{buildroot}%{_libexecdir}/%{name}/wx-config
+%endif
+
+#Move wxrc to libexec and symlink (avoid conflict with wxGTK)
+mv %{buildroot}%{_bindir}/wxrc* %{buildroot}%{_libexecdir}/%{name}
+ln -s ../..%{_libexecdir}/%{name}/wxrc-3.0 %{buildroot}%{_bindir}/wxrc-3.0
+
+# move bakefiles to avoid conflicts with 2.8.*
+mkdir %{buildroot}%{_datadir}/bakefile/presets/wx3
+mv %{buildroot}%{_datadir}/bakefile/presets/*.* %{buildroot}%{_datadir}/bakefile/presets/wx3
+
+%find_lang wxstd3
+%find_lang wxmsw3
+cat wxmsw3.lang >> wxstd3.lang
+
+%check
+pushd tests
+make %{?_smp_mflags} test
+popd
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%post gl -p /sbin/ldconfig
+%postun gl -p /sbin/ldconfig
+
+%post media -p /sbin/ldconfig
+%postun media -p /sbin/ldconfig
+
+%post -n %{wxbasename} -p /sbin/ldconfig
+%postun -n %{wxbasename} -p /sbin/ldconfig
+
+%files -f wxstd3.lang
+%doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt
+%doc docs/licendoc.txt docs/preamble.txt docs/readme.txt
+%{_libdir}/libwx_gtk%{gtkver}u_adv-*.so.*
+%{_libdir}/libwx_gtk%{gtkver}u_aui-*.so.*
+%{_libdir}/libwx_gtk%{gtkver}u_core-*.so.*
+%{_libdir}/libwx_gtk%{gtkver}u_html-*.so.*
+%{_libdir}/libwx_gtk%{gtkver}u_propgrid-*.so.*
+%{_libdir}/libwx_gtk%{gtkver}u_qa-*.so.*
+%{_libdir}/libwx_gtk%{gtkver}u_ribbon-*.so.*
+%{_libdir}/libwx_gtk%{gtkver}u_richtext-*.so.*
+%{_libdir}/libwx_gtk%{gtkver}u_stc-*.so.*
+%{_libdir}/libwx_gtk%{gtkver}u_xrc-*.so.*
+
+%files devel
+%{_bindir}/wxrc-3.0
+%{_bindir}/wx-config-3.0
+%{_includedir}/wx-3.0
+%{_libdir}/libwx_*.so
+%{_libdir}/wx
+%{_datadir}/aclocal/wxwin3.m4
+%{_datadir}/bakefile/presets/wx3
+#Exclude some python bitecode
+%exclude %{_datadir}/bakefile/presets/wx3/*.pyc
+%exclude %{_datadir}/bakefile/presets/wx3/*.pyo
+%{_libexecdir}/%{name}
+
+%files gl
+%{_libdir}/libwx_gtk%{gtkver}u_gl-*.so.*
+
+%files media
+%{_libdir}/libwx_gtk%{gtkver}u_media-*.so.*
+
+%files webview
+%{_libdir}/libwx_gtk3u_webview-*.so.*
+%dir %{_libdir}/wx
+%{_libdir}/wx/3.0
+
+%files -n %{wxbasename}
+%doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt
+%doc docs/licendoc.txt docs/preamble.txt docs/readme.txt
+%{_libdir}/libwx_baseu-*.so.*
+%{_libdir}/libwx_baseu_net-*.so.*
+%{_libdir}/libwx_baseu_xml-*.so.*
+
+%files docs
+%doc html
+
+%changelog
+* Wed Oct 30 2019 Scott Talbert <swt@techie.net> - 3.0.4-1
+- Update to new upstream release 3.0.4
+
+* Sun Feb 28 2016 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.2-15
+- Backporting patches from rawhide, credit to Scott Talbert
+- Add patch to resolve issue with wxStaticText growing, fixes RH#1282142
+- Add patches to resolve issues under Wayland with window sizing, RH#1294229
+
+* Mon Feb 22 2016 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.2-14
+- Should actually fix RH#1294712
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Dec 31 2015 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.2-12
+- Remove python artifacts in bakefile dir, causes multilib devel conflict RH#1294712
+- Fix package devel not owning created wx3 backfile preset dir
+- Add support for MIPS to wx-config RH#1294895
+- Wayland Patch
+
+* Thu Nov 5 2015 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.2-11
+- Added patch to fix checkbox and radio button issues for f21 onwards
+
+* Sun Nov 1 2015 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.2-10
+- Removed depreciated/retired libgnomeprintui22
+
+* Sat Aug 22 2015 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.2-9
+- Include spinbutton patch from upstream
+
+* Mon Jun 22 2015 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.2-8
+- Include some upstream patches to fix crashes and warnings
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu May 28 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.2-6
+- Don't abort on ABI check, backport from wxGTK
+
+* Mon May 04 2015 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.2-5
+- Indicate that this package bundles scintilla 3.2.1.
+
+* Thu Feb 26 2015 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.2-4
+- Bump to rebuild, fix bug #1210239
+
+* Thu Feb 26 2015 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.2-3
+- Bump to rebuild for gcc 5.0 to fix some issues
+
+* Tue Nov 04 2014 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.2-2
+- Moving things around again, hopefully fixing RH#1124402
+- Adding symlinks to avoid breaking things
+
+* Tue Nov 04 2014 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.2-1
+- Update to 3.0.2
+
+* Mon Nov 03 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 3.0.1-5
+- Add aarch64 and ppc64le to list of 64-bit architectures
+
+* Tue Sep 30 2014 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.1-4
+- Add conflict with wxgtk-devel again, temporary fix until it can be resolved
+
+* Tue Sep 30 2014 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.1-3
+- Avoid gtk warnings, fixes RH#1147995
+- Moving wxrc and wx-config to libexec instead of renaming
+- Misc changes and spec error fixes, fixes RH#1124402
+
+* Sat Jul 5 2014 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.1-1
+- Bump to 3.0.1 RH#1076617
+
+* Tue Mar 18 2014 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.0-6
+- Removed disable-catch_segvs, see RH#1076617
+
+* Mon Mar 17 2014 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.0-5
+- Renable combat28 - without it causes bugs RH#1076617 and a few others
+
+* Wed Feb 19 2014 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.0-4
+- Fixed GTK3 bug with wx-config
+- Fixed a unused-direct-shlib-dependency error
+
+* Mon Feb 17 2014 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.0-3
+- Added patch to avoid build fail on gtk 3.10+
+- Reverted patching to make devel package compatible with wxGTK-devel
+- Added combatibility for RHEL 6+
+- Changed all mention of GTK3 and GTK2 to GTK for consistency
+
+* Mon Feb 10 2014 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.0-2
+- Changed to build against gtk3
+- Add webkit to build requires
+- Removed patching to make devel package compatible with wxGTK-devel
+- Disable 2.8.* combatibility (redundant functionality)
+
+* Sat Jan 4 2014 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.0-1
+- Initial build of wxwidgets version 3, mostly based on wxGTK spec