wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

wxPython4: actually build core library

Browse source
This commit is contained in:
Andrew Benson 2019-10-08 12:57:45 -05:00 • committed by Helmut Pozimski
parent 01d0303d6a
commit 4b09f8e7a4
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
View file

@ -1,7 +1,7 @@
From cddbe3b3b237b8e63abd8921fdb20314c20c2c08 Mon Sep 17 00:00:00 2001 From cddbe3b3b237b8e63abd8921fdb20314c20c2c08 Mon Sep 17 00:00:00 2001
From: Jasper Chan <jasperchan515@gmail.com> From: Jasper Chan <jasperchan515@gmail.com>
Date: Sat, 22 Sep 2018 20:59:29 -0700 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 wxWidgets-gtk2
--- ---
@ -17,7 +17,7 @@ index 3cd5b828..57dbd384 100755
("use_syswx", (False, "Try to use an installed wx rather than building the " ("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 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 " "or the first found on the PATH determines which wx is "
"used. Implies --no_magic.")), "used. Implies --no_magic.")),
("force_config", (False, "Run configure when building even if the script " ("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(), 'setup.h.in'),
os.path.join(wxDir(), 'version-script.in'), os.path.join(wxDir(), 'version-script.in'),
- os.path.join(wxDir(), 'wx-config.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: for dep in dependencies:
if newer(dep, os.path.join(BUILD_DIR, "Makefile")): if newer(dep, os.path.join(BUILD_DIR, "Makefile")):
@ -35,15 +35,15 @@ index 3cd5b828..57dbd384 100755
if not isWindows: if not isWindows:
- WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config') - 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: if options.use_syswx:
- wxcfg = posixjoin(options.prefix, 'bin', 'wx-config') - 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): if options.prefix and os.path.exists(wxcfg):
WX_CONFIG = wxcfg WX_CONFIG = wxcfg
else: else:
- WX_CONFIG = 'wx-config' # hope it is on the PATH - 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() wafBuildBase = wafBuildDir = getWafBuildBase()

8
srcpkgs/wxPython4/template
View file

@ -1,7 +1,7 @@
# Template file for 'wxPython4' # Template file for 'wxPython4'
pkgname=wxPython4 pkgname=wxPython4
version=4.0.6 version=4.0.6
revision=1 revision=2
wrksrc="wxPython-${version}" wrksrc="wxPython-${version}"
build_style=python3-module build_style=python3-module
pycompile_module="wx" pycompile_module="wx"
@ -19,7 +19,6 @@ distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz"
checksum=35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37 checksum=35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3"
CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}" CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}"
fi fi
@ -33,9 +32,10 @@ pre_build() {
LDSHARED="${CC} -shared $LDFLAGS" LDSHARED="${CC} -shared $LDFLAGS"
env CC="$CC" LDSHARED="$LDSHARED" \ env CC="$CC" LDSHARED="$LDSHARED" \
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ 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 else
python3 build.py --use_syswx python3 build.py build_py --use_syswx
fi fi
} }