4.4.2-beta1

4 files changed, 84 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eccae757c4aa..506ec38d92e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = krita-beta
 	pkgdesc = Edit and paint images - beta release
-	pkgver = 4.4.0.beta1
+	pkgver = 4.4.2.beta1
 	pkgrel = 1
 	url = https://krita.org
 	arch = x86_64
@@ -11,6 +11,7 @@ pkgbase = krita-beta
 	makedepends = boost
 	makedepends = eigen
 	depends = kio
+	depends = kseexpr
 	depends = fftw
 	depends = hicolor-icon-theme
 	depends = libraw
@@ -25,8 +26,12 @@ pkgbase = krita-beta
 	depends = giflib
 	provides = krita
 	conflicts = krita
-	source = https://download.kde.org/unstable/krita/4.4.0-beta1/krita-4.4.0-beta1.tar.xz
-	sha256sums = e5254f9b5d84a7885ae8ef93fb79448acf0bf9f46fad1d537867419ddbf0455c
+	source = https://download.kde.org/unstable/krita/4.4.2-beta1/krita-4.4.2-beta1.tar.xz
+	source = avif.patch
+	source = krita-c++14.patch
+	sha256sums = 6d6881be0da3bde43ba74488013c0795fbbd9d85e25042799b0821ea2eedcab9
+	sha256sums = 9a1cd95721ff342de87fe68c894455a0151a8f5115a5b9cda0ab9c683157e94e
+	sha256sums = de84c3c1685e48392d4fb07daab56068cacfc2a846a52a9915b5f3e08357abd1
 
 pkgname = krita-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index 59d8deb60760..a4db08568279 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,31 @@
 # Maintainer: zan <zan@420blaze.it>
 
 pkgname=krita-beta
-_basever=4.4.0
-_subver=beta2
+_basever=4.4.2
+_subver=beta1
 pkgver="$_basever.$_subver"
 pkgrel=1
 pkgdesc="Edit and paint images - beta release"
 arch=(x86_64)
 url="https://krita.org"
 license=(GPL3)
-depends=(kio fftw hicolor-icon-theme libraw gsl boost-libs exiv2 openexr poppler-qt5 opencolorio libheif quazip giflib)
+depends=(kio kseexpr fftw hicolor-icon-theme libraw gsl boost-libs exiv2 openexr poppler-qt5 opencolorio libheif quazip giflib)
 makedepends=(extra-cmake-modules kdoctools python boost eigen)
 optdepends=()
 provides=(krita)
 conflicts=(krita)
 _target="krita-$_basever-$_subver"
