The patch for PyQt5 with SIP5 is no longer needed

https://github.com/KDE/krita/commit/c3cba340cfca43f216522464de5fd6f3e060718b

3 files changed, 7 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3b821ea92225..41a71919d475 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = krita-git
 	pkgdesc = A full-featured free digital painting studio. Git version.
-	pkgver = 4.3.0.prealpha.2606.g78d8377a24
-	pkgrel = 1
+	pkgver = 4.3.0.prealpha.3252.ga899f2f428
+	pkgrel = 2
 	url = https://krita.org
 	arch = x86_64
 	license = GPL3
@@ -42,14 +42,12 @@ pkgbase = krita-git
 	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
+	provides = krita=4.3.0.prealpha.3252.ga899f2f428
 	conflicts = calligra-krita
 	conflicts = krita-il10n
 	conflicts = krita
 	source = git+https://github.com/KDE/krita.git
-	source = krita-pyqt5-sip5.patch
 	sha256sums = SKIP
-	sha256sums = ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8
 
 pkgname = krita-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ac7337cbc410..196da51761fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 
 _pkgname=krita
 pkgname=${_pkgname}-git
-pkgver=4.3.0.prealpha.2606.g78d8377a24
-pkgrel=1
+pkgver=4.3.0.prealpha.3252.ga899f2f428
+pkgrel=2
 pkgdesc='A full-featured free digital painting studio. Git version.'
 arch=('x86_64')
 url='https://krita.org'
@@ -26,14 +26,8 @@ optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations'
 provides=("${_pkgname}=${pkgver}")
 conflicts=(calligra-krita krita-il10n krita)
 
-source=(
-	"git+https://github.com/KDE/${_pkgname}.git"
-	'krita-pyqt5-sip5.patch'
-)
-sha256sums=(
-	'SKIP'
-	'ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8'
-)
+source=("git+https://github.com/KDE/${_pkgname}.git")
+sha256sums=('SKIP')
 
 pkgver() {
 	cd "${srcdir}"/${_pkgname}
@@ -42,10 +36,6 @@ pkgver() {
 
 prepare() {
 	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() {
diff --git a/krita-pyqt5-sip5.patch b/krita-pyqt5-sip5.patch
deleted file mode 100644
index 5d88a3b623ac..000000000000
--- a/krita-pyqt5-sip5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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"])