Date: Monday, December 16, 2019 @ 11:56:53 Author: arojas Revision: 371566
Fix build with pyqt5 compiled with sip5 Added: krita/trunk/krita-pyqt5-sip5.patch Modified: krita/trunk/PKGBUILD ------------------------+ PKGBUILD | 8 ++++++-- krita-pyqt5-sip5.patch | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-12-16 11:56:51 UTC (rev 371565) +++ PKGBUILD 2019-12-16 11:56:53 UTC (rev 371566) @@ -17,11 +17,13 @@ replaces=(calligra-krita krita-l10n) source=("https://download.kde.org/stable/krita/${pkgver%.*}/$pkgname-$pkgver.tar.gz"{,.sig} kdebug-410867.patch::"https://invent.kde.org/kde/krita/commit/ca07d42c.patch" - kdebug-414672.patch::"https://invent.kde.org/kde/krita/commit/2dc2ed5f.patch") + kdebug-414672.patch::"https://invent.kde.org/kde/krita/commit/2dc2ed5f.patch" + krita-pyqt5-sip5.patch) sha256sums=('80f741fa11245ff20a99f529f5f62def17791f3ad2c9aec5c5cf5440ae1fcba7' 'SKIP' 'cfc9c7b2accbb730be3d9e2c92e5d501d2e3465841c97efae84602987e8cae3b' - '181802a9273133a654f6aac2b1760b91beffa8e631b2aa162b5b10d342d5f712') + '181802a9273133a654f6aac2b1760b91beffa8e631b2aa162b5b10d342d5f712' + '68ad86663cabc05eca84bbb3fab367e86febddfb408e90d0733ecb0ccdf499eb') validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt <foundat...@krita.org> prepare() { @@ -30,6 +32,8 @@ cd $pkgname-$pkgver patch -p1 -i ../kdebug-410867.patch # Fix crash on close patch -p1 -i ../kdebug-414672.patch # Fix crash on transform tool + + patch -p1 -i ../krita-pyqt5-sip5.patch # Fix sip include dir when PyQt5 is compiled with SIP 5 } build() { Added: krita-pyqt5-sip5.patch =================================================================== --- krita-pyqt5-sip5.patch (rev 0) +++ krita-pyqt5-sip5.patch 2019-12-16 11:56:53 UTC (rev 371566) @@ -0,0 +1,22 @@ +diff --git a/cmake/modules/FindPyQt5.py b/cmake/modules/FindPyQt5.py +index 5849f40868..a42ba6c624 100644 +--- a/cmake/modules/FindPyQt5.py ++++ b/cmake/modules/FindPyQt5.py +@@ -3,7 +3,7 @@ + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + import PyQt5.Qt +-import sys ++import sys, site + import os.path + + print("pyqt_version:%06.0x" % PyQt5.Qt.PYQT_VERSION) +@@ -30,7 +30,7 @@ except ValueError: + pass + + # FIXME This next line is just a little bit too crude. +-pyqt_sip_dir = os.path.join(sys.prefix, "share", "sip", "PyQt5") ++pyqt_sip_dir = os.path.join(site.getsitepackages()[0], "PyQt5", "bindings") + print("pyqt_sip_dir:%s" % pyqt_sip_dir) + + print("pyqt_sip_flags:%s" % PyQt5.Qt.PYQT_CONFIGURATION["sip_flags"])