Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] wxPython4: actually build core library
@ 2019-10-08 17:58 voidlinux-github
  2019-10-08 18:30 ` voidlinux-github
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: voidlinux-github @ 2019-10-08 17:58 UTC (permalink / raw)
  To: ml


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

There is a new pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages wxPython_fix_core
https://github.com/void-linux/void-packages/pull/15263

wxPython4: actually build core library


A patch file from https://github.com/void-linux/void-packages/pull/15263.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wxPython_fix_core-15263.patch --]
[-- Type: text/x-diff, Size: 4346 bytes --]

From e86ee2a18174c7e7e22edf61568931626a14dcc2 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 8 Oct 2019 12:57:45 -0500
Subject: [PATCH] wxPython4: actually build core library

---
 ...-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch | 12 ++++++------
 srcpkgs/wxPython4/template                           |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
index 47606caa474..f741a968864 100644
--- a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
+++ b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
@@ -1,7 +1,7 @@
 From cddbe3b3b237b8e63abd8921fdb20314c20c2c08 Mon Sep 17 00:00:00 2001
 From: Jasper Chan <jasperchan515@gmail.com>
 Date: Sat, 22 Sep 2018 20:59:29 -0700
-Subject: [PATCH] Switch to wx-config-gtk3.0 to avoid conflict with
+Subject: [PATCH] Switch to wx-config-gtk3 to avoid conflict with
  wxWidgets-gtk2
 
 ---
@@ -17,7 +17,7 @@ index 3cd5b828..57dbd384 100755
  
          ("use_syswx",      (False, "Try to use an installed wx rather than building the "
 -                                   "one in this source tree.  The wx-config in {prefix}/bin "
-+                                   "one in this source tree.  The wx-config-gtk3.0 in {prefix}/bin "
++                                   "one in this source tree.  The wx-config-gtk3 in {prefix}/bin "
                                     "or the first found on the PATH determines which wx is "
                                     "used.  Implies --no_magic.")),
          ("force_config",   (False, "Run configure when building even if the script "
@@ -26,7 +26,7 @@ index 3cd5b828..57dbd384 100755
                               os.path.join(wxDir(), 'setup.h.in'),
                               os.path.join(wxDir(), 'version-script.in'),
 -                             os.path.join(wxDir(), 'wx-config.in'),
-+                             os.path.join(wxDir(), 'wx-config-gtk3.0.in'),
++                             os.path.join(wxDir(), 'wx-config-gtk3.in'),
                               ]
              for dep in dependencies:
                  if newer(dep, os.path.join(BUILD_DIR, "Makefile")):
@@ -35,15 +35,15 @@ index 3cd5b828..57dbd384 100755
  
      if not isWindows:
 -        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config')
-+        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3.0')
++        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3')
          if options.use_syswx:
 -            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config')
-+            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3.0')
++            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3')
              if options.prefix and os.path.exists(wxcfg):
                  WX_CONFIG = wxcfg
              else:
 -                WX_CONFIG = 'wx-config' # hope it is on the PATH
-+                WX_CONFIG = 'wx-config-gtk3.0' # hope it is on the PATH
++                WX_CONFIG = 'wx-config-gtk3' # hope it is on the PATH
  
  
      wafBuildBase = wafBuildDir = getWafBuildBase()
diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index b38d04c067f..500f399db2e 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -1,7 +1,7 @@
 # Template file for 'wxPython4'
 pkgname=wxPython4
 version=4.0.6
-revision=1
+revision=2
 wrksrc="wxPython-${version}"
 build_style=python3-module
 pycompile_module="wx"
@@ -19,7 +19,7 @@ distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz"
 checksum=35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python3"
+	hostmakedepends+=" python3-devel"
 	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}"
 fi
 
@@ -33,9 +33,9 @@ pre_build() {
 		LDSHARED="${CC} -shared $LDFLAGS"
 		env CC="$CC" LDSHARED="$LDSHARED" \
 			PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
-			LDFLAGS="$LDFLAGS" python3 build.py --use_syswx
+			LDFLAGS="$LDFLAGS" python3 build.py build_py --use_syswx
 	else
-		python3 build.py --use_syswx
+		python3 build.py build_py --use_syswx
 	fi
 }
 

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

* Re: wxPython4: actually build core library
  2019-10-08 17:58 [PR PATCH] wxPython4: actually build core library voidlinux-github
@ 2019-10-08 18:30 ` voidlinux-github
  2019-10-09  2:38 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-10-08 18:30 UTC (permalink / raw)
  To: ml


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

