Date: Tuesday, January 24, 2017 @ 14:59:56 Author: arojas Revision: 287381
archrelease: copy trunk to testing-i686, testing-x86_64 Added: pyqt5/repos/testing-i686/ pyqt5/repos/testing-i686/PKGBUILD (from rev 287380, pyqt5/trunk/PKGBUILD) pyqt5/repos/testing-i686/pyqt-qt5.8.patch (from rev 287380, pyqt5/trunk/pyqt-qt5.8.patch) pyqt5/repos/testing-i686/pyqt5-fix-check-license.patch (from rev 287380, pyqt5/trunk/pyqt5-fix-check-license.patch) pyqt5/repos/testing-x86_64/ pyqt5/repos/testing-x86_64/PKGBUILD (from rev 287380, pyqt5/trunk/PKGBUILD) pyqt5/repos/testing-x86_64/pyqt-qt5.8.patch (from rev 287380, pyqt5/trunk/pyqt-qt5.8.patch) pyqt5/repos/testing-x86_64/pyqt5-fix-check-license.patch (from rev 287380, pyqt5/trunk/pyqt5-fix-check-license.patch) ----------------------------------------------+ testing-i686/PKGBUILD | 122 +++++++++++++++++++++++++ testing-i686/pyqt-qt5.8.patch | 35 +++++++ testing-i686/pyqt5-fix-check-license.patch | 11 ++ testing-x86_64/PKGBUILD | 122 +++++++++++++++++++++++++ testing-x86_64/pyqt-qt5.8.patch | 35 +++++++ testing-x86_64/pyqt5-fix-check-license.patch | 11 ++ 6 files changed, 336 insertions(+) Copied: pyqt5/repos/testing-i686/PKGBUILD (from rev 287380, pyqt5/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2017-01-24 14:59:56 UTC (rev 287381) @@ -0,0 +1,122 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Yichao Yu <yyc1...@gmail.com> +# Contributor: Douglas Soares de Andrade <doug...@archlinux.org> +# Contributor: riai <r...@bigfoot.com> Ben <b...@benmazer.net> + +pkgbase=pyqt5 +pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5') +pkgver=5.7.1 +_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.8.patch pyqt5-fix-check-license.patch) +md5sums=('b3171b67c74aa63a3cd2f386660c898b' + '524f184f0e63aea952ba77702dff1356' + '1f57fb76747c5723dc4747fbbb376145') + +prepare() { + pushd PyQt5_gpl-${_pkgver} + # Support Qt 5.8 + patch -p1 -i ../pyqt-qt5.8.patch + # Hack to make the license check pass with Qt 5.8 + patch -p1 -i ../pyqt5-fix-check-license.patch + popd + + # 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 +} Copied: pyqt5/repos/testing-i686/pyqt-qt5.8.patch (from rev 287380, pyqt5/trunk/pyqt-qt5.8.patch) =================================================================== --- testing-i686/pyqt-qt5.8.patch (rev 0) +++ testing-i686/pyqt-qt5.8.patch 2017-01-24 14:59:56 UTC (rev 287381) @@ -0,0 +1,35 @@ +diff -ru a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip +--- a/sip/QtCore/qnamespace.sip 2016-12-25 18:56:11.000000000 +0100 ++++ b/sip/QtCore/qnamespace.sip 2017-01-24 12:22:19.025652899 +0100 +@@ -209,8 +209,6 @@ + WindowContextHelpButtonHint, + WindowShadeButtonHint, + WindowStaysOnTopHint, +- WindowOkButtonHint, +- WindowCancelButtonHint, + WindowStaysOnBottomHint, + WindowCloseButtonHint, + MacWindowToolBarButtonHint, +@@ -232,6 +230,10 @@ + %If (Qt_5_5_0 -) + MaximizeUsingFullscreenGeometryHint, + %End ++%If (- Qt_5_8_0) ++ WindowOkButtonHint, ++ WindowCancelButtonHint, ++%End + }; + + typedef QFlags<Qt::WindowType> WindowFlags; +diff -ru a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip +--- a/sip/QtCore/QtCoremod.sip 2016-12-25 18:56:11.000000000 +0100 ++++ b/sip/QtCore/QtCoremod.sip 2017-01-24 12:03:50.707514377 +0100 +@@ -22,7 +22,7 @@ + + %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True) + +-%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_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_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_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0} + + %Platforms {WS_X11 WS_WIN WS_MACX} + Copied: pyqt5/repos/testing-i686/pyqt5-fix-check-license.patch (from rev 287380, pyqt5/trunk/pyqt5-fix-check-license.patch) =================================================================== --- testing-i686/pyqt5-fix-check-license.patch (rev 0) +++ testing-i686/pyqt5-fix-check-license.patch 2017-01-24 14:59:56 UTC (rev 287381) @@ -0,0 +1,11 @@ +--- PyQt5_gpl-5.7.1/configure.py.orig 2017-01-23 20:42:47.791266791 +0100 ++++ PyQt5_gpl-5.7.1/configure.py 2017-01-23 20:43:02.754828184 +0100 +@@ -723,7 +723,7 @@ + lines = f.read().split('\n') + f.close() + +- self.qt_licensee = lines[0] ++ self.qt_licensee = 'Open Source' + self.qt_shared = (lines[1] == 'shared') + self.pyqt_disabled_features = lines[2:-1] + Copied: pyqt5/repos/testing-x86_64/PKGBUILD (from rev 287380, pyqt5/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2017-01-24 14:59:56 UTC (rev 287381) @@ -0,0 +1,122 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Yichao Yu <yyc1...@gmail.com> +# Contributor: Douglas Soares de Andrade <doug...@archlinux.org> +# Contributor: riai <r...@bigfoot.com> Ben <b...@benmazer.net> + +pkgbase=pyqt5 +pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5') +pkgver=5.7.1 +_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.8.patch pyqt5-fix-check-license.patch) +md5sums=('b3171b67c74aa63a3cd2f386660c898b' + '524f184f0e63aea952ba77702dff1356' + '1f57fb76747c5723dc4747fbbb376145') + +prepare() { + pushd PyQt5_gpl-${_pkgver} + # Support Qt 5.8 + patch -p1 -i ../pyqt-qt5.8.patch + # Hack to make the license check pass with Qt 5.8 + patch -p1 -i ../pyqt5-fix-check-license.patch + popd + + # 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 +} Copied: pyqt5/repos/testing-x86_64/pyqt-qt5.8.patch (from rev 287380, pyqt5/trunk/pyqt-qt5.8.patch) =================================================================== --- testing-x86_64/pyqt-qt5.8.patch (rev 0) +++ testing-x86_64/pyqt-qt5.8.patch 2017-01-24 14:59:56 UTC (rev 287381) @@ -0,0 +1,35 @@ +diff -ru a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip +--- a/sip/QtCore/qnamespace.sip 2016-12-25 18:56:11.000000000 +0100 ++++ b/sip/QtCore/qnamespace.sip 2017-01-24 12:22:19.025652899 +0100 +@@ -209,8 +209,6 @@ + WindowContextHelpButtonHint, + WindowShadeButtonHint, + WindowStaysOnTopHint, +- WindowOkButtonHint, +- WindowCancelButtonHint, + WindowStaysOnBottomHint, + WindowCloseButtonHint, + MacWindowToolBarButtonHint, +@@ -232,6 +230,10 @@ + %If (Qt_5_5_0 -) + MaximizeUsingFullscreenGeometryHint, + %End ++%If (- Qt_5_8_0) ++ WindowOkButtonHint, ++ WindowCancelButtonHint, ++%End + }; + + typedef QFlags<Qt::WindowType> WindowFlags; +diff -ru a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip +--- a/sip/QtCore/QtCoremod.sip 2016-12-25 18:56:11.000000000 +0100 ++++ b/sip/QtCore/QtCoremod.sip 2017-01-24 12:03:50.707514377 +0100 +@@ -22,7 +22,7 @@ + + %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True) + +-%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_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_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_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0} + + %Platforms {WS_X11 WS_WIN WS_MACX} + Copied: pyqt5/repos/testing-x86_64/pyqt5-fix-check-license.patch (from rev 287380, pyqt5/trunk/pyqt5-fix-check-license.patch) =================================================================== --- testing-x86_64/pyqt5-fix-check-license.patch (rev 0) +++ testing-x86_64/pyqt5-fix-check-license.patch 2017-01-24 14:59:56 UTC (rev 287381) @@ -0,0 +1,11 @@ +--- PyQt5_gpl-5.7.1/configure.py.orig 2017-01-23 20:42:47.791266791 +0100 ++++ PyQt5_gpl-5.7.1/configure.py 2017-01-23 20:43:02.754828184 +0100 +@@ -723,7 +723,7 @@ + lines = f.read().split('\n') + f.close() + +- self.qt_licensee = lines[0] ++ self.qt_licensee = 'Open Source' + self.qt_shared = (lines[1] == 'shared') + self.pyqt_disabled_features = lines[2:-1] +