disable WebKitWidgets

3 files changed, 15 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 592092eef714..c1f999c6e9e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Nov 16 22:37:45 UTC 2017
+# Fri Nov 17 18:36:54 UTC 2017
 pkgbase = pyside2-git
 	pkgver = 2.0.0.r5325.ad14f649
 	pkgrel = 1
@@ -22,14 +22,13 @@ pkgbase = pyside2-git
 	makedepends = qt5-script
 	makedepends = qt5-speech
 	makedepends = qt5-svg
+	makedepends = qt5-datavis3d
 	makedepends = qt5-webchannel
 	makedepends = qt5-webengine
 	makedepends = qt5-webkit
 	makedepends = qt5-websockets
 	source = pyside2-git::git+https://code.qt.io/pyside/pyside-setup.git#branch=5.9
-	source = fix-module-name.patch
 	sha256sums = SKIP
-	sha256sums = b1a9e2d93b2fe130fb2f026777858a2474fefb8b55da5df9a59eac673304f5d5
 
 pkgname = pyside2-common-git
 	pkgdesc = LGPL Qt bindings for Python (Common Files)
@@ -47,6 +46,7 @@ pkgname = python2-pyside2-git
 	optdepends = qt5-script
 	optdepends = qt5-speech
 	optdepends = qt5-svg
+	optdepends = qt5-datavis3d
 	optdepends = qt5-webchannel
 	optdepends = qt5-webengine
 	optdepends = qt5-webkit
@@ -65,6 +65,7 @@ pkgname = python-pyside2-git
 	optdepends = qt5-script
 	optdepends = qt5-speech
 	optdepends = qt5-svg
+	optdepends = qt5-datavis3d
 	optdepends = qt5-webchannel
 	optdepends = qt5-webengine
 	optdepends = qt5-webkit
diff --git a/PKGBUILD b/PKGBUILD
index c22f05819fb7..0389b3907b43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,12 +16,10 @@ url="http://qt-project.org/wiki/PySide"
 makedepends=("python"{,2}"-shiboken2-git" 'cmake'
              'phonon-qt5' 'git' 'python2-sphinx' 'graphviz' 'qt5-base'
              'qt5-xmlpatterns' 'qt5-tools' 'qt5-multimedia' 'qt5-declarative'
-             'qt5-script' 'qt5-speech' 'qt5-svg' 'qt5-webchannel'
-             'qt5-webengine' 'qt5-webkit' 'qt5-websockets')
-source=("$pkgbase::git+https://code.qt.io/pyside/pyside-setup.git#branch=5.9"
-        "fix-module-name.patch")
-sha256sums=('SKIP'
-         'b1a9e2d93b2fe130fb2f026777858a2474fefb8b55da5df9a59eac673304f5d5')
+             'qt5-script' 'qt5-speech' 'qt5-svg' 'qt5-datavis3d'
+             'qt5-webchannel' 'qt5-webengine' 'qt5-webkit' 'qt5-websockets')
+source=("$pkgbase::git+https://code.qt.io/pyside/pyside-setup.git#branch=5.9")
+sha256sums=('SKIP')
 
 pkgver() {
     cd "$srcdir/$pkgbase"
@@ -29,8 +27,10 @@ pkgver() {
 }
 
 prepare() {
-    cd "$srcdir/$pkgbase"
-    #patch -Np1 -i "$srcdir/fix-module-name.patch"
+    cd "$srcdir"/$pkgbase/sources/pyside2
+
+    # WebKitWidgets fails
+    sed -i "s|WebKitWidgets WebSockets|WebSockets|g" CMakeLists.txt
 }
 
 build(){
@@ -44,7 +44,7 @@ build(){
         -DCMAKE_BUILD_TYPE=Release \
         -DUSE_PYTHON_VERSION=2 \
         -DBUILD_TESTS=OFF ..
-    make VERBOSE=1
+    make
 
     # Build for python3.
     cd "$srcdir"/$pkgbase/sources/pyside2
@@ -74,7 +74,7 @@ package_python-pyside2-git(){
     depends=('python' "python-shiboken2-git" "pyside2-common-git" "qt5-base")
     pkgdesc="LGPL Qt bindings for Python 3"
     optdepends=('qt5-xmlpatterns' 'qt5-tools' 'qt5-multimedia'
-                'qt5-declarative' 'qt5-script' 'qt5-speech' 'qt5-svg'
+                'qt5-declarative' 'qt5-script' 'qt5-speech' 'qt5-svg' 'qt5-datavis3d'
                 'qt5-webchannel' 'qt5-webengine' 'qt5-webkit' 'qt5-websockets')
 
     cd "$srcdir"/$pkgbase/sources/pyside2/build-py3
@@ -90,7 +90,7 @@ package_python2-pyside2-git(){
     depends=('python2' "python2-shiboken2-git" "pyside2-common-git" "qt5-base")
     pkgdesc="LGPL Qt bindings for Python 2"
     optdepends=('qt5-xmlpatterns' 'qt5-tools' 'qt5-multimedia'
-                'qt5-declarative' 'qt5-script' 'qt5-speech' 'qt5-svg'
+                'qt5-declarative' 'qt5-script' 'qt5-speech' 'qt5-svg' 'qt5-datavis3d'
                 'qt5-webchannel' 'qt5-webengine' 'qt5-webkit' 'qt5-websockets')
 
     cd "$srcdir"/$pkgbase/sources/pyside2/build-py2
diff --git a/fix-module-name.patch b/fix-module-name.patch
deleted file mode 100644
index ed52154adc01..000000000000
--- a/fix-module-name.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru pyside2-git/cmake/Macros/PySideModules.cmake pyside2-git.new/cmake/Macros/PySideModules.cmake
---- pyside2-git/cmake/Macros/PySideModules.cmake	2017-06-16 22:33:54.712099607 +0200
-+++ pyside2-git.new/cmake/Macros/PySideModules.cmake	2017-06-16 22:54:42.604343309 +0200
-@@ -101,7 +101,7 @@
-     add_library(${module_name} MODULE ${${module_sources}} ${${module_static_sources}})
-     set_target_properties(${module_name} PROPERTIES
-                           PREFIX ""
--                          OUTPUT_NAME "${module_name}${PYTHON_EXTENSION_SUFFIX}"
-+                          OUTPUT_NAME "${module_name}"
-                           LIBRARY_OUTPUT_DIRECTORY ${pyside2_BINARY_DIR})
-     if(WIN32)
-         set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd")