git » krita.git » commit 1a5db62

Revert "upgpkg: 5.2.0rc1-1: Update to 5.2rc1"

author Antonio Rojas
2023-09-14 21:36:40 UTC
committer Antonio Rojas
2023-09-14 21:36:40 UTC
parent 1c3c9cbee8ce3bc1677abd2b0ed9bb2639191325

Revert "upgpkg: 5.2.0rc1-1: Update to 5.2rc1"

This reverts commit 1c3c9cbee8ce3bc1677abd2b0ed9bb2639191325.

PKGBUILD +27 -12

diff --git a/PKGBUILD b/PKGBUILD
index efeeac2..d9a2301 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,44 @@
 # Maintainer: Antonio Rojas <arojas@archlinux,org>
 
 pkgname=krita
-_pkgver=5.2.0-rc1
-pkgver=${_pkgver/-/}
-pkgrel=1
+pkgver=5.1.5
+pkgrel=11
 pkgdesc='Edit and paint images'
 arch=(x86_64)
 url='https://krita.org'
 license=(GPL3)
-depends=(kitemviews ki18n kcompletion kguiaddons kcrash qt5-svg quazip
-         gsl libkdcraw exiv2 openexr fftw openjpeg2 opencolorio libwebp mlt libunibreak ffmpeg hicolor-icon-theme)
-makedepends=(extra-cmake-modules kdoctools boost eigen poppler-qt5 python-pyqt5 libheif kitemmodels
-             qt5-tools sip kseexpr libmypaint libjxl xsimd immer zug lager)
-optdepends=('poppler-qt5: PDF filter' 'python-pyqt5: for the Python plugins' 'libheif: HEIF filter'
+depends=(kitemviews kitemmodels ki18n kcompletion kguiaddons kcrash qt5-svg qt5-multimedia quazip
+         gsl libraw exiv2 openexr fftw openjpeg2 opencolorio libwebp hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools boost eigen poppler-qt5 python-pyqt5 libheif
+             qt5-tools sip kseexpr libmypaint libjxl xsimd)
+optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations'
+            'python-pyqt5: for the Python plugins' 'libheif: HEIF filter'
             '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/unstable/krita/$_pkgver/$pkgname-$_pkgver.tar.gz{,.sig})
-sha256sums=('cfccd30e269ae3a5f6fa583fd4e0144a7c57116bee7e86f9b2161b873edf4514'
-            'SKIP')
+source=(https://download.kde.org/stable/krita/$pkgver/$pkgname-$pkgver.tar.gz{,.sig}
+        find-xsimd.patch
+        https://invent.kde.org/graphics/krita/-/commit/e9184281.patch
+        https://invent.kde.org/graphics/krita/-/commit/bbee5eff.patch
+        exiv2-0.28.patch)
+sha256sums=('1c775ebef0f799a9a6b74440c3d906ab913c27541b177ed621704de714e9a4d3'
+            'SKIP'
+            '622c9ffbbfef72dd024b391b879c79ae34da11d52b2f3488dfd8ee42bf7b453b'
+            '3db041acee92d6e4238c47ad572142a930340858703f523baa32f129e6474060'
+            '0f52ba825ce0432e55c1c673d8ebbd34f4353470a6c27bdc55beb2a5446f9a4a'
+            'c17d5fa6362c6b4d1884ff3b84ce72ca78065d987192c36d59ea9256a1e8d74b')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD'  # Boudewijn Rempt <foundation@krita.org>
               'E9FB29E74ADEACC5E3035B8AB69EB4CF7468332F'  # Dmitry Kazakov (main key) <dimula73@gmail.com>
               '064182440C674D9F8D0F6F8B4DA79EDA231C852B') # Stichting Krita Foundation <foundation@krita.org>
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < find-xsimd.patch
+  patch -d $pkgname-$pkgver -p1 < e9184281.patch # Fix build with libheif 1.14.1
+  patch -d $pkgname-$pkgver -p1 < bbee5eff.patch # Fix crash when loading some TIFF files
+  patch -d $pkgname-$pkgver -p1 < exiv2-0.28.patch # Fix build with exiv2 0.28
+}
+
 build() {
-  cmake -B build -S $pkgname-$_pkgver \
+  cmake -B build -S $pkgname-$pkgver \
     -DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON \
     -DBUILD_TESTING=OFF
   cmake --build build