public inbox for cygwin-apps@cygwin.com
 help / color / mirror / Atom feed
* Updated cygport for for wxwidgets 3.0 package
@ 2019-09-05 16:37 Hamish MB
  2019-09-05 19:35 ` Yaakov Selkowitz
  2019-09-07 15:08 ` Jon Turney
  0 siblings, 2 replies; 8+ messages in thread
From: Hamish MB @ 2019-09-05 16:37 UTC (permalink / raw)
  To: cygwin-apps

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]

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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Remove-unneeded-patches-and-update-for-wxWidgets-3.0.patch --]
[-- Type: text/x-patch; name="0001-Remove-unneeded-patches-and-update-for-wxWidgets-3.0.patch", Size: 14431 bytes --]

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


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Updated cygport for for wxwidgets 3.0 package
  2019-09-05 16:37 Updated cygport for for wxwidgets 3.0 package Hamish MB
@ 2019-09-05 19:35 ` Yaakov Selkowitz
  2019-09-05 19:42   ` Hamish MB
  2019-09-07 15:08 ` Jon Turney
  1 sibling, 1 reply; 8+ messages in thread
From: Yaakov Selkowitz @ 2019-09-05 19:35 UTC (permalink / raw)
  To: cygwin-apps

On Thu, 2019-09-05 at 16:36 +0000, Hamish MB wrote:
> Attached is a patch from git format-patch to upgrade the wxwxidgets
> version to 3.0.4.

Obviously, I'm not going to accept this patch as is, since it removes
all the modifications I have made to the package.  However, I did go
ahead and update to 3.0.4, which is now working its way to mirrors.

> Next up I'll try to make a package for wxPython 4, but I have to get 
> it to build first.

Since this would conflict with the existing python-wx package, either
this needs to be a compatible replacement for 3.0, or the packaging
needs to be modified to be parallel-installable.

--
Yaakov


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Updated cygport for for wxwidgets 3.0 package
  2019-09-05 19:35 ` Yaakov Selkowitz
@ 2019-09-05 19:42   ` Hamish MB
  2019-09-05 21:19     ` Yaakov Selkowitz
  0 siblings, 1 reply; 8+ messages in thread
From: Hamish MB @ 2019-09-05 19:42 UTC (permalink / raw)
  To: cygwin-apps

I thought those were patches that were needed in order to get it to 
build? They didn't seem to apply when I tried them, so maybe I did it 
wrong. Sorry, anyway.

We could have a wxPython 4 build for Python 3 only, and leave the Python 
2 version as it is?

Hamish

On 05/09/2019 20:35, Yaakov Selkowitz wrote:
> On Thu, 2019-09-05 at 16:36 +0000, Hamish MB wrote:
>> Attached is a patch from git format-patch to upgrade the wxwxidgets
>> version to 3.0.4.
> Obviously, I'm not going to accept this patch as is, since it removes
> all the modifications I have made to the package.  However, I did go
> ahead and update to 3.0.4, which is now working its way to mirrors.
>
>> Next up I'll try to make a package for wxPython 4, but I have to get
>> it to build first.
> Since this would conflict with the existing python-wx package, either
> this needs to be a compatible replacement for 3.0, or the packaging
> needs to be modified to be parallel-installable.
>
> --
> Yaakov
>
>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Updated cygport for for wxwidgets 3.0 package
  2019-09-05 19:42   ` Hamish MB
@ 2019-09-05 21:19     ` Yaakov Selkowitz
  2019-09-06  8:58       ` Hamish MB
  0 siblings, 1 reply; 8+ messages in thread
From: Yaakov Selkowitz @ 2019-09-05 21:19 UTC (permalink / raw)
  To: cygwin-apps

On Thu, 2019-09-05 at 19:42 +0000, Hamish MB wrote:
> I thought those were patches that were needed in order to get it to 
> build? They didn't seem to apply when I tried them, so maybe I did it 
> wrong. Sorry, anyway.

Patches have been written, or applied from other sources, for any
number of reasons.  It would be wise to attempt to understand why.

> We could have a wxPython 4 build for Python 3 only, and leave the Python 
> 2 version as it is?

I'd be willing to consider that.

> On 05/09/2019 20:35, Yaakov Selkowitz wrote:
> > On Thu, 2019-09-05 at 16:36 +0000, Hamish MB wrote:
> > > Attached is a patch from git format-patch to upgrade the wxwxidgets
> > > version to 3.0.4.
> > Obviously, I'm not going to accept this patch as is, since it removes
> > all the modifications I have made to the package.  However, I did go
> > ahead and update to 3.0.4, which is now working its way to mirrors.
> > 
> > > Next up I'll try to make a package for wxPython 4, but I have to get
> > > it to build first.
> > Since this would conflict with the existing python-wx package, either
> > this needs to be a compatible replacement for 3.0, or the packaging
> > needs to be modified to be parallel-installable.

--
Yaakov

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Updated cygport for for wxwidgets 3.0 package
  2019-09-05 21:19     ` Yaakov Selkowitz
