diff options
| -rw-r--r-- | libre/pyqt5/PKGBUILD (renamed from libre/python-pyqt5/PKGBUILD) | 120 | ||||
| -rw-r--r-- | libre/pyqt5/opengles-hack.patch | 11 | ||||
| -rw-r--r-- | libre/pyqt5/pyqt5-verbose-configure.patch | 15 | ||||
| -rw-r--r-- | libre/python-pyqt5/pyqt-support-new-qt.patch | 12 |
4 files changed, 124 insertions, 34 deletions
diff --git a/libre/python-pyqt5/PKGBUILD b/libre/pyqt5/PKGBUILD index ea327473c..984491087 100644 --- a/libre/python-pyqt5/PKGBUILD +++ b/libre/pyqt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 291120 2017-03-20 15:54:10Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Yichao Yu <yyc1992@gmail.com> @@ -7,36 +7,50 @@ # Maintainer: André Silva <emulatorman@hyperbola.info> # Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info> -# parabola changes and rationale: +# Rationale: build without support for nonfree qt5-webengine. +# +# Differences between extra/pyqt5 and this: +# - We a apply opengles-hack.patch on ARM # - 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.10 +pkgver=5.11.2 pkgrel=2.parabola1 -arch=('x86_64' 'i686' 'armv7h') +arch=('i686' 'x86_64' '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' +makedepends=('python-sip-pyqt5' 'python2-sip-pyqt5' 'sip' 'python-opengl' 'python2-opengl' 'python2-enum34' + 'python2-dbus' 'python-dbus' 'qt5-connectivity' 'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg' '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') +source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" + 'pyqt5-verbose-configure.patch' + 'opengles-hack.patch') +sha512sums=('fc60246b5e1ca0d8aeef829fe20de9dd28b77e3c151532f9dbcd92c0deec12d8308cc799901aeec3f84af745e735053d2aaad2866ef64a2426cba343e08bc2c0' + '139780a2a105605684e8e13b967b8bf8738e6ea0e7793179600c628a179695e4b05952da6d60e67ffac56857afdb08a976896e0ae25a9dbf40085b7fe39f9283' + '6be0458a53dc96919d2dfe7a3e932ac663e6e9ebcc2516809f8c53ad923566bf3f96f622ee52ee8a97bf1bea2fc72f78e60333daa6bb3555ff3ca8371141f2b7') prepare() { - # Support new versions of Qt - don't remove, needs to be reapplied after every new Qt release pushd PyQt5_gpl-$pkgver - # patch -p1 -i ../pyqt-support-new-qt.patch + + case "$CARCH" in + armv7h) patch -p1 -i ../opengles-hack.patch;; + esac +# patch -p1 -i ../pyqt5-verbose-configure.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} +# Remove check for sip from py2, it doesn't work since sip doesn't install __init__.py + sed -e 's|from PyQt5 import sip|pass|g' -i PyQt5_gpl-$pkgver-py2/configure.py } build() { @@ -44,11 +58,42 @@ build() { python configure.py \ --confirm-license \ --no-sip-files \ + --no-dist-info \ --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' + --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 make @@ -56,11 +101,42 @@ build() { python2 configure.py \ --confirm-license \ --no-sip-files \ + --no-dist-info \ --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' + --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 make } @@ -78,7 +154,7 @@ package_pyqt5-common(){ package_python-pyqt5(){ pkgdesc="A set of Python 3.x bindings for the Qt5 toolkit, without nonfree qt5-webengine support" - depends=('python-sip' 'pyqt5-common') + depends=('python-sip-pyqt5' 'pyqt5-common' 'python2-enum34') optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications' 'python-dbus: for python-dbus mainloop support' 'qt5-multimedia: QtMultimedia, QtMultimediaWidgets' @@ -103,7 +179,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' 'python2-enum34') + depends=('python2-sip-pyqt5' 'pyqt5-common') optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications' 'python-dbus: for python-dbus mainloop support' 'qt5-multimedia: QtMultimedia, QtMultimediaWidgets' diff --git a/libre/pyqt5/opengles-hack.patch b/libre/pyqt5/opengles-hack.patch new file mode 100644 index 000000000..afadeb49b --- /dev/null +++ b/libre/pyqt5/opengles-hack.patch @@ -0,0 +1,11 @@ +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/pyqt5/pyqt5-verbose-configure.patch b/libre/pyqt5/pyqt5-verbose-configure.patch new file mode 100644 index 000000000..9ddcfd0ef --- /dev/null +++ b/libre/pyqt5/pyqt5-verbose-configure.patch @@ -0,0 +1,15 @@ +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): diff --git a/libre/python-pyqt5/pyqt-support-new-qt.patch b/libre/python-pyqt5/pyqt-support-new-qt.patch deleted file mode 100644 index 30ca0219d..000000000 --- a/libre/python-pyqt5/pyqt-support-new-qt.patch +++ /dev/null @@ -1,12 +0,0 @@ -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} - |