[arch-commits] Commit in python-wxpython/trunk (PKGBUILD unbundle-sip.patch)

[Balló György]

    Date: Tuesday, April 10, 2018 @ 09:58:03
  Author: bgyorgy
Revision: 315552

upgpkg: python-wxpython 4.0.1-2

Don't try to unbundle SIP, it doesn't work (FS#58156)

Modified:
  python-wxpython/trunk/PKGBUILD
Deleted:
  python-wxpython/trunk/unbundle-sip.patch

--------------------+
 PKGBUILD           |   19 ++++------------
 unbundle-sip.patch |   58 ---------------------------------------------------
 2 files changed, 5 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-10 09:57:26 UTC (rev 315551)
+++ PKGBUILD	2018-04-10 09:58:03 UTC (rev 315552)
@@ -3,25 +3,16 @@
 
 pkgname=python-wxpython
 pkgver=4.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Phoenix wxWidgets GUI toolkit for Python"
 arch=('x86_64')
 license=('custom:wxWindows')
 url="https://www.wxpython.org"
-depends=('wxgtk3' 'python-setuptools' 'python-sip' 'python-six')
-makedepends=('mesa' 'glu')
-source=("https://github.com/wxWidgets/Phoenix/releases/download/wxPython-${pkgver}/wxPython-${pkgver}.tar.gz"
-        "unbundle-sip.patch")
-sha256sums=('f8f2ac1a75368b9b103259addc77f4e3dfe729c6d70aa1fd0b7e9c5b6075c710'
-            '060badc5667993cd4120c8779f812d892d9a46816287b622af02756bb330cc9f')
+depends=('wxgtk3' 'python-setuptools' 'python-six')
+makedepends=('mesa' 'glu' 'webkit2gtk')
+source=("https://github.com/wxWidgets/Phoenix/releases/download/wxPython-${pkgver}/wxPython-${pkgver}.tar.gz")
+sha256sums=('f8f2ac1a75368b9b103259addc77f4e3dfe729c6d70aa1fd0b7e9c5b6075c710')
 
-prepare() {
-    cd wxPython-${pkgver}
-    patch -Np1 -i ../unbundle-sip.patch
-    find -name '*.py' | xargs sed -i 's/wx.siplib/sip/'
-    rm -rf sip
-}
-
 build() {
     cd wxPython-${pkgver}
     python3 setup.py build

Deleted: unbundle-sip.patch
===================================================================
--- unbundle-sip.patch	2018-04-10 09:57:26 UTC (rev 315551)
+++ unbundle-sip.patch	2018-04-10 09:58:03 UTC (rev 315552)
@@ -1,58 +0,0 @@
-diff --git a/wscript b/wscript
---- a/wscript
-+++ b/wscript
-@@ -95,8 +95,8 @@
-     conf.env.debug = conf.options.debug
-     conf.env.msvc_relwithdebug = conf.options.msvc_relwithdebug
- 
--    # Ensure that the headers in siplib and Phoenix's src dir can be found
--    conf.env.INCLUDES_WXPY = ['sip/siplib', 'src']
-+    # Ensure that the headers in Phoenix's src dir can be found
-+    conf.env.INCLUDES_WXPY = ['src']
- 
-     if isWindows:
-         # Windows/MSVC specific stuff
-@@ -505,26 +505,6 @@
-         copy_file(name, cfg.PKGDIR, update=1, verbose=1)
- 
- 
--    # Create the build tasks for each of our extension modules.
--    addRelwithdebugFlags(bld, 'siplib')
--    siplib = bld(
--        features = 'c cxx cshlib cxxshlib pyext',
--        target   = makeTargetName(bld, 'siplib'),
--        source   = ['sip/siplib/apiversions.c',
--                    'sip/siplib/array.c',
--                    'sip/siplib/bool.cpp',
--                    'sip/siplib/descriptors.c',
--                    'sip/siplib/int_convertors.c',
--                    'sip/siplib/objmap.c',
--                    'sip/siplib/qtlib.c',
--                    'sip/siplib/siplib.c',
--                    'sip/siplib/threads.c',
--                    'sip/siplib/voidptr.c',
--                    ],
--        uselib   = 'siplib WX WXPY',
--    )
--    makeExtCopyRule(bld, 'siplib')
--
-     # Add build rules for each of our ETG generated extension modules
-     makeETGRule(bld, 'etg/_core.py',       '_core',      'WX')
-     makeETGRule(bld, 'etg/_adv.py',        '_adv',       'WXADV')
-@@ -613,14 +593,14 @@
- 
- # Make extension module build rules using info gleaned from an ETG script
- def makeETGRule(bld, etgScript, moduleName, libFlags):
--    from buildtools.config   import loadETG, getEtgSipCppFiles
-+    from buildtools.config   import loadETG
- 
-     addRelwithdebugFlags(bld, moduleName)
-     rc = ['src/wxc.rc'] if isWindows else []
-     etg = loadETG(etgScript)
-     bld(features='c cxx cxxshlib pyext',
-         target=makeTargetName(bld, moduleName),
--        source=getEtgSipCppFiles(etg) + rc,
-+        source=rc,
-         uselib='{} {} WXPY'.format(moduleName, libFlags),
-         )
-     makeExtCopyRule(bld, moduleName)