New comment by m3tav3rse on void-packages repository

https://github.com/void-linux/void-packages/pull/15263#issuecomment-539643655

Comment:
Works fine, thanks!

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

* Re: [PR PATCH] [Updated] wxPython4: actually build core library
  2019-10-08 17:58 [PR PATCH] wxPython4: actually build core library voidlinux-github
  2019-10-08 18:30 ` voidlinux-github
  2019-10-09  2:38 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-10-09  2:38 ` voidlinux-github
  2019-10-14  0:43 ` voidlinux-github
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-10-09  2:38 UTC (permalink / raw)
  To: ml


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

There is an updated pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages wxPython_fix_core
https://github.com/void-linux/void-packages/pull/15263

wxPython4: actually build core library


A patch file from https://github.com/void-linux/void-packages/pull/15263.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wxPython_fix_core-15263.patch --]
[-- Type: text/x-diff, Size: 4371 bytes --]

From 7b97479b835c3502d746ee2c785e3fca8ac13d26 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 8 Oct 2019 12:57:45 -0500
Subject: [PATCH] wxPython4: actually build core library

---
 ...-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch | 12 ++++++------
 srcpkgs/wxPython4/template                           |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
index 47606caa474..f741a968864 100644
--- a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
+++ b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
@@ -1,7 +1,7 @@
 From cddbe3b3b237b8e63abd8921fdb20314c20c2c08 Mon Sep 17 00:00:00 2001
 From: Jasper Chan <jasperchan515@gmail.com>
 Date: Sat, 22 Sep 2018 20:59:29 -0700
-Subject: [PATCH] Switch to wx-config-gtk3.0 to avoid conflict with
+Subject: [PATCH] Switch to wx-config-gtk3 to avoid conflict with
  wxWidgets-gtk2
 
 ---
@@ -17,7 +17,7 @@ index 3cd5b828..57dbd384 100755
  
          ("use_syswx",      (False, "Try to use an installed wx rather than building the "
 -                                   "one in this source tree.  The wx-config in {prefix}/bin "
-+                                   "one in this source tree.  The wx-config-gtk3.0 in {prefix}/bin "
++                                   "one in this source tree.  The wx-config-gtk3 in {prefix}/bin "
                                     "or the first found on the PATH determines which wx is "
                                     "used.  Implies --no_magic.")),
          ("force_config",   (False, "Run configure when building even if the script "
@@ -26,7 +26,7 @@ index 3cd5b828..57dbd384 100755
                               os.path.join(wxDir(), 'setup.h.in'),
                               os.path.join(wxDir(), 'version-script.in'),
 -                             os.path.join(wxDir(), 'wx-config.in'),
-+                             os.path.join(wxDir(), 'wx-config-gtk3.0.in'),
++                             os.path.join(wxDir(), 'wx-config-gtk3.in'),
                               ]
              for dep in dependencies:
                  if newer(dep, os.path.join(BUILD_DIR, "Makefile")):
@@ -35,15 +35,15 @@ index 3cd5b828..57dbd384 100755
  
      if not isWindows:
 -        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config')
-+        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3.0')
++        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3')
          if options.use_syswx:
 -            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config')
-+            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3.0')
++            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3')
              if options.prefix and os.path.exists(wxcfg):
                  WX_CONFIG = wxcfg
              else:
 -                WX_CONFIG = 'wx-config' # hope it is on the PATH
-+                WX_CONFIG = 'wx-config-gtk3.0' # hope it is on the PATH
++                WX_CONFIG = 'wx-config-gtk3' # hope it is on the PATH
  
  
      wafBuildBase = wafBuildDir = getWafBuildBase()
diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index b38d04c067f..2aa7117d5e0 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -1,7 +1,7 @@
 # Template file for 'wxPython4'
 pkgname=wxPython4
 version=4.0.6
-revision=1
+revision=2
 wrksrc="wxPython-${version}"
 build_style=python3-module
 pycompile_module="wx"
@@ -19,7 +19,6 @@ distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz"
 checksum=35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python3"
 	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}"
 fi
 
@@ -33,9 +32,10 @@ pre_build() {
 		LDSHARED="${CC} -shared $LDFLAGS"
 		env CC="$CC" LDSHARED="$LDSHARED" \
 			PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
-			LDFLAGS="$LDFLAGS" python3 build.py --use_syswx
+			PYTHON_CONFIG="${XBPS_CROSS_BASE}/bin/python3-config" \
+			LDFLAGS="$LDFLAGS" python3 build.py build_py --use_syswx
 	else
-		python3 build.py --use_syswx
+		python3 build.py build_py --use_syswx
 	fi
 }
 

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

* Re: [PR PATCH] [Updated] wxPython4: actually build core library
  2019-10-08 17:58 [PR PATCH] wxPython4: actually build core library voidlinux-github
  2019-10-08 18:30 ` voidlinux-github
