From 02c699a77a7fe7f1adbfdfc2bebe949b688365f2 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Oct 2023 19:22:46 +0200 Subject: [PATCH] krita: update to 5.2.0 --- common/shlibs | 2 +- srcpkgs/krita/patches/libraw-0.21.patch | 28 ------------------------- srcpkgs/krita/template | 10 +++++---- 3 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 srcpkgs/krita/patches/libraw-0.21.patch diff --git a/common/shlibs b/common/shlibs index bb14c2b3119..cb2757a48ff 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3892,7 +3892,7 @@ libJudy.so.1 judy-1.0.5_1 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2 libKSeExprUI.so.4 seexpr-krita-4.0.4.0_1 libKSeExpr.so.4 seexpr-krita-4.0.4.0_1 -libkritaqmicinterface.so.17 krita-5.0.0_1 +libkritaqmicinterface.so.19 krita-5.2.0_1 liburing.so.2 liburing-2.0_1 libbson-1.0.so.0 libbson-1.17.4_2 libsonic.so.0 libsonic-0.2.0_1 diff --git a/srcpkgs/krita/patches/libraw-0.21.patch b/srcpkgs/krita/patches/libraw-0.21.patch deleted file mode 100644 index fd2d40e5cc7..00000000000 --- a/srcpkgs/krita/patches/libraw-0.21.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e753d2453d1614b65b288e49fa5d5371764feaa8 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Sun, 18 Dec 2022 16:28:38 +0100 -Subject: [PATCH] Fix build with libraw 0.21 - ---- - plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp -index dcaecc6fa71..71425f909c2 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) --- -GitLab - diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index 84a9ff309a5..a4d3de04b04 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita -version=5.0.8 -revision=9 +version=5.2.0 +revision=1 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config python3 @@ -15,14 +15,15 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel poppler-qt5-devel giflib-devel python3-devel python3-PyQt5 python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc - qt5-plugin-pgsql qt5-plugin-tds libwebp-devel libmypaint-devel libjxl-devel" + qt5-plugin-pgsql qt5-plugin-tds libwebp-devel libmypaint-devel libjxl-devel + libkdcraw5-devel immer zug lager libunibreak-devel mlt7-devel xsimd" depends="qt5-plugin-sqlite" short_desc="Painting and image editing program" maintainer="John " license="GPL-3.0-only" homepage="https://krita.org/" distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.xz" -checksum=4c221a3c7bbbb8d3297ffe9032c8946cbd835623f22b27f08f617aaa4e496083 +checksum=299dfd5c9090a8aea115352d01d165c01f904e80ad4f796db8a006b0efa06495 python_version=3 replaces="calligra-krita>=0" # FIXME @@ -37,6 +38,7 @@ pre_configure() { if [ "$CROSS_BUILD" ]; then configure_args+=" -D_find_sip_py=$wrksrc/cmake/modules/FindSIP.py" configure_args+=" -D_find_pyqt5_py=$wrksrc/cmake/modules/FindPyQt5.py" + configure_args+=" -DTIFF_CAN_WRITE_PSD_TAGS_EXITCODE=0" fi }