diff options
| -rw-r--r-- | libre/python-pyqt5/PKGBUILD | 109 | ||||
| -rw-r--r-- | libre/python-pyqt5/opengles-hack.patch | 11 | ||||
| -rw-r--r-- | libre/python-pyqt5/pyqt-support-new-qt.patch | 12 | ||||
| -rw-r--r-- | libre/python-pyqt5/pyqt5-verbose-configure.patch | 15 |
4 files changed, 27 insertions, 120 deletions
diff --git a/libre/python-pyqt5/PKGBUILD b/libre/python-pyqt5/PKGBUILD index c54c9b630..ea327473c 100644 --- a/libre/python-pyqt5/PKGBUILD +++ b/libre/python-pyqt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 291120 2017-03-20 15:54:10Z arojas $ +# $Id$ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Yichao Yu <yyc1992@gmail.com> @@ -7,45 +7,32 @@ # Maintainer: André Silva <emulatorman@hyperbola.info> # Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info> -# Rationale: build without support for nonfree qt5-webengine. -# -# Differences between extra/pyqt5 and this: -# - We a apply opengles-hack.patch on ARM +# parabola changes and rationale: # - We don't list qt5-webengine as a dependency. The configure # script will pick up on it not being there, and automatically # disable that module. -# - We apply a patch to the configure to make it print which modules -# it decides to enable/disable, so the package maintainer can tell -# if something went wrong earlier. pkgbase=pyqt5 pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5') -pkgver=5.9.2 +pkgver=5.10 pkgrel=2.parabola1 -arch=('i686' 'x86_64' 'armv7h') +arch=('x86_64' 'i686' 'armv7h') 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-webkit' 'qt5-websockets' 'qt5-x11extras') -source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" - 'pyqt5-verbose-configure.patch' - 'opengles-hack.patch') -sha512sums=('5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc' - '139780a2a105605684e8e13b967b8bf8738e6ea0e7793179600c628a179695e4b05952da6d60e67ffac56857afdb08a976896e0ae25a9dbf40085b7fe39f9283' - '6be0458a53dc96919d2dfe7a3e932ac663e6e9ebcc2516809f8c53ad923566bf3f96f622ee52ee8a97bf1bea2fc72f78e60333daa6bb3555ff3ca8371141f2b7') + 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras' 'qt5-networkauth') +source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" pyqt-support-new-qt.patch) +sha512sums=('a86520870536618857ed3ee1601af45f5a0b456de192a5d6a3f8fa734e5cf49b8ce373928c0f4aeaae365d3fa95db03b5f59ae2903bc5eb2304b7edf22198033' + '5b4d03609dcc889c0cd3ca72b64295653130b63010c124b4fa32d7a8e7a11fe2d4a8eebee23eee89fac4e2220f64fe121c6de32154640a20d3611e61d3300ce1') prepare() { + # Support new versions of Qt - don't remove, needs to be reapplied after every new Qt release pushd PyQt5_gpl-$pkgver - - case "$CARCH" in - armv7h) patch -p1 -i ../opengles-hack.patch;; - esac - #patch -p1 -i ../pyqt5-verbose-configure.patch + # patch -p1 -i ../pyqt-support-new-qt.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 @@ -58,40 +45,6 @@ build() { --confirm-license \ --no-sip-files \ --qsci-api \ - --verbose \ - --enable QtBluetooth \ - --enable QtCore \ - --enable QtDBus \ - --enable QtDesigner \ - --enable QtGui \ - --enable QtHelp \ - --enable QtLocation \ - --enable QtMultimedia \ - --enable QtMultimediaWidgets \ - --enable QtNetwork \ - --enable QtNfc \ - --enable QtOpenGL \ - --enable QtPositioning \ - --enable QtPrintSupport \ - --enable QtQml \ - --enable QtQuick \ - --enable QtQuickWidgets \ - --enable QtSensors \ - --enable QtSerialPort \ - --enable QtSql \ - --enable QtSvg \ - --enable QtTest \ - --enable QtWebChannel \ - --enable QtWebKit \ - --enable QtWebKitWidgets \ - --enable QtWebSockets \ - --enable QtWidgets \ - --enable QtX11Extras \ - --enable QtXml \ - --enable QtXmlPatterns \ - --enable _QOpenGLFunctions_2_0 \ - --enable _QOpenGLFunctions_2_1 \ - --enable _QOpenGLFunctions_4_1_Core \ -q /usr/bin/qmake-qt5 # Thanks Gerardo for the rpath fix @@ -104,40 +57,6 @@ build() { --confirm-license \ --no-sip-files \ --qsci-api \ - --verbose \ - --enable QtBluetooth \ - --enable QtCore \ - --enable QtDBus \ - --enable QtDesigner \ - --enable QtGui \ - --enable QtHelp \ - --enable QtLocation \ - --enable QtMultimedia \ - --enable QtMultimediaWidgets \ - --enable QtNetwork \ - --enable QtNfc \ - --enable QtOpenGL \ - --enable QtPositioning \ - --enable QtPrintSupport \ - --enable QtQml \ - --enable QtQuick \ - --enable QtQuickWidgets \ - --enable QtSensors \ - --enable QtSerialPort \ - --enable QtSql \ - --enable QtSvg \ - --enable QtTest \ - --enable QtWebChannel \ - --enable QtWebKit \ - --enable QtWebKitWidgets \ - --enable QtWebSockets \ - --enable QtWidgets \ - --enable QtX11Extras \ - --enable QtXml \ - --enable QtXmlPatterns \ - --enable _QOpenGLFunctions_2_0 \ - --enable _QOpenGLFunctions_2_1 \ - --enable _QOpenGLFunctions_4_1_Core \ -q /usr/bin/qmake-qt5 # Thanks Gerardo for the rpath fix @@ -171,7 +90,8 @@ package_python-pyqt5(){ 'qt5-serialport: QtSerialPort' 'qt5-websockets: QtWebSockets' 'qt5-connectivity: QtNfc, QtBluetooth' - 'qt5-x11extras: QtX11Extras') + 'qt5-x11extras: QtX11Extras' + 'qt5-networkauth: QtNetworkAuth') cd PyQt5_gpl-$pkgver # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR @@ -183,7 +103,7 @@ package_python-pyqt5(){ package_python2-pyqt5(){ pkgdesc="A set of Python 2.x bindings for the Qt5 toolkit, without nonfree qt5-webengine support" - depends=('python2-sip' 'pyqt5-common') + depends=('python2-sip' 'pyqt5-common' 'python2-enum34') optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications' 'python-dbus: for python-dbus mainloop support' 'qt5-multimedia: QtMultimedia, QtMultimediaWidgets' @@ -195,7 +115,8 @@ package_python2-pyqt5(){ 'qt5-serialport: QtSerialPort' 'qt5-websockets: QtWebSockets' 'qt5-connectivity: QtNfc, QtBluetooth' - 'qt5-x11extras: QtX11Extras') + 'qt5-x11extras: QtX11Extras' + 'qt5-networkauth: QtNetworkAuth') cd PyQt5_gpl-$pkgver-py2 # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR diff --git a/libre/python-pyqt5/opengles-hack.patch b/libre/python-pyqt5/opengles-hack.patch deleted file mode 100644 index afadeb49b..000000000 --- a/libre/python-pyqt5/opengles-hack.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN a/configure.py b/configure.py ---- a/configure.py 2017-01-28 20:39:01.562407718 -0700 -+++ b/configure.py 2017-01-28 22:08:41.670433124 -0700 -@@ -688,6 +688,7 @@ - #elif defined(QT_OPENGL_ES_2) - out << "PyQt_Desktop_OpenGL\\n"; - #endif -+ out << "PyQt_Desktop_OpenGL\\n"; - - #if QT_VERSION < 0x050200 - // This is the test used in qglobal.h in Qt prior to v5.2. In v5.2 and later diff --git a/libre/python-pyqt5/pyqt-support-new-qt.patch b/libre/python-pyqt5/pyqt-support-new-qt.patch new file mode 100644 index 000000000..30ca0219d --- /dev/null +++ b/libre/python-pyqt5/pyqt-support-new-qt.patch @@ -0,0 +1,12 @@ +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 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3} ++%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 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_10_0} + + %Platforms {WS_X11 WS_WIN WS_MACX} + diff --git a/libre/python-pyqt5/pyqt5-verbose-configure.patch b/libre/python-pyqt5/pyqt5-verbose-configure.patch deleted file mode 100644 index 9ddcfd0ef..000000000 --- a/libre/python-pyqt5/pyqt5-verbose-configure.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure.py b/configure.py -index 94345c3..3d31a43 100644 ---- a/configure.py -+++ b/configure.py -@@ -2231,7 +2231,10 @@ int main(int, char **) - ''' % ('\n'.join(incfile), test) - - if compile_qt_program(target_config, verbose, 'cfgtest_' + mname, source, mname) is not None: -+ inform("Yes") - target_config.pyqt_modules.append(mname) -+ else: -+ inform("No") - - - def compile_qt_program(target_config, verbose, name, source, mname, debug=None): |