git » krita.git » commit eeff3f4

Update to 5.1.5

author Antonio Rojas
2023-01-05 22:06:27 UTC
committer Antonio Rojas
2023-01-05 22:06:27 UTC
parent 6c0e48cef9196c8bebf07dd0f042ddbdf0c489b0

Update to 5.1.5

PKGBUILD +6 -11
krita-libraw-0.21.patch +0 -16

diff --git a/PKGBUILD b/PKGBUILD
index 80926f2..478f77d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Antonio Rojas <arojas@archlinux,org>
 
 pkgname=krita
-_pkgver=5.1.4
+_pkgver=5.1.5
 pkgver=${_pkgver/-/}
-pkgrel=4
+pkgrel=1
 pkgdesc='Edit and paint images'
 arch=(x86_64)
 url='https://krita.org'
@@ -17,14 +17,10 @@ optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations'
             'kseexpr: SeExpr generator layer' 'kimageformats: PSD support' 'libmypaint: support for MyPaint brushes'
             'krita-plugin-gmic: GMic plugin' 'libjxl: JPEG-XL filter')
 source=(https://download.kde.org/stable/krita/$_pkgver/$pkgname-$_pkgver.tar.gz{,.sig}
-        find-xsimd.patch
-        krita-libraw-0.21.patch
-        https://invent.kde.org/graphics/krita/-/commit/b388330b.patch)
-sha256sums=('c22b020862596eb2fdd911e1b179dbbce7b081be111457a2eacaf6ae1cca2dcb'
+        find-xsimd.patch)
+sha256sums=('1c775ebef0f799a9a6b74440c3d906ab913c27541b177ed621704de714e9a4d3'
             'SKIP'
-            '622c9ffbbfef72dd024b391b879c79ae34da11d52b2f3488dfd8ee42bf7b453b'
-            '583559875b48d099f120703663e229bd7df8d55b2de45b4d3ce1ca36d3572baa'
-            '01faa00abf5b1291bc6b98b6bd49d277c3f3986824915fe3bd5ea13abd62abbe')
+            '622c9ffbbfef72dd024b391b879c79ae34da11d52b2f3488dfd8ee42bf7b453b')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD'  # Boudewijn Rempt <foundation@krita.org>
               'E9FB29E74ADEACC5E3035B8AB69EB4CF7468332F'  # Dmitry Kazakov (main key) <dimula73@gmail.com>
               '064182440C674D9F8D0F6F8B4DA79EDA231C852B') # Stichting Krita Foundation <foundation@krita.org>
@@ -32,8 +28,7 @@ options=(debug)
 
 prepare() {
   patch -d $pkgname-$_pkgver -p1 < find-xsimd.patch
-  patch -d $pkgname-$_pkgver -p1 < krita-libraw-0.21.patch # Fix build with libraw 0.21
-  patch -d $pkgname-$_pkgver -p1 < b388330b.patch # Fix artifacts with xsimd 10
+  sed -e 's|primaties|primaries|g' -i $pkgname-$pkgver/plugins/impex/heif/HeifExport.cpp # Fix build with libheif 1.14.1
 }
 
 build() {
diff --git a/krita-libraw-0.21.patch b/krita-libraw-0.21.patch
deleted file mode 100644
index 28c4562..0000000
--- a/krita-libraw-0.21.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
-index dcaecc6fa7..71425f909c 100644
---- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
-+++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
-@@ -383,7 +383,11 @@ bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawI
-     d->setProgress(0.3);
- 
-     raw.imgdata.params.output_bps  = 16;
-+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
-+    raw.imgdata.rawparams.shot_select = shotSelect;
-+#else
-     raw.imgdata.params.shot_select = shotSelect;
-+#endif
-     ret                            = raw.unpack();
- 
-     if (ret != LIBRAW_SUCCESS)