Removing libre-testing/pyqt5: Use libre/pyqt5 instead

3 files changed, 0 insertions, 153 deletions

diff --git a/libre-testing/pyqt5/PKGBUILD b/libre-testing/pyqt5/PKGBUILD
deleted file mode 100644
index 99fcc2667..000000000
--- a/libre-testing/pyqt5/PKGBUILD
+++ /dev/null
@@ -1,130 +0,0 @@
-# $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>
-# Contributor (Arch): Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor (Arch): riai <riai@bigfoot.com> Ben <ben@benmazer.net>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
-# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
-
-pkgbase=pyqt5
-pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
-pkgver=5.8.1
-pkgrel=1.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"
-        'opengles-hack.patch')
-sha512sums=('56607263f6782409a2088b986954e973fdeea681fe3d6e3708b4946477da1431c33814454ad14e758de7c46b1dac660f3204aae2e1087249d13be6d80ddd6458'
-            '6be0458a53dc96919d2dfe7a3e932ac663e6e9ebcc2516809f8c53ad923566bf3f96f622ee52ee8a97bf1bea2fc72f78e60333daa6bb3555ff3ca8371141f2b7')
-
-prepare() {
-  if [[ "$CARCH" =~ ^arm*|^aarch64$ ]]; then
-    pushd PyQt5_gpl-$pkgver
-    patch -p1 -i ../opengles-hack.patch
-    popd
-  fi
-
-  # 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
-
-  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, 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/PyQt5/libpyqt5qmlplugin.so
-  rm "$pkgdir"/usr/share/qt/qsci/api/python/PyQt5.api
-}
diff --git a/libre-testing/pyqt5/opengles-hack.patch b/libre-testing/pyqt5/opengles-hack.patch
deleted file mode 100644
index afadeb49b..000000000
--- a/libre-testing/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-testing/pyqt5/pyqt-support-new-qt.patch b/libre-testing/pyqt5/pyqt-support-new-qt.patch
deleted file mode 100644
index 7d3a633c1..000000000
--- a/libre-testing/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}
-