Github messages for voidlinux
 help / color / mirror / Atom feed
From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] wxPython4: actually build core library
Date: Mon, 14 Oct 2019 02:43:40 +0200	[thread overview]
Message-ID: <20191014004340.eI0I1AUOtm9YpOVfAT84RTSSZt_AydrckCeCNG-tNEY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-15263@inbox.vuxu.org>

[-- 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
 }
 

  parent reply	other threads:[~2019-10-14  0:43 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-08 17:58 [PR PATCH] " 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 [this message]
2019-10-14  3:38 ` voidlinux-github
2019-10-15 19:45 ` [PR PATCH] [Merged]: " voidlinux-github

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191014004340.eI0I1AUOtm9YpOVfAT84RTSSZt_AydrckCeCNG-tNEY@z \
    --to=voidlinux-github@inbox.vuxu.org \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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 NNTP newsgroup(s).