Updated cygport for for wxwidgets 3.0 package

[Hamish MB <hamishmb at live dot co dot uk>]

Attached is a patch from git format-patch to upgrade the wxwxidgets
version to 3.0.4. Next up I'll try to make a package for wxPython 4, but
I have to get it to build first.

Hamish

From ea95be9a014d823ffecc541ff97613a798c98d44 Mon Sep 17 00:00:00 2001
From: Hamish McIntyre-Bhatty <hamishmb@live.co.uk>
Date: Thu, 5 Sep 2019 15:00:14 +0100
Subject: [PATCH] Remove unneeded patches, and update for wxWidgets 3.0.4

---
 3.0.2-cygwin-auto-import.patch |  12 ----
 3.0.2-cygwin-dlopen.patch      |  46 ---------------
 3.0.2-cygwin-gcc5.patch        |  21 -------
 3.0.2-cygwin-unix.patch        | 100 ---------------------------------
 3.0.3-autoreconf.patch         |  21 -------
 3.0.3-cygwin-ftm.patch         |  11 ----
 wxWidgets3.0.cygport           |  38 +++++--------
 7 files changed, 13 insertions(+), 236 deletions(-)
 delete mode 100644 3.0.2-cygwin-auto-import.patch
 delete mode 100644 3.0.2-cygwin-dlopen.patch
 delete mode 100644 3.0.2-cygwin-gcc5.patch
 delete mode 100644 3.0.2-cygwin-unix.patch
 delete mode 100644 3.0.3-autoreconf.patch
 delete mode 100644 3.0.3-cygwin-ftm.patch

