4.3.0 beta2

3 files changed, 30 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fcab374282bd..c99ad90cb8da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = krita-beta
 	pkgdesc = Edit and paint images - beta release
-	pkgver = 4.3.0
+	pkgver = 4.3.0.beta2
 	pkgrel = 1
 	url = https://krita.org
 	arch = x86_64
@@ -22,10 +22,12 @@ pkgbase = krita-beta
 	depends = opencolorio
 	provides = krita
 	conflicts = krita
-	source = https://download.kde.org/unstable/krita/4.3.0-beta1/krita-4.3.0-beta1.tar.xz
+	source = https://download.kde.org/unstable/krita/4.3.0-beta2/krita-4.3.0-beta2.tar.xz
 	source = krita-pyqt5-sip5.patch
-	sha256sums = e2a3a61f3d8be6009895417c5094859a98307091b12624eb52281f2657e23ff0
+	source = safe-assert.patch
+	sha256sums = 63479ea6b009bc55254ac2df7a043ebd659e5fe5db696e308e01bf1a56c89d32
 	sha256sums = ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8
+	sha256sums = 890edc92a297edbed001263b069767c34fdd51a45969ea12ae760cc4c8f98ee4
 
 pkgname = krita-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index efa8d349eb2b..2ff4be150a93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Zanny <lordzanny@gmail.com>
 
 pkgname=krita-beta
-pkgver=4.3.0
-_subver=beta1
+_basever=4.3.0
+_subver=beta2
+pkgver="$_basever.$_subver"
 pkgrel=1
 pkgdesc="Edit and paint images - beta release"
 arch=(x86_64)
@@ -13,24 +14,24 @@ makedepends=(extra-cmake-modules kdoctools python boost eigen)
 optdepends=()
 provides=(krita)
 conflicts=(krita)
-_target="krita-$pkgver-$_subver"
-source=("https://download.kde.org/unstable/krita/$pkgver-$_subver/$_target.tar.xz"
-        'krita-pyqt5-sip5.patch')
-sha256sums=('e2a3a61f3d8be6009895417c5094859a98307091b12624eb52281f2657e23ff0'
-            'ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8')
+_target="krita-$_basever-$_subver"
+source=("https://download.kde.org/unstable/krita/$_basever-$_subver/$_target.tar.xz"
+        'krita-pyqt5-sip5.patch'
+        'safe-assert.patch')
+sha256sums=('63479ea6b009bc55254ac2df7a043ebd659e5fe5db696e308e01bf1a56c89d32'
+            'ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8'
+            '890edc92a297edbed001263b069767c34fdd51a45969ea12ae760cc4c8f98ee4')
 
 prepare() {
   mkdir -p build
   cd "$_target"
   patch -Np1 -i ../krita-pyqt5-sip5.patch
+  patch -Np1 < ../safe-assert.patch
 }
 
 build() {
   cd build
-  cmake "../$_target" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF
+  cmake "../$_target"
   make
 }
 
diff --git a/safe-assert.patch b/safe-assert.patch
new file mode 100644
index 000000000000..1768e568d028
--- /dev/null
+++ b/safe-assert.patch
@@ -0,0 +1,13 @@
+diff --git a/libs/widgets/KoToolBox.cpp b/libs/widgets/KoToolBox.cpp
+index 360aa26f1d..d6e5637fb5 100644
+--- a/libs/widgets/KoToolBox.cpp
++++ b/libs/widgets/KoToolBox.cpp
+@@ -48,7 +48,7 @@
+ 
+ static int buttonSize(int screen)
+ {
+-    KIS_ASSERT_RECOVER_RETURN_VALUE(screen < QGuiApplication::screens().size() && screen >= 0, 16);
++    KIS_SAFE_ASSERT_RECOVER_RETURN_VALUE(screen < QGuiApplication::screens().size() && screen >= 0, 16);
+ 
+     QRect rc = QGuiApplication::screens().at(screen)->availableGeometry();
+     if (rc.width() <= 1024) {