From 5337fd3504bb01c3aa9fca4e255cdec5babffb7e Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Sun, 4 Feb 2018 21:23:36 +0100 Subject: libre/pyqt5: moved to libre/python-pyqt5 --- libre/pyqt5/PKGBUILD | 212 ------------------------------ libre/pyqt5/opengles-hack.patch | 11 -- libre/pyqt5/pyqt5-verbose-configure.patch | 15 --- 3 files changed, 238 deletions(-) delete mode 100644 libre/pyqt5/PKGBUILD delete mode 100644 libre/pyqt5/opengles-hack.patch delete mode 100644 libre/pyqt5/pyqt5-verbose-configure.patch (limited to 'libre/pyqt5') diff --git a/libre/pyqt5/PKGBUILD b/libre/pyqt5/PKGBUILD deleted file mode 100644 index c54c9b630..000000000 --- a/libre/pyqt5/PKGBUILD +++ /dev/null @@ -1,212 +0,0 @@ -# $Id: PKGBUILD 291120 2017-03-20 15:54:10Z arojas $ -# Maintainer (Arch): Felix Yan -# Contributor (Arch): Andrea Scarpino -# Contributor (Arch): Yichao Yu -# Contributor (Arch): Douglas Soares de Andrade -# Contributor (Arch): riai Ben -# Maintainer: André Silva -# Contributor: Isaac David - -# 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.9.2 -pkgrel=2.parabola1 -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" - 'pyqt5-verbose-configure.patch' - 'opengles-hack.patch') -sha512sums=('5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc' - '139780a2a105605684e8e13b967b8bf8738e6ea0e7793179600c628a179695e4b05952da6d60e67ffac56857afdb08a976896e0ae25a9dbf40085b7fe39f9283' - '6be0458a53dc96919d2dfe7a3e932ac663e6e9ebcc2516809f8c53ad923566bf3f96f622ee52ee8a97bf1bea2fc72f78e60333daa6bb3555ff3ca8371141f2b7') - -prepare() { - pushd PyQt5_gpl-$pkgver - - 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} -} - -build() { - cd "$srcdir"/PyQt5_gpl-$pkgver - python configure.py \ - --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 - 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 \ - --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 - 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, without nonfree qt5-webengine support" - 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, without nonfree qt5-webengine support" - depends=('python-sip' 'pyqt5-common') - 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' - 'qt5-websockets: QtWebSockets' - 'qt5-connectivity: QtNfc, QtBluetooth' - 'qt5-x11extras: QtX11Extras') - - 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, without nonfree qt5-webengine support" - depends=('python2-sip' 'pyqt5-common') - 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' - 'qt5-websockets: QtWebSockets' - 'qt5-connectivity: QtNfc, QtBluetooth' - 'qt5-x11extras: QtX11Extras') - - 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 -} diff --git a/libre/pyqt5/opengles-hack.patch b/libre/pyqt5/opengles-hack.patch deleted file mode 100644 index afadeb49b..000000000 --- a/libre/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/pyqt5/pyqt5-verbose-configure.patch b/libre/pyqt5/pyqt5-verbose-configure.patch deleted file mode 100644 index 9ddcfd0ef..000000000 --- a/libre/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): -- cgit v1.2.3