diff options
| author | Markus Hovorka | 2017-03-02 16:42:31 +0100 |
|---|---|---|
| committer | Markus Hovorka | 2017-03-02 16:42:31 +0100 |
| commit | 92c5521d15b89c2f6b1c792dd7f2d31bcbc929a2 (patch) | |
| tree | 1cd1d2bbb008a2711b1bee172c6cfa037bf52191 | |
| parent | c82b806c7b19cde4d62fd6798c76d244ece44efe (diff) | |
| download | aur-92c5521d15b89c2f6b1c792dd7f2d31bcbc929a2.tar.gz | |
No longer disable qtwebengine (resolved upstream)
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | disable-qwebengine.patch | 28 |
3 files changed, 8 insertions, 41 deletions
@@ -1,6 +1,6 @@ pkgbase = python-pyside2-git - pkgver = 2.0.0.r2067.ccfa8440 - pkgrel = 1 + pkgver = 2.0.0.r2080.ab092d79 + pkgrel = 2 url = http://qt-project.org/wiki/PySide arch = i686 arch = x86_64 @@ -12,13 +12,11 @@ pkgbase = python-pyside2-git makedepends = python2-shiboken2-git makedepends = cmake makedepends = qt5.6-webkit - makedepends = phonon + makedepends = phonon-qt5 source = python-pyside2-git::git+https://code.qt.io/pyside/pyside.git source = sphinx-build2.patch - source = disable-qwebengine.patch md5sums = SKIP md5sums = 0431767d635147c638063c71a2a138b3 - md5sums = 8ce66a738fe9f9f87f7178e507b0d774 pkgname = pyside2-common-git pkgdesc = Provides LGPL Qt bindings for Python and related tools for binding generation (Common Files) @@ -7,20 +7,18 @@ pkgbase=python-pyside2-git pkgname=(pyside2-common-git python2-pyside2-git python-pyside2-git) -pkgver=2.0.0.r2067.ccfa8440 +pkgver=2.0.0.r2080.ab092d79 _upver=2.0.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL') url="http://qt-project.org/wiki/PySide" makedepends=('python' 'python2' "qt5.6" "python"{,2}"-shiboken2-git" - 'cmake' 'qt5.6-webkit' 'phonon') + 'cmake' 'qt5.6-webkit' 'phonon-qt5') source=("$pkgbase::git+https://code.qt.io/pyside/pyside.git" - "sphinx-build2.patch" - "disable-qwebengine.patch") + "sphinx-build2.patch") md5sums=('SKIP' - '0431767d635147c638063c71a2a138b3' - '8ce66a738fe9f9f87f7178e507b0d774') + '0431767d635147c638063c71a2a138b3') pkgver() { cd "$srcdir/$pkgbase" @@ -30,7 +28,6 @@ pkgver() { prepare() { cd "$srcdir/$pkgbase" patch -Np1 -i "$srcdir/sphinx-build2.patch" - patch -Np1 -i "$srcdir/disable-qwebengine.patch" } build(){ diff --git a/disable-qwebengine.patch b/disable-qwebengine.patch deleted file mode 100644 index a36b7c7f8aef..000000000000 --- a/disable-qwebengine.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 52bbbe23..a409efe7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -172,8 +172,8 @@ find_package(Qt5Quick) - find_package(Qt5Qml) - find_package(Qt5QuickWidgets) - find_package(Qt5WebChannel) --find_package(Qt5WebEngine) --find_package(Qt5WebEngineWidgets) -+#find_package(Qt5WebEngine) -+#find_package(Qt5WebEngineWidgets) - find_package(Qt5WebSockets) - - if(UNIX AND NOT APPLE) -diff --git a/PySide2/CMakeLists.txt b/PySide2/CMakeLists.txt -index 28f591d9..20e9ee44 100644 ---- a/PySide2/CMakeLists.txt -+++ b/PySide2/CMakeLists.txt -@@ -26,7 +26,7 @@ find_package(Qt5Qml) - find_package(Qt5Quick) - find_package(Qt5QuickWidgets) - find_package(Qt5WebChannel) --find_package(Qt5WebEngineWidgets) -+#find_package(Qt5WebEngineWidgets) - find_package(Qt5WebSockets) - - if(UNIX AND NOT APPLE) |