Date: Thursday, July 26, 2018 @ 22:53:08 Author: eschwartz Revision: 363658
archrelease: copy trunk to community-staging-x86_64 Added: python-wxpython/repos/community-staging-x86_64/ python-wxpython/repos/community-staging-x86_64/PKGBUILD (from rev 363657, python-wxpython/trunk/PKGBUILD) python-wxpython/repos/community-staging-x86_64/use-waf-2.0.8.patch (from rev 363657, python-wxpython/trunk/use-waf-2.0.8.patch) ---------------------+ PKGBUILD | 53 ++++++++++++++++++++++++++ use-waf-2.0.8.patch | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+) Copied: python-wxpython/repos/community-staging-x86_64/PKGBUILD (from rev 363657, python-wxpython/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2018-07-26 22:53:08 UTC (rev 363658) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Eric BĂ©langer <e...@archlinux.org> + +pkgname=python-wxpython +pkgver=4.0.1 +pkgrel=3 +pkgdesc="Phoenix wxWidgets GUI toolkit for Python" +arch=('x86_64') +license=('custom:wxWindows') +url="https://www.wxpython.org" +depends=('wxgtk3' 'python-setuptools' 'python-six') +makedepends=('mesa' 'glu' 'webkit2gtk') +checkdepends=('xorg-server-xvfb' 'python-pytest' 'python-numpy') +source=("https://github.com/wxWidgets/Phoenix/releases/download/wxPython-${pkgver}/wxPython-${pkgver}.tar.gz") +source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-${pkgver}.tar.gz" + "use-waf-2.0.8.patch" + "https://wxpython.org/Phoenix/tools/waf-2.0.8.bz2") +sha256sums=('f8f2ac1a75368b9b103259addc77f4e3dfe729c6d70aa1fd0b7e9c5b6075c710' + 'e88c92a4ad7fa8e692ffd816dc20b897c4e5b7fc60dd167226298b3b14280f66' + '6cf9cc2a7d96aa6389de0e2636b31dbc8b508f18ef9ba278199c2b048003f384') + +prepare() { + cd wxPython-${pkgver} + + # use python 3.7 compatible waf + patch -p1 -i ../use-waf-2.0.8.patch + ln -sf "${srcdir}/waf-2.0.8" bin/ +} + +build() { + cd wxPython-${pkgver} + python3 setup.py build +} + +check() { + cd wxPython-${pkgver} + + pythonpaths=("$PWD"/build/lib.linux-$CARCH-3*) + + # test_vlbox.py:test_vlbox4 hangs + # test_utils.py:test_utilsSomeOtherStuff segfaults but only when run with all other tests... + # still failures but the package works... + PYTHONPATH="${pythonpaths[0]}" xvfb-run python -m pytest unittests/ -k 'not test_utilsSomeOtherStuff and not test_vlbox4 \ + and not test_webview1 and not test_webview2 and not test_webview3' || warning "tests failed" + PYTHONPATH="${pythonpaths[0]}" xvfb-run python -m pytest unittests/test_utils.py -k 'test_utilsSomeOtherStuff' +} + +package() { + cd wxPython-${pkgver} + python3 setup.py install --root="${pkgdir}" --optimize=1 + install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.txt + find "$pkgdir/usr/lib" -type f | xargs chmod 644 +} Copied: python-wxpython/repos/community-staging-x86_64/use-waf-2.0.8.patch (from rev 363657, python-wxpython/trunk/use-waf-2.0.8.patch) =================================================================== --- community-staging-x86_64/use-waf-2.0.8.patch (rev 0) +++ community-staging-x86_64/use-waf-2.0.8.patch 2018-07-26 22:53:08 UTC (rev 363658) @@ -0,0 +1,101 @@ +From 1eb0f5aad704c07de45e5092dde04c8051e421ae Mon Sep 17 00:00:00 2001 +From: Robin Dunn <ro...@alldunn.com> +Date: Sat, 5 May 2018 21:03:30 -0700 +Subject: [PATCH 1/2] Update waf to version 2.0.7 + +--- + build.py | 4 ++-- + wscript | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/build.py b/build.py +index 41ed39ac..a56d3e22 100755 +--- a/build.py ++++ b/build.py +@@ -83,8 +83,8 @@ sipMD5 = { + 'linux64' : 'b349127a4d46452936e4181d96b12c2d', + } + +-wafCurrentVersion = '1.7.15-p1' +-wafMD5 = 'e44003373c965f4221bbdc4c9b846128' ++wafCurrentVersion = '2.0.7' ++wafMD5 = '48ac1250bcccd0674cf461937875ce9a' + + doxygenCurrentVersion = '1.8.8' + doxygenMD5 = { +diff --git a/wscript b/wscript +index d051ebbc..c4bc96fd 100644 +--- a/wscript ++++ b/wscript +@@ -30,7 +30,7 @@ def options(opt): + if isWindows: + opt.load('msvc') + else: +- opt.load('compiler_cc compiler_cxx') ++ opt.load('compiler_c compiler_cxx') + opt.load('python') + + opt.add_option('--debug', dest='debug', action='store_true', default=False, +@@ -78,7 +78,7 @@ def configure(conf): + conf.env['MSVC_TARGETS'] = [conf.options.msvc_arch] + conf.load('msvc') + else: +- conf.load('compiler_cc compiler_cxx') ++ conf.load('compiler_c compiler_cxx') + + if conf.options.python: + conf.env.PYTHON = conf.options.python +-- +2.18.0 + + +From bbcd9a029d42b5c66e122676bcdc8d7149415388 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwa...@archlinux.org> +Date: Thu, 26 Jul 2018 19:33:31 +0000 +Subject: [PATCH 2/2] Manually backport update waf to 2.0.8 + +- e0cde8741295d08b599f39f33a2a95eef5fd5b87 +- b910acaef120cce61508fc57eab07bb0286a29ec +- e1679ca2016a5160e12513e0c3c2d37030e431af +--- + build.py | 4 ++-- + wscript | 8 ++++++++ + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/build.py b/build.py +index a56d3e22..67aa813d 100755 +--- a/build.py ++++ b/build.py +@@ -83,8 +83,8 @@ sipMD5 = { + 'linux64' : 'b349127a4d46452936e4181d96b12c2d', + } + +-wafCurrentVersion = '2.0.7' +-wafMD5 = '48ac1250bcccd0674cf461937875ce9a' ++wafCurrentVersion = '2.0.8' ++wafMD5 = 'bc393f29337cd00aef25d54280ca22e1' + + doxygenCurrentVersion = '1.8.8' + doxygenMD5 = { +diff --git a/wscript b/wscript +index c4bc96fd..388749e8 100644 +--- a/wscript ++++ b/wscript +@@ -286,6 +286,14 @@ def configure(conf): + for key in flags: + _cleanFlags(conf, key) + ++ # Waf 2 is now calling pythonX.Y-config for fetching libs and flags, ++ # and it may be outputting flags that will cause an explicit link to ++ # Python's lib, which we don't want as that could tie us to that ++ # specific Python instance instead of the one that is loading the ++ # wxPython extension modules. That's okay for PYEMBED but not for PYEXT ++ # configs. ++ conf.env.LIBPATH_PYEXT = [] ++ conf.env.LIB_PYEXT = [] + + # Use the same compilers that wxWidgets used + if cfg.CC: +-- +2.18.0 +