@ 2019-09-06  8:58       ` Hamish MB
  0 siblings, 0 replies; 8+ messages in thread
From: Hamish MB @ 2019-09-06  8:58 UTC (permalink / raw)
  To: cygwin-apps

On 05/09/2019 22:19, Yaakov Selkowitz wrote:
> Patches have been written, or applied from other sources, for any
> number of reasons.  It would be wise to attempt to understand why.

Yes. I'm now rebuilding using your updated cygport file and examining
the patches in order to better understand how it works. I think I must
have gotten confused - I think it was the wxpython patches that can't be
applied any more because the codebase has changed a lot, but I'll
investigate that further. I did hear that some of the patches come from
Gentoo, is that right? As you can tell, I'm very new to using patches
and packaging for Cygwin, and I apologise for my newbie questions.

>> We could have a wxPython 4 build for Python 3 only, and leave the Python 
>> 2 version as it is?
> I'd be willing to consider that.

Great, when I get it working, I'll see if I can get the existing patches
to apply and then go from there.

Hamish


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Updated cygport for for wxwidgets 3.0 package
  2019-09-05 16:37 Updated cygport for for wxwidgets 3.0 package Hamish MB
  2019-09-05 19:35 ` Yaakov Selkowitz
@ 2019-09-07 15:08 ` Jon Turney
  2019-09-07 18:48   ` Hamish MB
  1 sibling, 1 reply; 8+ messages in thread
From: Jon Turney @ 2019-09-07 15:08 UTC (permalink / raw)
  To: cygwin-apps; +Cc: hamishmb

On 05/09/2019 17:36, Hamish MB wrote:
> 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.

Thanks for attempting this.

Going forward, please consider that this patch does (at least) the 
following things:

* Removes existing patches
* Updates the version number
* Adds '-D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE' to CPPFLAGS
* Disables the webviewwebkit configuration option
* Removes the tests

It makes it a lot easier for someone to evaluate your patch if you give 
reasons for the changes in the patch commentary.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Updated cygport for for wxwidgets 3.0 package
  2019-09-07 15:08 ` Jon Turney
@ 2019-09-07 18:48   ` Hamish MB
  2019-09-07 19:12     ` Achim Gratz
  0 siblings, 1 reply; 8+ messages in thread
From: Hamish MB @ 2019-09-07 18:48 UTC (permalink / raw)
  To: cygwin-apps

Yes, I realise now that I should have done that. I apologise if I caused 
any irritation or offence.

I guess I might as well provide explanations now for the sake of 
completeness, if nothing else.

1: This was a mistake, and I got confused because I was attempting to 
build wxPython at the same time, and the patches for that no longer 
apply because the build system has changed.

2: This reflects the new version number of wxwidgets - 3.0.4.

3: I needed these in order to build without the patches. I'm not sure 
why, but these aren't needed when the patches are used. This is 
documented at https://forums.wxwidgets.org/viewtopic.php?f=19&t=46091

4: That was another mistake, I didn't realise I did that.

5: I looked in the location the tests were meant to be, but they weren't 
there, so the test section didn't work. Perhaps this has something to do 
with the patches as well?

All that said, I should also have made it clear that I didn't think the 
patch was 100% ready - I thought more work was going to be required at 
any rate.

Hamish

On 07/09/2019 16:07, Jon Turney wrote:
> On 05/09/2019 17:36, Hamish MB wrote:
>> 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.
>
> Thanks for attempting this.
>
> Going forward, please consider that this patch does (at least) the 
> following things:
>
> * Removes existing patches
> * Updates the version number
> * Adds '-D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE' to CPPFLAGS
> * Disables the webviewwebkit configuration option
> * Removes the tests
>
> It makes it a lot easier for someone to evaluate your patch if you 
> give reasons for the changes in the patch commentary.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Updated cygport for for wxwidgets 3.0 package
  2019-09-07 18:48   ` Hamish MB
@ 2019-09-07 19:12     ` Achim Gratz
  0 siblings, 0 replies; 8+ messages in thread
From: Achim Gratz @ 2019-09-07 19:12 UTC (permalink / raw)
  To: cygwin-apps

Hamish MB writes:
> 3: I needed these in order to build without the patches. I'm not sure 
> why, but these aren't needed when the patches are used. This is 
> documented at https://forums.wxwidgets.org/viewtopic.php?f=19&t=46091

It's quite obvious that nobody in that thread has any first-hand
experience with Cygwin and yet they give (mostly bogus as a result of
that) advice.

As with many other projects, upstream often doesn't know about Cygwin at
all, makes assumptions that are outdated by decades or just plain
guesses wrong.  If the project happens to have a native Windows port,
these wrong assumptions are often more widespread, unfortunately.  They
can be in the configury, the Makefiles or the sources themselves, so
getting things right can take a while.  If you need to update a package
you're off to a way better start if you take the existing cygport for
the previous version and then figure out what changes need to apply in
top of that; rather than starting from scratch.  If you are unsure what
a patch does, ask the current maintainer (on this list) rather than just
yanking it.


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Factory and User Sound Singles for Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2019-09-07 19:12 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-05 16:37 Updated cygport for for wxwidgets 3.0 package Hamish MB
2019-09-05 19:35 ` Yaakov Selkowitz
2019-09-05 19:42   ` Hamish MB
2019-09-05 21:19     ` Yaakov Selkowitz
2019-09-06  8:58       ` Hamish MB
2019-09-07 15:08 ` Jon Turney
2019-09-07 18:48   ` Hamish MB
2019-09-07 19:12     ` Achim Gratz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).