diff --git a/3.0.2-cygwin-auto-import.patch b/3.0.2-cygwin-auto-import.patch
deleted file mode 100644
index a2c09f9..0000000
--- a/3.0.2-cygwin-auto-import.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- origsrc/wxPython-src-3.0.2.0/include/wx/dlimpexp.h	2013-12-31 15:47:57.000000000 -0600
-+++ src/wxPython-src-3.0.2.0/include/wx/dlimpexp.h	2015-01-04 14:56:39.870827000 -0600
-@@ -56,9 +56,6 @@
- #        define WXEXPORT _Export
- #        define WXIMPORT _Export
- #    endif
--#elif defined(__CYGWIN__)
--#    define WXEXPORT __declspec(dllexport)
--#    define WXIMPORT __declspec(dllimport)
- #endif
- 
- /* for other platforms/compilers we don't anything */
diff --git a/3.0.2-cygwin-dlopen.patch b/3.0.2-cygwin-dlopen.patch
deleted file mode 100644
index 43bedc6..0000000
--- a/3.0.2-cygwin-dlopen.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- origsrc/wxPython-src-3.0.2.0/src/common/dynlib.cpp	2013-12-16 07:42:30.000000000 -0600
-+++ src/wxPython-src-3.0.2.0/src/common/dynlib.cpp	2015-01-04 15:00:38.988043900 -0600
-@@ -165,7 +165,7 @@ void *wxDynamicLibrary::GetSymbol(const
- wxString wxDynamicLibrary::GetDllExt(wxDynamicLibraryCategory cat)
- {
-     wxUnusedVar(cat);
--#if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
-+#if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__) || defined(__CYGWIN__)
-     return ".dll";
- #elif defined(__HPUX__)
-     return ".sl";
-@@ -197,7 +197,11 @@ wxDynamicLibrary::CanonicalizeName(const
-     {
-         case wxDL_LIBRARY:
-             // Library names should start with "lib" under Unix.
-+#ifdef __CYGWIN__
-+            nameCanonic = "cyg";
-+#else
-             nameCanonic = "lib";
-+#endif
-             break;
-         case wxDL_MODULE:
-             // Module names are arbitrary and should have no prefix added.
---- origsrc/wxPython-src-3.0.2.0/src/unix/dlunix.cpp	2013-12-31 15:47:57.000000000 -0600
-+++ src/wxPython-src-3.0.2.0/src/unix/dlunix.cpp	2015-01-04 14:58:20.943403200 -0600
-@@ -184,7 +184,11 @@ public:
-         details->m_length = (char *)end - (char *)start;
- 
-         // try to extract the library version from its name
-+#ifdef __CYGWIN__
-+        const size_t posExt = path.rfind(wxT(".dll"));
-+#else
-         const size_t posExt = path.rfind(wxT(".so"));
-+#endif
-         if ( posExt != wxString::npos )
-         {
-             if ( path.c_str()[posExt + 3] == wxT('.') )
-@@ -213,7 +217,7 @@ wxDynamicLibraryDetailsArray wxDynamicLi
- {
-     wxDynamicLibraryDetailsArray dlls;
- 
--#ifdef __LINUX__
-+#if defined(__LINUX__) || defined(__CYGWIN__)
-     // examine /proc/self/maps to find out what is loaded in our address space
-     wxFFile file(wxT("/proc/self/maps"));
-     if ( file.IsOpened() )
diff --git a/3.0.2-cygwin-gcc5.patch b/3.0.2-cygwin-gcc5.patch
deleted file mode 100644
index ce9f3ae..0000000
--- a/3.0.2-cygwin-gcc5.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Sometimes when called from wxLocale::GetSystemEncodingName, 'ascii' gets
-clobbered by the subsequent wxStringInternalBuffer ctor.  CoW issues?
-
---- origsrc/wxPython-src-3.0.2.0/src/common/string.cpp	2014-10-08 11:51:06.000000000 -0500
-+++ src/wxPython-src-3.0.2.0/src/common/string.cpp	2017-03-29 01:20:26.947989900 -0500
-@@ -1168,11 +1168,13 @@ int wxString::CmpNoCase(const wxString&
- 
- #if wxUSE_UNICODE
- 
--wxString wxString::FromAscii(const char *ascii, size_t len)
-+wxString wxString::FromAscii(const char *orig, size_t len)
- {
--    if (!ascii || len == 0)
-+    if (!orig || len == 0)
-        return wxEmptyString;
- 
-+    char *ascii = strndupa (orig, len);
-+
-     wxString res;
- 
-     {
diff --git a/3.0.2-cygwin-unix.patch b/3.0.2-cygwin-unix.patch
deleted file mode 100644
index 8e9749b..0000000
--- a/3.0.2-cygwin-unix.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- origsrc/wxPython-src-3.0.2.0/build/aclocal/bakefile.m4	2013-12-16 07:42:29.000000000 -0600
-+++ src/wxPython-src-3.0.2.0/build/aclocal/bakefile.m4	2015-01-04 14:53:55.788740800 -0600
-@@ -639,7 +639,7 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF]
- 
-     LDFLAGS_GUI=
-     case ${BAKEFILE_HOST} in
--        *-*-cygwin* | *-*-mingw32* )
-+        *-*-mingw32* )
-         LDFLAGS_GUI="-mwindows"
-     esac
-     AC_SUBST(LDFLAGS_GUI)
---- origsrc/wxPython-src-3.0.2.0/include/wx/defs.h	2014-10-08 11:51:06.000000000 -0500
-+++ src/wxPython-src-3.0.2.0/include/wx/defs.h	2017-03-28 21:43:23.887410400 -0500
-@@ -256,7 +256,7 @@ typedef short int WXTYPE;
-     #if defined(__VISUALC__) && (__VISUALC__ >= 1100)
-         /*  VC++ 6.0 and 5.0 have explicit (what about earlier versions?) */
-         #define HAVE_EXPLICIT
--    #elif ( defined(__MINGW32__) || defined(__CYGWIN32__) ) \
-+    #elif ( defined(__MINGW32__) || defined(__CYGWIN__) ) \
-           && wxCHECK_GCC_VERSION(2, 95)
-         /*  GCC 2.95 has explicit, what about earlier versions? */
-         #define HAVE_EXPLICIT
-@@ -343,7 +343,7 @@ typedef short int WXTYPE;
-         /*  VC++ 6.0 and 5.0 have std::string::compare */
-         /*  (what about earlier versions?) */
-         #define HAVE_STD_STRING_COMPARE
--    #elif ( defined(__MINGW32__) || defined(__CYGWIN32__) ) \
-+    #elif ( defined(__MINGW32__) || defined(__CYGWIN__) ) \
-           && wxCHECK_GCC_VERSION(3, 1)
-         /*  GCC 3.1 has std::string::compare; */
-         /*  3.0 never was in MinGW, 2.95 hasn't it */
-@@ -438,7 +438,7 @@ typedef short int WXTYPE;
-         Mingw <= 3.4 and all versions of Cygwin don't have std::wostream
-      */
-     #if (defined(__MINGW32__) && !wxCHECK_GCC_VERSION(4, 0)) || \
--        defined(__CYGWIN__)
-+        (defined(__CYGWIN__) && !wxCHECK_GCC_VERSION(5, 0))
-         #define wxNO_WOSTREAM
-     #endif
- 
---- origsrc/wxPython-src-3.0.2.0/src/common/mimecmn.cpp	2013-12-16 07:42:30.000000000 -0600
-+++ src/wxPython-src-3.0.2.0/src/common/mimecmn.cpp	2017-03-28 21:48:12.630902100 -0500
-@@ -596,7 +596,7 @@ bool wxMimeTypesManager::Unassociate(wxF
- {
-     EnsureImpl();
- 
--#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
-+#if defined(__UNIX__) && !defined(__WINE__)
-     return m_impl->Unassociate(ft);
- #else
-     return ft->Unassociate();
-@@ -706,7 +706,7 @@ size_t wxMimeTypesManager::EnumAllFileTy
- void wxMimeTypesManager::Initialize(int mcapStyle,
-                                     const wxString& sExtraDir)
- {
--#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
-+#if defined(__UNIX__) && !defined(__WINE__)
-     EnsureImpl();
- 
-     m_impl->Initialize(mcapStyle, sExtraDir);
-@@ -719,7 +719,7 @@ void wxMimeTypesManager::Initialize(int
- // and this function clears all the data from the manager
- void wxMimeTypesManager::ClearData()
- {
--#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
-+#if defined(__UNIX__) && !defined(__WINE__)
-     EnsureImpl();
- 
-     m_impl->ClearData();
---- origsrc/wxPython-src-3.0.2.0/src/unix/stdpaths.cpp	2013-12-16 07:42:31.000000000 -0600
-+++ src/wxPython-src-3.0.2.0/src/unix/stdpaths.cpp	2015-01-04 14:54:33.743607000 -0600
-@@ -37,7 +37,7 @@
- #include "wx/log.h"
- #include "wx/textfile.h"
- 
--#if defined( __LINUX__ ) || defined( __VMS )
-+#if defined( __LINUX__ ) || defined( __VMS ) || defined ( __CYGWIN__ )
-     #include <unistd.h>
- #endif
- 
-@@ -117,7 +117,7 @@ wxString wxStandardPaths::GetExecutableP
- 
- wxString wxStandardPaths::GetExecutablePath() const
- {
--#ifdef __LINUX__
-+#if defined ( __LINUX__ ) || defined ( __CYGWIN__ )
-     wxString exeStr;
- 
-     char buf[4096];
---- origsrc/wxPython-src-3.0.2.0/src/unix/utilsunx.cpp	2014-06-24 16:43:01.000000000 -0500
-+++ src/wxPython-src-3.0.2.0/src/unix/utilsunx.cpp	2015-01-04 14:56:24.894800900 -0600
-@@ -1172,7 +1172,7 @@ unsigned long wxGetProcessId()
- 
- wxMemorySize wxGetFreeMemory()
- {
--#if defined(__LINUX__)
-+#if defined(__LINUX__) || defined(__CYGWIN__)
-     // get it from /proc/meminfo
-     FILE *fp = fopen("/proc/meminfo", "r");
-     if ( fp )
diff --git a/3.0.3-autoreconf.patch b/3.0.3-autoreconf.patch
deleted file mode 100644
index 9f31a97..0000000
--- a/3.0.3-autoreconf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- origsrc/wxWidgets-3.0.3/configure.in	2017-04-29 07:00:38.000000000 -0500
-+++ src/wxWidgets-3.0.3/configure.in	2017-07-25 23:20:07.158863100 -0500
-@@ -2673,7 +2673,6 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
-             ac_configure_args="$ac_configure_args --disable-jbig"
-         fi
- 
--        AC_CONFIG_SUBDIRS([src/tiff])
-     fi
- fi
- 
-@@ -2717,10 +2716,6 @@ if test "$wxUSE_EXPAT" != "no"; then
-             wxUSE_EXPAT=sys
-         fi
-     fi
--    if test "$wxUSE_EXPAT" = "builtin" ; then
--        dnl Expat needs this:
--        AC_CONFIG_SUBDIRS([src/expat])
--    fi
- fi
- 
- 
diff --git a/3.0.3-cygwin-ftm.patch b/3.0.3-cygwin-ftm.patch
deleted file mode 100644
index e8a9b2e..0000000
--- a/3.0.3-cygwin-ftm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- origsrc/wxWidgets-3.0.3/configure.in	2017-04-29 07:00:38.000000000 -0500
-+++ src/wxWidgets-3.0.3/configure.in	2017-07-25 23:20:07.158863100 -0500
-@@ -1313,7 +1313,7 @@ dnl ------------------------------------
- dnl Platform specific tests
- dnl ------------------------------------------------------------------------
- 
--if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
-+if test "$USE_UNIX" = 1 -o "$USE_GNU" = 1; then
-     dnl While g++ predefines _GNU_SOURCE by default, gcc does not, so do it
-     dnl explicitly to ensure that the tests done below using C compiler
-     dnl succeed, otherwise things like pthread_mutexattr_settype() (and many
diff --git a/wxWidgets3.0.cygport b/wxWidgets3.0.cygport
index e004135..67ceb75 100644
--- a/wxWidgets3.0.cygport
+++ b/wxWidgets3.0.cygport
@@ -1,5 +1,5 @@
 NAME="wxWidgets3.0"
-VERSION=3.0.3
+VERSION=3.0.4
 RELEASE=1
 CATEGORY="Libs"
 SUMMARY="wxWidgets C++ application framework"
@@ -12,16 +12,7 @@ socket and thread support."
 HOMEPAGE="http://wxwidgets.org/";
 SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${VERSION}/wxWidgets-${VERSION}.tar.bz2";
 SRC_DIR="wxWidgets-${VERSION}"
-PATCH_URI="
-	http://pkgs.fedoraproject.org/cgit/rpms/wxGTK3.git/plain/wxGTK3-3.0.3-abicheck.patch
-	mirror://portage/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch
-	3.0.2-cygwin-auto-import.patch
-	3.0.2-cygwin-dlopen.patch
-	3.0.2-cygwin-unix.patch
-	3.0.2-cygwin-gcc5.patch
-	3.0.3-autoreconf.patch
-	3.0.3-cygwin-ftm.patch
-"
+PATCH_URI=""
 
 slot=${PV_MAJ_MIN}
 
@@ -33,17 +24,19 @@ libwx_baseu3_0_0_CONTENTS="
 	--exclude=html
 	usr/bin/cygwx_baseu*-3.0-0.dll
 	usr/share/doc/${NAME}/
-	usr/share/locale/*/LC_MESSAGES/wxstd30.mo
+	usr/share/locale/*/LC_MESSAGES/wxstd.mo
 "
 libwx_baseu3_0_devel_REQUIRES="libexpat-devel libiconv-devel zlib-devel"
 libwx_baseu3_0_devel_CONTENTS="
 	usr/bin/wxrc-3.0.exe
+	usr/bin/wxrc
 	usr/include/wx-3.0/
 	usr/lib/libwx_baseu*-3.0.dll.a
 	usr/lib/wx/config/base-unicode-3.0
 	usr/lib/wx/include/base-unicode-3.0/
 	usr/share/aclocal/wxwin-3.0.m4
-	usr/share/bakefile/presets/wx30*
+	usr/share/aclocal/wxwin.m4
+	usr/share/bakefile/presets/wx*
 "
 libwx_gtk2u3_0_0_SUMMARY="${SUMMARY} (GTK+2 unicode runtime)"
 libwx_gtk2u3_0_0_CONTENTS="usr/bin/cygwx_gtk2u*-3.0-0.dll"
@@ -60,6 +53,7 @@ libwx_gtk3u3_0_devel_SUMMARY="${SUMMARY} (development)"
 libwx_gtk3u3_0_devel_REQUIRES="libGL-devel libglib2.0-devel libgtk2.0-devel libX11-devel"
 libwx_gtk3u3_0_devel_CONTENTS="
 	usr/bin/wx-config-3.0
+	usr/bin/wx-config
 	usr/lib/libwx_gtk3u*-3.0.dll.a
 	usr/lib/wx/config/gtk3-unicode-3.0
 	usr/lib/wx/include/gtk3-unicode-3.0/
@@ -78,8 +72,6 @@ src_compile() {
 	local myconf
 
 	cd ${S}
-	NO_ACLOCAL=1 NO_LIBTOOLIZE=1 NO_AUTOHEADER=1 NO_AUTOMAKE=1 \
-	cygautoreconf
 
 	cd ${S}/locale
 	rm -f *.mo
@@ -89,8 +81,7 @@ src_compile() {
 	cd ${B}/base
 
 	# standalone wx_base
-	cygconf \
-		--enable-compat26 \
+	CPPFLAGS='-D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE' cygconf \
 		--enable-optimise \
 		--enable-shared \
 		--enable-unicode \
@@ -100,11 +91,13 @@ src_compile() {
 		--with-libiconv \
 		--with-zlib
 
+    cygmake
+
 	mkdir -p ${B}/gtk2
 	cd ${B}/gtk2
 
 	# gnomevfs: Gentoo bug 203389
-	cygconf \
+	CPPFLAGS='-D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE' cygconf \
 		--enable-optimise \
 		--enable-shared \
 		--enable-unicode \
@@ -112,7 +105,6 @@ src_compile() {
 		--disable-gtktest \
 		--disable-rpath \
 		--disable-sdltest \
-		--disable-webviewwebkit \
 		--with-expat \
 		--with-gtk=2 \
 		--without-gnomeprint --without-gnomevfs \
@@ -133,7 +125,7 @@ src_compile() {
 	cd ${B}/gtk3
 
 	# gnomevfs: Gentoo bug 203389
-	cygconf \
+	CPPFLAGS='-D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE' cygconf \
 		--enable-optimise \
 		--enable-shared \
 		--enable-unicode \
@@ -141,7 +133,6 @@ src_compile() {
 		--disable-gtktest \
 		--disable-rpath \
 		--disable-sdltest \
-		--disable-webviewwebkit \
 		--with-expat \
 		--with-gtk=3 \
 		--without-gnomeprint --without-gnomevfs \
@@ -164,10 +155,7 @@ src_compile() {
 }
 
 src_test() {
-	cd ${B}/gtk3/tests
-	cygmake
-	PATH="${B}/lib:$PATH" ./test
-	PATH="${B}/lib:$PATH" ./test_gui
+	echo "No tests are available"
 }
 
 src_install() {
-- 
2.17.1