diff options
| -rw-r--r-- | libre/pyqt5/PKGBUILD | 44 | ||||
| -rw-r--r-- | libre/pyqt5/pyqt-support-new-qt.patch | 12 | ||||
| -rw-r--r-- | libre/pyqt5/pyqt5-verbose-configure.patch | 15 |
3 files changed, 42 insertions, 29 deletions
diff --git a/libre/pyqt5/PKGBUILD b/libre/pyqt5/PKGBUILD index 2475258c5..a2ccad1e3 100644 --- a/libre/pyqt5/PKGBUILD +++ b/libre/pyqt5/PKGBUILD @@ -7,36 +7,46 @@ # Maintainer: André Silva <emulatorman@parabola.nu> # 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 +# - 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.8 _pkgver=$pkgver -pkgrel=2.parabola1 +pkgrel=2.parabola2 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' - 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras') -source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" "pyqt-5.8-segfault.patch" - 'opengles-hack.patch') + 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras') +source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" "pyqt-5.8-segfault.patch") md5sums=('ac04c0bfc1f05f5a1c2a1edd2640235c' - 'de7b2781874ff0c7c0d710f718cfa01a' - 'ad09b1c84c26d5e92de192477cb3a2d1') + 'de7b2781874ff0c7c0d710f718cfa01a') +source+=('pyqt5-verbose-configure.patch') +md5sums+=('741c4b3ed85e4bf306ae2e73826d8a8b') +source_armv7h=('opengles-hack.patch') +md5sums_armv7h=('ad09b1c84c26d5e92de192477cb3a2d1') prepare() { pushd PyQt5_gpl-${_pkgver} patch -Np1 -i "${srcdir}/pyqt-5.8-segfault.patch" - if [[ "$CARCH" =~ ^arm*|^aarch64$ ]]; then - patch -p1 -i ../opengles-hack.patch - fi - # Support Qt 5.8 - # patch -p1 -i ../pyqt-qt5.8.patch + case "$CARCH" in + armv7h) patch -p1 -i ../opengles-hack.patch;; + esac + patch -Np1 -i "${srcdir}/pyqt5-verbose-configure.patch" popd - # Support new versions of Qt - don't remove, needs to be reapplied after every new Qt release - # patch -p1 -i ../pyqt-support-new-qt.patch # 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 @@ -71,7 +81,7 @@ build() { } package_pyqt5-common(){ - pkgdesc="Common PyQt files shared between python-pyqt5 and python2-pyqt5, without nonfree qt5-webengine support" + pkgdesc="Common PyQt files shared between python-pyqt5 and python2-pyqt5" depends=('qt5-base') cd PyQt5_gpl-${_pkgver} @@ -82,7 +92,7 @@ package_pyqt5-common(){ } package_python-pyqt5(){ - pkgdesc="A set of Python 3.x bindings for the Qt5 toolkit, without nonfree qt5-webengine support" + pkgdesc="A set of Python 3.x bindings for the Qt5 toolkit" depends=('python-sip' 'pyqt5-common') optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications' 'python-dbus: for python-dbus mainloop support' @@ -103,7 +113,7 @@ package_python-pyqt5(){ } package_python2-pyqt5(){ - pkgdesc="A set of Python 2.x bindings for the Qt5 toolkit, without nonfree qt5-webengine support" + pkgdesc="A set of Python 2.x bindings for the Qt5 toolkit" depends=('python2-sip' 'pyqt5-common') optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications' 'python-dbus: for python-dbus mainloop support' @@ -124,7 +134,7 @@ package_python2-pyqt5(){ 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/designer/libpyqt5.so rm "${pkgdir}"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api } diff --git a/libre/pyqt5/pyqt-support-new-qt.patch b/libre/pyqt5/pyqt-support-new-qt.patch deleted file mode 100644 index 7d3a633c1..000000000 --- a/libre/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} -+%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} - 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): |