[arch-commits] Commit in pyqt5/repos (6 files)

Felix Yan felixonmars at archlinux.org
Mon Jan 23 11:12:17 UTC 2017


    Date: Monday, January 23, 2017 @ 11:12:16
  Author: felixonmars
Revision: 287193

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  pyqt5/repos/extra-i686/PKGBUILD
    (from rev 287192, pyqt5/trunk/PKGBUILD)
  pyqt5/repos/extra-x86_64/PKGBUILD
    (from rev 287192, pyqt5/trunk/PKGBUILD)
Deleted:
  pyqt5/repos/extra-i686/PKGBUILD
  pyqt5/repos/extra-i686/pyqt-qt5.7.1.patch
  pyqt5/repos/extra-x86_64/PKGBUILD
  pyqt5/repos/extra-x86_64/pyqt-qt5.7.1.patch

---------------------------------+
 /PKGBUILD                       |  226 ++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD             |  116 -------------------
 extra-i686/pyqt-qt5.7.1.patch   |   12 --
 extra-x86_64/PKGBUILD           |  116 -------------------
 extra-x86_64/pyqt-qt5.7.1.patch |   12 --
 5 files changed, 226 insertions(+), 256 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-01-23 11:11:30 UTC (rev 287192)
+++ extra-i686/PKGBUILD	2017-01-23 11:12:16 UTC (rev 287193)
@@ -1,116 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Yichao Yu <yyc1992 at gmail.com>
-# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
-# Contributor: riai <riai at bigfoot.com> Ben <ben at benmazer.net>
-
-pkgbase=pyqt5
-pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
-pkgver=5.7
-_pkgver=$pkgver
-pkgrel=3
-arch=('i686' 'x86_64')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-license=('GPL')
-makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl'
-             'python2-dbus' 'python-dbus' 'qt5-connectivity'
-             'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg'
-             'qt5-webengine' 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras')
-source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" pyqt-qt5.7.1.patch)
-md5sums=('e3dc21f31fd714659f0688e1eb31bacf'
-         '6f00ffd5def3ccb853c5e0d794f897b2')
-
-prepare() {
-  # The additional include path was removed due to this line, I don't really know why they are doing this...
-  sed -i '/target_config.dbus_inc_dirs = \[\]/d' PyQt5_gpl-${_pkgver}/configure.py
-  # support Qt 5.7.1
-  patch -p0 -i pyqt-qt5.7.1.patch
-
-  cp -a PyQt5_gpl-${_pkgver}{,-py2}
-}
-
-build() {
-  cd "$srcdir"/PyQt5_gpl-${_pkgver}
-  python configure.py \
-    --confirm-license \
-    --no-sip-files \
-    --qsci-api \
-    -q /usr/bin/qmake-qt5
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-
-  cd "$srcdir"/PyQt5_gpl-${_pkgver}-py2
-  python2 configure.py \
-    --confirm-license \
-    --no-sip-files \
-    --qsci-api \
-    -q /usr/bin/qmake-qt5
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-}
-
-package_pyqt5-common(){
-  pkgdesc="Common PyQt files shared between python-pyqt5 and python2-pyqt5"
-  depends=('qt5-base')
-
-  cd PyQt5_gpl-${_pkgver}
-  install -Dm644 PyQt5.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
-
-  install -d "${pkgdir}"/usr/share/sip/PyQt5
-  cp -a sip/* "${pkgdir}"/usr/share/sip/PyQt5
-}
-
-package_python-pyqt5(){
-  pkgdesc="A set of Python 3.x bindings for the Qt5 toolkit"
-  depends=('python-sip' 'pyqt5-common' 'python' 'python')
-  optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications'
-              'python-dbus: for python-dbus mainloop support'
-              'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
-              'qt5-tools: QtHelp, QtDesigner'
-              'qt5-svg: QtSvg'
-              'qt5-webkit: QtWebKit, QtWebKitWidgets'
-              'qt5-xmlpatterns: QtXmlPatterns'
-              'qt5-declarative: QtQml, qmlplugin'
-              'qt5-serialport: QtSerialPort')
-
-  cd PyQt5_gpl-${_pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Provided by pyqt-common
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
-}
-
-package_python2-pyqt5(){
-  pkgdesc="A set of Python 2.x bindings for the Qt5 toolkit"
-  depends=('python2-sip' 'pyqt5-common' 'python2')
-  optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications'
-              'python-dbus: for python-dbus mainloop support'
-              'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
-              'qt5-tools: QtHelp, QtDesigner'
-              'qt5-svg: QtSvg'
-              'qt5-webkit: QtWebKit, QtWebKitWidgets'
-              'qt5-xmlpatterns: QtXmlPatterns'
-              'qt5-declarative: QtQml, qmlplugin'
-              'qt5-serialport: QtSerialPort')
-
-  cd PyQt5_gpl-${_pkgver}-py2
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Fix conflicts with python-pyqt5
-  mv "${pkgdir}"/usr/bin/{,python2-}pyuic5
-  mv "${pkgdir}"/usr/bin/{,python2-}pylupdate5
-  mv "${pkgdir}"/usr/bin/{,python2-}pyrcc5
-
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpyqt5.so
-  rm "${pkgdir}"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
-}

Copied: pyqt5/repos/extra-i686/PKGBUILD (from rev 287192, pyqt5/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-01-23 11:12:16 UTC (rev 287193)
@@ -0,0 +1,113 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Yichao Yu <yyc1992 at gmail.com>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+# Contributor: riai <riai at bigfoot.com> Ben <ben at benmazer.net>
+
+pkgbase=pyqt5
+pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
+pkgver=5.7.1
+_pkgver=$pkgver
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro"
+license=('GPL')
+makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl'
+             'python2-dbus' 'python-dbus' 'qt5-connectivity'
+             'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg'
+             'qt5-webengine' 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras')
+source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz")
+md5sums=('b3171b67c74aa63a3cd2f386660c898b')
+
+prepare() {
+  # The additional include path was removed due to this line, I don't really know why they are doing this...
+  sed -i '/target_config.dbus_inc_dirs = \[\]/d' PyQt5_gpl-${_pkgver}/configure.py
+
+  cp -a PyQt5_gpl-${_pkgver}{,-py2}
+}
+
+build() {
+  cd "$srcdir"/PyQt5_gpl-${_pkgver}
+  python configure.py \
+    --confirm-license \
+    --no-sip-files \
+    --qsci-api \
+    -q /usr/bin/qmake-qt5
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+
+  cd "$srcdir"/PyQt5_gpl-${_pkgver}-py2
+  python2 configure.py \
+    --confirm-license \
+    --no-sip-files \
+    --qsci-api \
+    -q /usr/bin/qmake-qt5
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+}
+
+package_pyqt5-common(){
+  pkgdesc="Common PyQt files shared between python-pyqt5 and python2-pyqt5"
+  depends=('qt5-base')
+
+  cd PyQt5_gpl-${_pkgver}
+  install -Dm644 PyQt5.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+
+  install -d "${pkgdir}"/usr/share/sip/PyQt5
+  cp -a sip/* "${pkgdir}"/usr/share/sip/PyQt5
+}
+
+package_python-pyqt5(){
+  pkgdesc="A set of Python 3.x bindings for the Qt5 toolkit"
+  depends=('python-sip' 'pyqt5-common' 'python' 'python')
+  optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications'
+              'python-dbus: for python-dbus mainloop support'
+              'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
+              'qt5-tools: QtHelp, QtDesigner'
+              'qt5-svg: QtSvg'
+              'qt5-webkit: QtWebKit, QtWebKitWidgets'
+              'qt5-xmlpatterns: QtXmlPatterns'
+              'qt5-declarative: QtQml, qmlplugin'
+              'qt5-serialport: QtSerialPort')
+
+  cd PyQt5_gpl-${_pkgver}
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Provided by pyqt-common
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+}
+
+package_python2-pyqt5(){
+  pkgdesc="A set of Python 2.x bindings for the Qt5 toolkit"
+  depends=('python2-sip' 'pyqt5-common' 'python2')
+  optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications'
+              'python-dbus: for python-dbus mainloop support'
+              'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
+              'qt5-tools: QtHelp, QtDesigner'
+              'qt5-svg: QtSvg'
+              'qt5-webkit: QtWebKit, QtWebKitWidgets'
+              'qt5-xmlpatterns: QtXmlPatterns'
+              'qt5-declarative: QtQml, qmlplugin'
+              'qt5-serialport: QtSerialPort')
+
+  cd PyQt5_gpl-${_pkgver}-py2
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Fix conflicts with python-pyqt5
+  mv "${pkgdir}"/usr/bin/{,python2-}pyuic5
+  mv "${pkgdir}"/usr/bin/{,python2-}pylupdate5
+  mv "${pkgdir}"/usr/bin/{,python2-}pyrcc5
+
+  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpyqt5.so
+  rm "${pkgdir}"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+}

Deleted: extra-i686/pyqt-qt5.7.1.patch
===================================================================
--- extra-i686/pyqt-qt5.7.1.patch	2017-01-23 11:11:30 UTC (rev 287192)
+++ extra-i686/pyqt-qt5.7.1.patch	2017-01-23 11:12:16 UTC (rev 287193)
@@ -1,12 +0,0 @@
---- PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip	2016-12-24 12:39:12.725734296 +0000
-+++ PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip	2016-12-24 12:40:17.502273973 +0000
-@@ -22,7 +22,7 @@
- 
- %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1)
- 
--%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0}
-+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0 Qt_5_7_1}
- 
- %Platforms {WS_X11 WS_WIN WS_MACX}
- 
- 

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-01-23 11:11:30 UTC (rev 287192)
+++ extra-x86_64/PKGBUILD	2017-01-23 11:12:16 UTC (rev 287193)
@@ -1,116 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Yichao Yu <yyc1992 at gmail.com>
-# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
-# Contributor: riai <riai at bigfoot.com> Ben <ben at benmazer.net>
-
-pkgbase=pyqt5
-pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
-pkgver=5.7
-_pkgver=$pkgver
-pkgrel=3
-arch=('i686' 'x86_64')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-license=('GPL')
-makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl'
-             'python2-dbus' 'python-dbus' 'qt5-connectivity'
-             'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg'
-             'qt5-webengine' 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras')
-source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" pyqt-qt5.7.1.patch)
-md5sums=('e3dc21f31fd714659f0688e1eb31bacf'
-         '6f00ffd5def3ccb853c5e0d794f897b2')
-
-prepare() {
-  # The additional include path was removed due to this line, I don't really know why they are doing this...
-  sed -i '/target_config.dbus_inc_dirs = \[\]/d' PyQt5_gpl-${_pkgver}/configure.py
-  # support Qt 5.7.1
-  patch -p0 -i pyqt-qt5.7.1.patch
-
-  cp -a PyQt5_gpl-${_pkgver}{,-py2}
-}
-
-build() {
-  cd "$srcdir"/PyQt5_gpl-${_pkgver}
-  python configure.py \
-    --confirm-license \
-    --no-sip-files \
-    --qsci-api \
-    -q /usr/bin/qmake-qt5
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-
-  cd "$srcdir"/PyQt5_gpl-${_pkgver}-py2
-  python2 configure.py \
-    --confirm-license \
-    --no-sip-files \
-    --qsci-api \
-    -q /usr/bin/qmake-qt5
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-}
-
-package_pyqt5-common(){
-  pkgdesc="Common PyQt files shared between python-pyqt5 and python2-pyqt5"
-  depends=('qt5-base')
-
-  cd PyQt5_gpl-${_pkgver}
-  install -Dm644 PyQt5.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
-
-  install -d "${pkgdir}"/usr/share/sip/PyQt5
-  cp -a sip/* "${pkgdir}"/usr/share/sip/PyQt5
-}
-
-package_python-pyqt5(){
-  pkgdesc="A set of Python 3.x bindings for the Qt5 toolkit"
-  depends=('python-sip' 'pyqt5-common' 'python' 'python')
-  optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications'
-              'python-dbus: for python-dbus mainloop support'
-              'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
-              'qt5-tools: QtHelp, QtDesigner'
-              'qt5-svg: QtSvg'
-              'qt5-webkit: QtWebKit, QtWebKitWidgets'
-              'qt5-xmlpatterns: QtXmlPatterns'
-              'qt5-declarative: QtQml, qmlplugin'
-              'qt5-serialport: QtSerialPort')
-
-  cd PyQt5_gpl-${_pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Provided by pyqt-common
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
-}
-
-package_python2-pyqt5(){
-  pkgdesc="A set of Python 2.x bindings for the Qt5 toolkit"
-  depends=('python2-sip' 'pyqt5-common' 'python2')
-  optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications'
-              'python-dbus: for python-dbus mainloop support'
-              'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
-              'qt5-tools: QtHelp, QtDesigner'
-              'qt5-svg: QtSvg'
-              'qt5-webkit: QtWebKit, QtWebKitWidgets'
-              'qt5-xmlpatterns: QtXmlPatterns'
-              'qt5-declarative: QtQml, qmlplugin'
-              'qt5-serialport: QtSerialPort')
-
-  cd PyQt5_gpl-${_pkgver}-py2
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Fix conflicts with python-pyqt5
-  mv "${pkgdir}"/usr/bin/{,python2-}pyuic5
-  mv "${pkgdir}"/usr/bin/{,python2-}pylupdate5
-  mv "${pkgdir}"/usr/bin/{,python2-}pyrcc5
-
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpyqt5.so
-  rm "${pkgdir}"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
-}

Copied: pyqt5/repos/extra-x86_64/PKGBUILD (from rev 287192, pyqt5/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-01-23 11:12:16 UTC (rev 287193)
@@ -0,0 +1,113 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Yichao Yu <yyc1992 at gmail.com>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+# Contributor: riai <riai at bigfoot.com> Ben <ben at benmazer.net>
+
+pkgbase=pyqt5
+pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
+pkgver=5.7.1
+_pkgver=$pkgver
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro"
+license=('GPL')
+makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl'
+             'python2-dbus' 'python-dbus' 'qt5-connectivity'
+             'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg'
+             'qt5-webengine' 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras')
+source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz")
+md5sums=('b3171b67c74aa63a3cd2f386660c898b')
+
+prepare() {
+  # The additional include path was removed due to this line, I don't really know why they are doing this...
+  sed -i '/target_config.dbus_inc_dirs = \[\]/d' PyQt5_gpl-${_pkgver}/configure.py
+
+  cp -a PyQt5_gpl-${_pkgver}{,-py2}
+}
+
+build() {
+  cd "$srcdir"/PyQt5_gpl-${_pkgver}
+  python configure.py \
+    --confirm-license \
+    --no-sip-files \
+    --qsci-api \
+    -q /usr/bin/qmake-qt5
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+
+  cd "$srcdir"/PyQt5_gpl-${_pkgver}-py2
+  python2 configure.py \
+    --confirm-license \
+    --no-sip-files \
+    --qsci-api \
+    -q /usr/bin/qmake-qt5
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+}
+
+package_pyqt5-common(){
+  pkgdesc="Common PyQt files shared between python-pyqt5 and python2-pyqt5"
+  depends=('qt5-base')
+
+  cd PyQt5_gpl-${_pkgver}
+  install -Dm644 PyQt5.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+
+  install -d "${pkgdir}"/usr/share/sip/PyQt5
+  cp -a sip/* "${pkgdir}"/usr/share/sip/PyQt5
+}
+
+package_python-pyqt5(){
+  pkgdesc="A set of Python 3.x bindings for the Qt5 toolkit"
+  depends=('python-sip' 'pyqt5-common' 'python' 'python')
+  optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications'
+              'python-dbus: for python-dbus mainloop support'
+              'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
+              'qt5-tools: QtHelp, QtDesigner'
+              'qt5-svg: QtSvg'
+              'qt5-webkit: QtWebKit, QtWebKitWidgets'
+              'qt5-xmlpatterns: QtXmlPatterns'
+              'qt5-declarative: QtQml, qmlplugin'
+              'qt5-serialport: QtSerialPort')
+
+  cd PyQt5_gpl-${_pkgver}
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Provided by pyqt-common
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+}
+
+package_python2-pyqt5(){
+  pkgdesc="A set of Python 2.x bindings for the Qt5 toolkit"
+  depends=('python2-sip' 'pyqt5-common' 'python2')
+  optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications'
+              'python-dbus: for python-dbus mainloop support'
+              'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
+              'qt5-tools: QtHelp, QtDesigner'
+              'qt5-svg: QtSvg'
+              'qt5-webkit: QtWebKit, QtWebKitWidgets'
+              'qt5-xmlpatterns: QtXmlPatterns'
+              'qt5-declarative: QtQml, qmlplugin'
+              'qt5-serialport: QtSerialPort')
+
+  cd PyQt5_gpl-${_pkgver}-py2
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Fix conflicts with python-pyqt5
+  mv "${pkgdir}"/usr/bin/{,python2-}pyuic5
+  mv "${pkgdir}"/usr/bin/{,python2-}pylupdate5
+  mv "${pkgdir}"/usr/bin/{,python2-}pyrcc5
+
+  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpyqt5.so
+  rm "${pkgdir}"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+}

Deleted: extra-x86_64/pyqt-qt5.7.1.patch
===================================================================
--- extra-x86_64/pyqt-qt5.7.1.patch	2017-01-23 11:11:30 UTC (rev 287192)
+++ extra-x86_64/pyqt-qt5.7.1.patch	2017-01-23 11:12:16 UTC (rev 287193)
@@ -1,12 +0,0 @@
---- PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip	2016-12-24 12:39:12.725734296 +0000
-+++ PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip	2016-12-24 12:40:17.502273973 +0000
-@@ -22,7 +22,7 @@
- 
- %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1)
- 
--%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0}
-+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0 Qt_5_7_1}
- 
- %Platforms {WS_X11 WS_WIN WS_MACX}
- 
- 



More information about the arch-commits mailing list