[arch-commits] Commit in pyqt5/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Saturday, December 21, 2019 @ 14:22:51
  Author: arojas
Revision: 372020

python3 version conflicts with pyqt5-common too due to the qscintilla api file

Modified:
  pyqt5/trunk/PKGBUILD

----------+
 PKGBUILD |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-21 12:49:51 UTC (rev 372019)
+++ PKGBUILD	2019-12-21 14:22:51 UTC (rev 372020)
@@ -8,7 +8,7 @@
 pkgbase=pyqt5
 pkgname=('python-pyqt5' 'python2-pyqt5')
 pkgver=5.14.0
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url="https://riverbankcomputing.com/software/pyqt/intro"
 license=('GPL')
@@ -15,6 +15,7 @@
 makedepends=('sip5' 'pyqt-builder' 'python2-sip-pyqt5' 'sip' 'python-opengl' 'python2-opengl' 'python2-enum34' 'python-pip'
              'python2-dbus' 'python-dbus' 'qt5-connectivity' 'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg'
              'qt5-webkit' 'qt5-websockets' 'qt5-x11extras' 'qt5-networkauth' 'qt5-xmlpatterns' 'qt5-remoteobjects')
+conflicts=('pyqt5-common')
 source=("https://pypi.python.org/packages/source/P/PyQt5/PyQt5-$pkgver.tar.gz")
 sha256sums=('0145a6b7de15756366decb736c349a0cb510d706c83fda5b8cd9e0557bc1da72')
 
@@ -88,7 +89,6 @@
               'qt5-x11extras: QtX11Extras'
               'qt5-networkauth: QtNetworkAuth'
               'qt5-remoteobjects: QtRemoteObjects')
-  conflicts=('pyqt5-common')
 
   cd PyQt5-$pkgver-py2
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR