[arch-commits] Commit in python-wxpython/trunk (PKGBUILD)

[Filipe Laíns]

    Date: Tuesday, September 4, 2018 @ 13:47:47
  Author: ffy00
Revision: 376669

Resolve conflicts with wxgtk3.

Fixes FS#59880

Modified:
  python-wxpython/trunk/PKGBUILD

----------+
 PKGBUILD |   35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-04 13:47:07 UTC (rev 376668)
+++ PKGBUILD	2018-09-04 13:47:47 UTC (rev 376669)
@@ -4,7 +4,7 @@
 pkgname=python-wxpython
 _pkgname=wxPython
 pkgver=4.0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Phoenix wxWidgets GUI toolkit for Python"
 arch=('x86_64')
 license=('custom:wxWindows')
@@ -15,30 +15,35 @@
 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
+  cd $_pkgname-$pkgver
 
-    python setup.py build
+  python build.py build --use_syswx --release -v
 }
 
 check() {
-    cd $_pkgname-$pkgver
+  cd $_pkgname-$pkgver
 
-    pythonpaths=("$PWD"/build/lib.linux-$CARCH-3*)
+#  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'
+  # 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
+  cd $_pkgname-$pkgver
 
-    python setup.py install --root="$pkgdir" --skip-build --optimize=1
+  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
+  install -Dm 644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+  find "$pkgdir/usr/lib" -type f | xargs chmod 644
 }