Fix build for PyQt5 and SIP 5

4 files changed, 62 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 58d178f76d85..3b821ea92225 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = krita-git
-	pkgdesc = Edit and paint images (git version)
-	pkgver = 4.3.0.prealpha.97.gcec15055b8
+	pkgdesc = A full-featured free digital painting studio. Git version.
+	pkgver = 4.3.0.prealpha.2606.g78d8377a24
 	pkgrel = 1
-	url = http://krita.org
+	url = https://krita.org
 	arch = x86_64
 	license = GPL3
+	makedepends = git
 	makedepends = extra-cmake-modules
 	makedepends = kdoctools
 	makedepends = boost
@@ -35,21 +36,20 @@ pkgbase = krita-git
 	depends = boost-libs
 	depends = giflib
 	depends = hicolor-icon-theme
-	depends = desktop-file-utils
 	optdepends = poppler-qt5: PDF filter
 	optdepends = ffmpeg: to save animations
 	optdepends = opencolorio: for the LUT docker
 	optdepends = krita-plugin-gmic: G'MIC plugin
 	optdepends = python-pyqt5: for the Python plugins
 	optdepends = libheif: HEIF filter
+	provides = krita=4.3.0.prealpha.2606.g78d8377a24
 	conflicts = calligra-krita
 	conflicts = krita-il10n
 	conflicts = krita
-	replaces = calligra-krita
-	replaces = krita-il10n
-	replaces = krita
 	source = git+https://github.com/KDE/krita.git
+	source = krita-pyqt5-sip5.patch
 	sha256sums = SKIP
+	sha256sums = ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8
 
 pkgname = krita-git
 
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 05c6d4d4c97b..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*
-!.gitignore
-!.SRCINFO
-!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index 0bce63b54139..ac7337cbc410 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,56 @@
-# Maintainer: Alison Watson <marrub@greyserv.net>
+# Maintainer: Alfredo Ramos <alfredo dot ramos at yandex dot com>
+# Contributor: Alison Watson <marrub@greyserv.net>
 # Contributor: Antonio Rojas <arojas@archlinux,org>
 # Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>
 # Contributor: Bruno Pagani (a.k.a. ArchangeGabriel) <bruno.n.pagani at gmail dot com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Maintainer: Corey Richardson <corey@octayn.net>
 
-pkgname=krita-git
-pkgver=4.3.0.prealpha.97.gcec15055b8
+_pkgname=krita
+pkgname=${_pkgname}-git
+pkgver=4.3.0.prealpha.2606.g78d8377a24
 pkgrel=1
-pkgdesc="Edit and paint images (git version)"
-arch=(x86_64)
-url="http://krita.org"
-license=(GPL3)
+pkgdesc='A full-featured free digital painting studio. Git version.'
+arch=('x86_64')
+url='https://krita.org'
+license=('GPL3')
+
 depends=(kitemviews kitemmodels ki18n kcompletion karchive kguiaddons kcrash
          qt5-svg qt5-multimedia quazip gsl libraw exiv2 openexr fftw curl
-         boost-libs giflib hicolor-icon-theme desktop-file-utils)
-makedepends=(extra-cmake-modules kdoctools boost eigen vc poppler-qt5
+         boost-libs giflib hicolor-icon-theme)
+makedepends=(git extra-cmake-modules kdoctools boost eigen vc poppler-qt5
              opencolorio python-pyqt5 libheif sip python-sip)
 optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations'
             'opencolorio: for the LUT docker' "krita-plugin-gmic: G'MIC plugin"
             'python-pyqt5: for the Python plugins' 'libheif: HEIF filter')
+provides=("${_pkgname}=${pkgver}")
 conflicts=(calligra-krita krita-il10n krita)
-replaces=(calligra-krita krita-il10n krita)
-source=("git+https://github.com/KDE/krita.git")
-sha256sums=('SKIP')
+
+source=(
+	"git+https://github.com/KDE/${_pkgname}.git"
+	'krita-pyqt5-sip5.patch'
+)
+sha256sums=(
+	'SKIP'
+	'ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8'
+)
 
 pkgver() {
-	cd krita
-	git describe --tags |sed 's+-+.+g'|sed 's+^v++'
+	cd "${srcdir}"/${_pkgname}
+	git describe --long --tags 2>/dev/null | sed -r 's/^v//;s/-/./g'
 }
 
 prepare() {
-	mkdir -p build
+	mkdir -p "${srcdir}"/build
+
+	# Fix sip include dir when PyQt5 is compiled with SIP 5
+	cd "${srcdir}"/${_pkgname}
+	patch -Np1 < ../krita-pyqt5-sip5.patch
 }
 
 build() {
-	cd build
-	cmake ../krita \
+	cd "${srcdir}"/build
+	cmake ../${_pkgname} \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_TESTING=OFF
@@ -44,6 +58,6 @@ build() {
 }
 
 package() {
-	cd build
-	make DESTDIR="$pkgdir" install
+	cd "${srcdir}"/build
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/krita-pyqt5-sip5.patch b/krita-pyqt5-sip5.patch
new file mode 100644
index 000000000000..5d88a3b623ac
--- /dev/null
+++ b/krita-pyqt5-sip5.patch
@@ -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
+@@ -2,7 +2,7 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+-import sys
++import sys, site
+ import os
+ 
+ try:
+@@ -41,7 +41,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.QtCore.PYQT_CONFIGURATION["sip_flags"])