@ 2019-10-09  2:38 ` voidlinux-github
  2019-10-09  2:38 ` voidlinux-github
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-10-09  2:38 UTC (permalink / raw)
  To: ml


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

There is an updated pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages wxPython_fix_core
https://github.com/void-linux/void-packages/pull/15263

wxPython4: actually build core library


A patch file from https://github.com/void-linux/void-packages/pull/15263.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wxPython_fix_core-15263.patch --]
[-- Type: text/x-diff, Size: 4371 bytes --]

From 7b97479b835c3502d746ee2c785e3fca8ac13d26 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 8 Oct 2019 12:57:45 -0500
Subject: [PATCH] wxPython4: actually build core library

---
 ...-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch | 12 ++++++------
 srcpkgs/wxPython4/template                           |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
index 47606caa474..f741a968864 100644
--- a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
+++ b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
@@ -1,7 +1,7 @@
 From cddbe3b3b237b8e63abd8921fdb20314c20c2c08 Mon Sep 17 00:00:00 2001
 From: Jasper Chan <jasperchan515@gmail.com>
 Date: Sat, 22 Sep 2018 20:59:29 -0700
-Subject: [PATCH] Switch to wx-config-gtk3.0 to avoid conflict with
+Subject: [PATCH] Switch to wx-config-gtk3 to avoid conflict with
  wxWidgets-gtk2
 
 ---
@@ -17,7 +17,7 @@ index 3cd5b828..57dbd384 100755
  
          ("use_syswx",      (False, "Try to use an installed wx rather than building the "
 -                                   "one in this source tree.  The wx-config in {prefix}/bin "
-+                                   "one in this source tree.  The wx-config-gtk3.0 in {prefix}/bin "
++                                   "one in this source tree.  The wx-config-gtk3 in {prefix}/bin "
                                     "or the first found on the PATH determines which wx is "
                                     "used.  Implies --no_magic.")),
          ("force_config",   (False, "Run configure when building even if the script "
@@ -26,7 +26,7 @@ index 3cd5b828..57dbd384 100755
                               os.path.join(wxDir(), 'setup.h.in'),
                               os.path.join(wxDir(), 'version-script.in'),
 -                             os.path.join(wxDir(), 'wx-config.in'),
-+                             os.path.join(wxDir(), 'wx-config-gtk3.0.in'),
++                             os.path.join(wxDir(), 'wx-config-gtk3.in'),
                               ]
              for dep in dependencies:
                  if newer(dep, os.path.join(BUILD_DIR, "Makefile")):
@@ -35,15 +35,15 @@ index 3cd5b828..57dbd384 100755
  
      if not isWindows:
 -        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config')
-+        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3.0')
++        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3')
          if options.use_syswx:
 -            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config')
-+            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3.0')
++            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3')
              if options.prefix and os.path.exists(wxcfg):
                  WX_CONFIG = wxcfg
              else:
 -                WX_CONFIG = 'wx-config' # hope it is on the PATH
-+                WX_CONFIG = 'wx-config-gtk3.0' # hope it is on the PATH
++                WX_CONFIG = 'wx-config-gtk3' # hope it is on the PATH
  
  
      wafBuildBase = wafBuildDir = getWafBuildBase()
diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index b38d04c067f..2aa7117d5e0 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -1,7 +1,7 @@
 # Template file for 'wxPython4'
 pkgname=wxPython4
 version=4.0.6
-revision=1
+revision=2
 wrksrc="wxPython-${version}"
 build_style=python3-module
 pycompile_module="wx"
@@ -19,7 +19,6 @@ distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz"
 checksum=35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python3"
 	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}"
 fi
 
@@ -33,9 +32,10 @@ pre_build() {
 		LDSHARED="${CC} -shared $LDFLAGS"
 		env CC="$CC" LDSHARED="$LDSHARED" \
 			PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
-			LDFLAGS="$LDFLAGS" python3 build.py --use_syswx
+			PYTHON_CONFIG="${XBPS_CROSS_BASE}/bin/python3-config" \
+			LDFLAGS="$LDFLAGS" python3 build.py build_py --use_syswx
 	else
-		python3 build.py --use_syswx
+		python3 build.py build_py --use_syswx
 	fi
 }
 

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

* Re: [PR PATCH] [Updated] wxPython4: actually build core library
  2019-10-08 17:58 [PR PATCH] wxPython4: actually build core library voidlinux-github
                   ` (3 preceding siblings ...)
  2019-10-14  0:43 ` voidlinux-github
@ 2019-10-14  0:43 ` voidlinux-github
  2019-10-14  3:38 ` voidlinux-github
  2019-10-15 19:45 ` [PR PATCH] [Merged]: " voidlinux-github
  6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-10-14  0:43 UTC (permalink / raw)
  To: ml


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

There is an updated pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages wxPython_fix_core
https://github.com/void-linux/void-packages/pull/15263

wxPython4: actually build core library


A patch file from https://github.com/void-linux/void-packages/pull/15263.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wxPython_fix_core-15263.patch --]
[-- Type: text/x-diff, Size: 4371 bytes --]

From 9161db26f54d3ad6a441434909ed0b1f99f0e16b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 8 Oct 2019 12:57:45 -0500
Subject: [PATCH] wxPython4: actually build core library

---
 ...-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch | 12 ++++++------
 srcpkgs/wxPython4/template                           |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
index 47606caa474..f741a968864 100644
--- a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
+++ b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
@@ -1,7 +1,7 @@
 From cddbe3b3b237b8e63abd8921fdb20314c20c2c08 Mon Sep 17 00:00:00 2001
 From: Jasper Chan <jasperchan515@gmail.com>
 Date: Sat, 22 Sep 2018 20:59:29 -0700
-Subject: [PATCH] Switch to wx-config-gtk3.0 to avoid conflict with
+Subject: [PATCH] Switch to wx-config-gtk3 to avoid conflict with
  wxWidgets-gtk2
 
 ---
@@ -17,7 +17,7 @@ index 3cd5b828..57dbd384 100755
  
          ("use_syswx",      (False, "Try to use an installed wx rather than building the "
 -                                   "one in this source tree.  The wx-config in {prefix}/bin "
-+                                   "one in this source tree.  The wx-config-gtk3.0 in {prefix}/bin "
++                                   "one in this source tree.  The wx-config-gtk3 in {prefix}/bin "
                                     "or the first found on the PATH determines which wx is "
                                     "used.  Implies --no_magic.")),
          ("force_config",   (False, "Run configure when building even if the script "
@@ -26,7 +26,7 @@ index 3cd5b828..57dbd384 100755
                               os.path.join(wxDir(), 'setup.h.in'),
                               os.path.join(wxDir(), 'version-script.in'),
 -                             os.path.join(wxDir(), 'wx-config.in'),
-+                             os.path.join(wxDir(), 'wx-config-gtk3.0.in'),
++                             os.path.join(wxDir(), 'wx-config-gtk3.in'),
                               ]
              for dep in dependencies:
                  if newer(dep, os.path.join(BUILD_DIR, "Makefile")):
@@ -35,15 +35,15 @@ index 3cd5b828..57dbd384 100755
  
      if not isWindows:
 -        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config')
-+        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3.0')
++        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3')
          if options.use_syswx:
 -            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config')
-+            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3.0')
++            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3')
              if options.prefix and os.path.exists(wxcfg):
                  WX_CONFIG = wxcfg
              else:
 -                WX_CONFIG = 'wx-config' # hope it is on the PATH
-+                WX_CONFIG = 'wx-config-gtk3.0' # hope it is on the PATH
++                WX_CONFIG = 'wx-config-gtk3' # hope it is on the PATH
  
  
      wafBuildBase = wafBuildDir = getWafBuildBase()
diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index b38d04c067f..2aa7117d5e0 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -1,7 +1,7 @@
 # Template file for 'wxPython4'
 pkgname=wxPython4
 version=4.0.6
-revision=1
+revision=2
 wrksrc="wxPython-${version}"
 build_style=python3-module
 pycompile_module="wx"
@@ -19,7 +19,6 @@ distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz"
 checksum=35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python3"
 	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}"
 fi
 
@@ -33,9 +32,10 @@ pre_build() {
 		LDSHARED="${CC} -shared $LDFLAGS"
 		env CC="$CC" LDSHARED="$LDSHARED" \
 			PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
-			LDFLAGS="$LDFLAGS" python3 build.py --use_syswx
+			PYTHON_CONFIG="${XBPS_CROSS_BASE}/bin/python3-config" \
+			LDFLAGS="$LDFLAGS" python3 build.py build_py --use_syswx
 	else
-		python3 build.py --use_syswx
+		python3 build.py build_py --use_syswx
 	fi
 }
 

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

* Re: [PR PATCH] [Updated] wxPython4: actually build core library
  2019-10-08 17:58 [PR PATCH] wxPython4: actually build core library voidlinux-github
                   ` (2 preceding siblings ...)
  2019-10-09  2:38 ` voidlinux-github
@ 2019-10-14  0:43 ` voidlinux-github
  2019-10-14  0:43 ` voidlinux-github
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-10-14  0:43 UTC (permalink / raw)
  To: ml


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

There is an updated pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages wxPython_fix_core
https://github.com/void-linux/void-packages/pull/15263

wxPython4: actually build core library


A patch file from https://github.com/void-linux/void-packages/pull/15263.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wxPython_fix_core-15263.patch --]
[-- Type: text/x-diff, Size: 4371 bytes --]

From 9161db26f54d3ad6a441434909ed0b1f99f0e16b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 8 Oct 2019 12:57:45 -0500
Subject: [PATCH] wxPython4: actually build core library

---
 ...-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch | 12 ++++++------
 srcpkgs/wxPython4/template                           |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
index 47606caa474..f741a968864 100644
--- a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
+++ b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
@@ -1,7 +1,7 @@
 From cddbe3b3b237b8e63abd8921fdb20314c20c2c08 Mon Sep 17 00:00:00 2001
 From: Jasper Chan <jasperchan515@gmail.com>
 Date: Sat, 22 Sep 2018 20:59:29 -0700
-Subject: [PATCH] Switch to wx-config-gtk3.0 to avoid conflict with
+Subject: [PATCH] Switch to wx-config-gtk3 to avoid conflict with
  wxWidgets-gtk2
 
 ---
@@ -17,7 +17,7 @@ index 3cd5b828..57dbd384 100755
  
          ("use_syswx",      (False, "Try to use an installed wx rather than building the "
 -                                   "one in this source tree.  The wx-config in {prefix}/bin "
-+                                   "one in this source tree.  The wx-config-gtk3.0 in {prefix}/bin "
++                                   "one in this source tree.  The wx-config-gtk3 in {prefix}/bin "
                                     "or the first found on the PATH determines which wx is "
                                     "used.  Implies --no_magic.")),
          ("force_config",   (False, "Run configure when building even if the script "
@@ -26,7 +26,7 @@ index 3cd5b828..57dbd384 100755
                               os.path.join(wxDir(), 'setup.h.in'),
                               os.path.join(wxDir(), 'version-script.in'),
 -                             os.path.join(wxDir(), 'wx-config.in'),
-+                             os.path.join(wxDir(), 'wx-config-gtk3.0.in'),
++                             os.path.join(wxDir(), 'wx-config-gtk3.in'),
                               ]
              for dep in dependencies:
                  if newer(dep, os.path.join(BUILD_DIR, "Makefile")):
@@ -35,15 +35,15 @@ index 3cd5b828..57dbd384 100755
  
      if not isWindows:
 -        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config')
-+        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3.0')
++        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3')
          if options.use_syswx:
 -            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config')
-+            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3.0')
++            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3')
              if options.prefix and os.path.exists(wxcfg):
                  WX_CONFIG = wxcfg
              else:
 -                WX_CONFIG = 'wx-config' # hope it is on the PATH
-+                WX_CONFIG = 'wx-config-gtk3.0' # hope it is on the PATH
++                WX_CONFIG = 'wx-config-gtk3' # hope it is on the PATH
  
  
      wafBuildBase = wafBuildDir = getWafBuildBase()
diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index b38d04c067f..2aa7117d5e0 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -1,7 +1,7 @@
 # Template file for 'wxPython4'
 pkgname=wxPython4
 version=4.0.6
-revision=1
+revision=2
 wrksrc="wxPython-${version}"
 build_style=python3-module
 pycompile_module="wx"
@@ -19,7 +19,6 @@ distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz"
 checksum=35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python3"
 	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}"
 fi
 
@@ -33,9 +32,10 @@ pre_build() {
 		LDSHARED="${CC} -shared $LDFLAGS"
 		env CC="$CC" LDSHARED="$LDSHARED" \
 			PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
-			LDFLAGS="$LDFLAGS" python3 build.py --use_syswx
+			PYTHON_CONFIG="${XBPS_CROSS_BASE}/bin/python3-config" \
+			LDFLAGS="$LDFLAGS" python3 build.py build_py --use_syswx
 	else
-		python3 build.py --use_syswx
+		python3 build.py build_py --use_syswx
 	fi
 }
 

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

* Re: wxPython4: actually build core library
  2019-10-08 17:58 [PR PATCH] wxPython4: actually build core library voidlinux-github
                   ` (4 preceding siblings ...)
  2019-10-14  0:43 ` voidlinux-github
@ 2019-10-14  3:38 ` voidlinux-github
  2019-10-15 19:45 ` [PR PATCH] [Merged]: " voidlinux-github
  6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-10-14  3:38 UTC (permalink / raw)
  To: ml


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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/15263#issuecomment-541493555

Comment:
I swear it all builds, Travis is just stupid.

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

* Re: [PR PATCH] [Merged]: wxPython4: actually build core library
  2019-10-08 17:58 [PR PATCH] wxPython4: actually build core library voidlinux-github
                   ` (5 preceding siblings ...)
  2019-10-14  3:38 ` voidlinux-github
@ 2019-10-15 19:45 ` voidlinux-github
  6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-10-15 19:45 UTC (permalink / raw)
  To: ml


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

There's a merged pull request on the void-packages repository

wxPython4: actually build core library
https://github.com/void-linux/void-packages/pull/15263

Description:


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

end of thread, back to index

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-08 17:58 [PR PATCH] wxPython4: actually build core library voidlinux-github
2019-10-08 18:30 ` voidlinux-github
2019-10-09  2:38 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-09  2:38 ` voidlinux-github
2019-10-14  0:43 ` voidlinux-github
2019-10-14  0:43 ` voidlinux-github
2019-10-14  3:38 ` voidlinux-github
2019-10-15 19:45 ` [PR PATCH] [Merged]: " voidlinux-github

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git