-source=("https://download.kde.org/unstable/krita/$_basever-$_subver/$_target.tar.xz")
-sha256sums=('544c375f03df7f80b345885909a5d12de8add53d39c3375a221346caebec8ae6')
+source=("https://download.kde.org/unstable/krita/$_basever-$_subver/$_target.tar.xz"
+        'avif.patch'
+        'krita-c++14.patch')
+sha256sums=('6d6881be0da3bde43ba74488013c0795fbbd9d85e25042799b0821ea2eedcab9'
+            '9a1cd95721ff342de87fe68c894455a0151a8f5115a5b9cda0ab9c683157e94e'
+            'de84c3c1685e48392d4fb07daab56068cacfc2a846a52a9915b5f3e08357abd1')
+
+prepare() {
+    patch -d ${pkgname%-beta}-$_basever-$_subver -p1 -i ../avif.patch
+    patch -d ${pkgname%-beta}-$_basever-$_subver -p1 -i ../krita-c++14.patch
+}
 
 build() {
     cmake -B build -S $_target
diff --git a/avif.patch b/avif.patch
new file mode 100644
index 000000000000..6932d423f6b0
--- /dev/null
+++ b/avif.patch
@@ -0,0 +1,49 @@
+diff --git a/plugins/impex/qimageio/krita_qimageio.desktop b/plugins/impex/qimageio/krita_qimageio.desktop
+index 19eed5abac..0a84eef41b 100644
+--- a/plugins/impex/qimageio/krita_qimageio.desktop
++++ b/plugins/impex/qimageio/krita_qimageio.desktop
+@@ -64,7 +64,7 @@ Name[x-test]=xxKritaxx
+ Name[zh_CN]=Krita
+ Name[zh_TW]=Krita
+ Exec=krita %F
+-MimeType=image/bmp;image/x-xpixmap;image/x-xbitmap;image/webp;image/vnd.microsoft.icon;image/x-portable-pixmap;image/x-portable-graymap;image/x-portable-bitmap;
++MimeType=image/bmp;image/x-xpixmap;image/x-xbitmap;image/webp;image/vnd.microsoft.icon;image/x-portable-pixmap;image/x-portable-graymap;image/x-portable-bitmap;image/avif;
+ Type=Application
+ Icon=krita
+ Categories=Qt;KDE;Office;Graphics;
+diff --git a/plugins/impex/qimageio/krita_qimageio_export.json b/plugins/impex/qimageio/krita_qimageio_export.json
+index b7009943ef..f330dcb508 100644
+--- a/plugins/impex/qimageio/krita_qimageio_export.json
++++ b/plugins/impex/qimageio/krita_qimageio_export.json
+@@ -2,11 +2,11 @@
+     "Id": "Krita QImageIO Export Filter",
+     "NoDisplay": "true",
+     "Type": "Service",
+-    "X-KDE-Export": "image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon,image/x-portable-pixmap,image/x-portable-graymap,image/x-portable-bitmap",
++    "X-KDE-Export": "image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon,image/x-portable-pixmap,image/x-portable-graymap,image/x-portable-bitmap,image/avif",
+     "X-KDE-Library": "kritaqimageioexport",
+     "X-KDE-ServiceTypes": [
+         "Krita/FileFilter"
+     ],
+     "X-KDE-Weight": "1",
+-    "X-KDE-Extensions" : "bmp,xpm,xbm,ico,webp,ppm"
++    "X-KDE-Extensions" : "bmp,xpm,xbm,ico,webp,ppm,avif"
+ }
+diff --git a/plugins/impex/qimageio/krita_qimageio_import.json b/plugins/impex/qimageio/krita_qimageio_import.json
+index 9fe6cd908f..1022b5ed7d 100644
+--- a/plugins/impex/qimageio/krita_qimageio_import.json
++++ b/plugins/impex/qimageio/krita_qimageio_import.json
+@@ -2,11 +2,11 @@
+     "Id": "Krita QImageIO Import Filter",
+     "NoDisplay": "true",
+     "Type": "Service",
+-    "X-KDE-Import": "image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon,image/x-portable-pixmap,image/x-portable-graymap,image/x-portable-bitmap",
++    "X-KDE-Import": "image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon,image/x-portable-pixmap,image/x-portable-graymap,image/x-portable-bitmap,image/avif",
+     "X-KDE-Library": "kritaqimageioimport",
+     "X-KDE-ServiceTypes": [
+         "Krita/FileFilter"
+     ],
+     "X-KDE-Weight": "1",
+-    "X-KDE-Extensions" : "bmp,webp,xbm,ico,ppm"
++    "X-KDE-Extensions" : "bmp,webp,xbm,ico,ppm,avif"
+ }
diff --git a/krita-c++14.patch b/krita-c++14.patch
new file mode 100644
index 000000000000..678ea0cb9ad3
--- /dev/null
+++ b/krita-c++14.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 48d445b030..fe9bcb4765 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
+ set(MIN_QT_VERSION 5.9.0)
+ set(MIN_FRAMEWORKS_VERSION 5.44.0)
+ 
+-set( CMAKE_CXX_STANDARD 11 )
++set( CMAKE_CXX_STANDARD 14 )
+ set( CMAKE_CXX_STANDARD_REQUIRED ON )
+ 
+