From dc6d1b672ff361abbdf2beb56b91ad1b2de32a67 Mon Sep 17 00:00:00 2001 From: Jasper Chan Date: Mon, 12 Nov 2018 19:36:55 -0800 Subject: [PATCH] New package: wxPython4-4.0.3 --- ...fig-gtk3.0-to-avoid-conflict-with-wx.patch | 52 +++++++++++++++++++ srcpkgs/wxPython4/template | 42 +++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch create mode 100644 srcpkgs/wxPython4/template 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 new file mode 100644 index 00000000000..47606caa474 --- /dev/null +++ b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch @@ -0,0 +1,52 @@ +From cddbe3b3b237b8e63abd8921fdb20314c20c2c08 Mon Sep 17 00:00:00 2001 +From: Jasper Chan +Date: Sat, 22 Sep 2018 20:59:29 -0700 +Subject: [PATCH] Switch to wx-config-gtk3.0 to avoid conflict with + wxWidgets-gtk2 + +--- + build.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git build.py build.py +index 3cd5b828..57dbd384 100755 +--- build.py ++++ build.py +@@ -400,7 +400,7 @@ def makeOptionParser(): + ("mac_arch", ("", "Comma separated list of architectures to build on Mac")), + + ("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 " + "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 " +@@ -1271,7 +1271,7 @@ def cmd_build_wx(options, args): + os.path.join(wxDir(), 'configure'), + 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'), + ] + for dep in dependencies: + if newer(dep, os.path.join(BUILD_DIR, "Makefile")): +@@ -1424,13 +1424,13 @@ def cmd_build_py(options, args): + os.environ['WXPYTHON_RELEASE'] = 'yes' + + if not isWindows: +- WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config') ++ WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3.0') + if options.use_syswx: +- wxcfg = posixjoin(options.prefix, 'bin', 'wx-config') ++ wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3.0') + 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 + + + wafBuildBase = wafBuildDir = getWafBuildBase() +-- +2.19.0 + diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template new file mode 100644 index 00000000000..e7ed872f7e4 --- /dev/null +++ b/srcpkgs/wxPython4/template @@ -0,0 +1,42 @@ +# Template file for 'wxPython4' +pkgname=wxPython4 +version=4.0.3 +revision=1 +wrksrc="${pkgname//4/}-${version}" +build_style=python3-module +hostmakedepends="pkg-config python3-setuptools" +makedepends="python3-devel wxWidgets-gtk3-devel SDL2-devel webkit2gtk-devel +gst-plugins-base1-devel" +depends="python3" +short_desc="The wxWidgets GUI toolkit library (Python3 Bindings)" +maintainer="Jasper Chan " +license="wxWindows" +homepage="http://www.wxpython.org/" +distfiles="${PYPI_SITE}/w/${pkgname//4/}/${pkgname//4}-${version}.tar.gz" +checksum=8d0dfc0146c24749ce00d575e35cc2826372e809d5bc4a57bde6c89031b59e75 +make_build_args="--skip-build" +make_install_args="--skip-build" + +if [ -n "${CROSS_BUILD}" ]; then + hostmakedepends+=" python3" + CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}" +fi + +pre_build() { + if [ -n "$CROSS_BUILD" ]; then + PYPREFIX="$XBPS_CROSS_BASE" + CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" + LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" + CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" + LDSHARED="${CC} -shared $LDFLAGS" + env CC="$CC" LDSHARED="$LDSHARED" \ + PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ + LDFLAGS="$LDFLAGS" python3 build.py --use_syswx + else + python3 build.py --use_syswx + fi +} + +post_install() { + vlicense LICENSE.txt LICENSE +}