4.3, patch fix from Arch for finding sip

3 files changed, 37 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d13494a78aba..fcab374282bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = krita-beta
 	pkgdesc = Edit and paint images - beta release
-	pkgver = 4.2.8
+	pkgver = 4.3.0
 	pkgrel = 1
 	url = https://krita.org
 	arch = x86_64
@@ -22,8 +22,10 @@ pkgbase = krita-beta
 	depends = opencolorio
 	provides = krita
 	conflicts = krita
-	source = https://download.kde.org/unstable/krita/4.2.8-beta1/krita-4.2.8-beta1.tar.xz
-	sha256sums = e24b962b04e6cad45f8c7fa61bca17a75835ff62a5677a638439cff8a3fafe69
+	source = https://download.kde.org/unstable/krita/4.3.0-beta1/krita-4.3.0-beta1.tar.xz
+	source = krita-pyqt5-sip5.patch
+	sha256sums = e2a3a61f3d8be6009895417c5094859a98307091b12624eb52281f2657e23ff0
+	sha256sums = ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8
 
 pkgname = krita-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index d496a381fd96..d0bc15ae1cdd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,35 @@
 # Maintainer: Zanny <lordzanny@gmail.com>
 
 pkgname=krita-beta
-pkgver=4.2.8
+pkgver=4.3.0
 _subver=beta1
 pkgrel=1
 pkgdesc="Edit and paint images - beta release"
 arch=(x86_64)
 url="https://krita.org"
 license=(GPL3)
-groups=()
 depends=(kio fftw hicolor-icon-theme libraw gsl boost-libs exiv2 openexr poppler-qt5 opencolorio)
 makedepends=(extra-cmake-modules kdoctools python boost eigen)
 optdepends=()
 provides=(krita)
 conflicts=(krita)
-source=("https://download.kde.org/unstable/krita/$pkgver-$_subver/krita-$pkgver-$_subver.tar.xz")
-sha256sums=('e24b962b04e6cad45f8c7fa61bca17a75835ff62a5677a638439cff8a3fafe69')
+_target="krita-$pkgver-$_subver"
+source=("https://download.kde.org/unstable/krita/$pkgver-$_subver/$_target.tar.xz"
+        'krita-pyqt5-sip5.patch')
+sha256sums=('e2a3a61f3d8be6009895417c5094859a98307091b12624eb52281f2657e23ff0'
+            'ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8')
 
 prepare() {
   mkdir -p build
+  cd "$_target"
+  patch -Np1 -i ../krita-pyqt5-sip5.patch
 }
 
 build() {
   cd build
-  cmake "../krita-$pkgver-$_subver" \
-    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+  cmake "../$_target" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF \
-    -DPACKAGERS_BUILD=ON
+    -DCMAKE_INSTALL_LIBDIR=lib
   make
 }
 
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"])