[arch-commits] Commit in python-wxpython/repos/community-x86_64 (4 files)
Filipe Laíns
ffy00 at archlinux.org
Tue Sep 4 13:49:50 UTC 2018
Date: Tuesday, September 4, 2018 @ 13:49:50
Author: ffy00
Revision: 376672
archrelease: copy trunk to community-x86_64
Added:
python-wxpython/repos/community-x86_64/PKGBUILD
(from rev 376671, python-wxpython/trunk/PKGBUILD)
python-wxpython/repos/community-x86_64/use-waf-2.0.8.patch
(from rev 376671, python-wxpython/trunk/use-waf-2.0.8.patch)
Deleted:
python-wxpython/repos/community-x86_64/PKGBUILD
python-wxpython/repos/community-x86_64/use-waf-2.0.8.patch
---------------------+
PKGBUILD | 93 ++++++++++++-----------
use-waf-2.0.8.patch | 202 +++++++++++++++++++++++++-------------------------
2 files changed, 150 insertions(+), 145 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-09-04 13:48:20 UTC (rev 376671)
+++ PKGBUILD 2018-09-04 13:49:50 UTC (rev 376672)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=python-wxpython
-_pkgname=wxPython
-pkgver=4.0.3
-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' 'python-pypubsub')
-source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-${pkgver}.tar.gz")
-sha512sums=('911dd98d15b0cbc2551f1b22a21fdae4450656ca59cc93216b7c6a8a00e399b929b78484637992d78cecffb098b8d8dc408c24795549827e2f90ce42740c3bf9')
-
-build() {
- cd $_pkgname-$pkgver
-
- python setup.py build
-}
-
-check() {
- cd $_pkgname-$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 $_pkgname-$pkgver
-
- python3 setup.py install --root="$pkgdir" --skip-build --optimize=1
-
- install -Dm 644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
- find "$pkgdir/usr/lib" -type f | xargs chmod 644
-}
Copied: python-wxpython/repos/community-x86_64/PKGBUILD (from rev 376671, python-wxpython/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-09-04 13:49:50 UTC (rev 376672)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=python-wxpython
+_pkgname=wxPython
+pkgver=4.0.3
+pkgrel=4
+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' 'python-pypubsub')
+source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-${pkgver}.tar.gz")
+sha512sums=('911dd98d15b0cbc2551f1b22a21fdae4450656ca59cc93216b7c6a8a00e399b929b78484637992d78cecffb098b8d8dc408c24795549827e2f90ce42740c3bf9')
+
+prepare() {
+ sed -i "s|WX_CONFIG = 'wx-config'|WX_CONFIG = 'wx-config-gtk3'|" $_pkgname-$pkgver/build.py
+}
+
+build() {
+ cd $_pkgname-$pkgver
+
+ python build.py build --use_syswx --release -v
+}
+
+check() {
+ cd $_pkgname-$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'
+ xvfb-run python build.py test
+}
+
+package() {
+ cd $_pkgname-$pkgver
+
+ python build.py install --destdir="$pkgdir"
+
+ install -Dm 644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+ find "$pkgdir/usr/lib" -type f | xargs chmod 644
+}
Deleted: use-waf-2.0.8.patch
===================================================================
--- use-waf-2.0.8.patch 2018-09-04 13:48:20 UTC (rev 376671)
+++ use-waf-2.0.8.patch 2018-09-04 13:49:50 UTC (rev 376672)
@@ -1,101 +0,0 @@
-From 1eb0f5aad704c07de45e5092dde04c8051e421ae Mon Sep 17 00:00:00 2001
-From: Robin Dunn <robin at 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 <eschwartz at 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
-
Copied: python-wxpython/repos/community-x86_64/use-waf-2.0.8.patch (from rev 376671, python-wxpython/trunk/use-waf-2.0.8.patch)
===================================================================
--- use-waf-2.0.8.patch (rev 0)
+++ use-waf-2.0.8.patch 2018-09-04 13:49:50 UTC (rev 376672)
@@ -0,0 +1,101 @@
+From 1eb0f5aad704c07de45e5092dde04c8051e421ae Mon Sep 17 00:00:00 2001
+From: Robin Dunn <robin at 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 <eschwartz at 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
+
More information about the arch-commits
mailing list