$ git diff --patch-with-stat --summary 6dd515f70a82d921e3c26b2acdc6d271f57844f8..6db995e8d7a4c8b74230cbd871f4f21d0dc48161
.abf.yml | 5 ++-
25f67fc173b3d425113bea67a46078dbd9b59a3c.patch | 31 ---------------
krita-4.4.3-find-quazip-1.1.patch | 52 --------------------------
krita-4.4.3-libstdc++-11.patch | 23 ------------
krita-5.0.2-gmic-compile.patch | 10 ++---
krita.spec | 31 ++++++---------
6 files changed, 19 insertions(+), 133 deletions(-)
delete mode 100644 25f67fc173b3d425113bea67a46078dbd9b59a3c.patch
delete mode 100644 krita-4.4.3-find-quazip-1.1.patch
delete mode 100644 krita-4.4.3-libstdc++-11.patch
diff --git a/.abf.yml b/.abf.yml
index 2d097cc..c7219fc 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,4 @@
sources:
- krita-5.0.2.tar.xz: 9625b7447398a4da3366738d2ae132b049f99ab5
- gmic-3.0.0.2-patched.tar.gz: cf0b4563961fc1026a84c3c81236e0f9c25caf58
+ krita-5.1.5.tar.xz: 490a34eb1e6844c5771279ced086c38ce8d247d6
+ gmic-3.1.6.1-patched.tar.gz: e3746f78375371d27ed5ea7976b970e903690863
+ v3.1.6.1.tar.gz: fb41d353660d6b1f603392876af717c7faddf2b9
diff --git a/25f67fc173b3d425113bea67a46078dbd9b59a3c.patch b/25f67fc173b3d425113bea67a46078dbd9b59a3c.patch
deleted file mode 100644
index 04cfb50..0000000
--- a/25f67fc173b3d425113bea67a46078dbd9b59a3c.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 25f67fc173b3d425113bea67a46078dbd9b59a3c Mon Sep 17 00:00:00 2001
-From: "L. E. Segovia" <amy@amyspark.me>
-Date: Thu, 23 Dec 2021 14:16:43 -0300
-Subject: [PATCH] Update G'MIC to 3.0.0 patch 2
-
-BUG: 447286
-
-BUG: 447290
-(cherry picked from commit 0aced718ebe7845d26e4a881f0ef6cc139c6abe5)
----
- 3rdparty_plugins/ext_gmic/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/3rdparty_plugins/ext_gmic/CMakeLists.txt b/3rdparty_plugins/ext_gmic/CMakeLists.txt
-index f45f12ab83..3c196ea565 100644
---- a/3rdparty_plugins/ext_gmic/CMakeLists.txt
-+++ b/3rdparty_plugins/ext_gmic/CMakeLists.txt
-@@ -2,8 +2,8 @@ SET(PREFIX_ext_gmic "${EXTPREFIX}" )
-
- ExternalProject_Add( ext_gmic
- DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-- URL https://files.kde.org/krita/build/dependencies/gmic-3.0.0.1-patched.tar.gz
-- URL_HASH SHA256=05e25367af01039a97c52d48694f00daf36ee180fa68220f72522aaf245a782b
-+ URL https://files.kde.org/krita/build/dependencies/gmic-3.0.0.2-patched.tar.gz
-+ URL_HASH SHA256=22d4104fb83f6c9f4d6045ba3cd634e3df1995a803890f56199ed8664fe463b6
-
- SOURCE_SUBDIR gmic-qt
-
---
-GitLab
-
diff --git a/krita-4.4.3-find-quazip-1.1.patch b/krita-4.4.3-find-quazip-1.1.patch
deleted file mode 100644
index f193ddc..0000000
--- a/krita-4.4.3-find-quazip-1.1.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -up krita-5.0.0/CMakeLists.txt.1~ krita-5.0.0/CMakeLists.txt
---- krita-5.0.0/CMakeLists.txt.1~ 2021-12-20 11:16:15.000000000 +0100
-+++ krita-5.0.0/CMakeLists.txt 2021-12-23 13:55:17.310666833 +0100
-@@ -993,16 +993,17 @@ set_package_properties(Poppler PROPERTIE
- ##
- ## Test for quazip
- ##
--find_package(QuaZip 0.6)
-+find_package(QuaZip-Qt5 REQUIRED)
- set_package_properties(QuaZip PROPERTIES
- DESCRIPTION "A library for reading and writing zip files"
- URL "https://stachenov.github.io/quazip/"
- TYPE REQUIRED
- PURPOSE "Needed for reading and writing KRA and ORA files"
- )
-+include_directories(/usr/include/QuaZip-Qt5-1.1/quazip)
-
- # FIXME: better way to do this?
--list (APPEND ANDROID_EXTRA_LIBS ${QUAZIP_LIBRARIES}
-+list (APPEND ANDROID_EXTRA_LIBS QuaZip::QuaZip
- ${EXPAT_LIBRARY}
- ${KF5_LIBRARIES}/libssl_1_1.so
- ${KF5_LIBRARIES}/libcrypto_1_1.so
-diff -up krita-5.0.0/libs/store/CMakeLists.txt.1~ krita-5.0.0/libs/store/CMakeLists.txt
---- krita-5.0.0/libs/store/CMakeLists.txt.1~ 2021-12-20 11:16:15.000000000 +0100
-+++ krita-5.0.0/libs/store/CMakeLists.txt 2021-12-23 13:52:47.546275503 +0100
-@@ -1,3 +1,4 @@
-+find_package(QuaZip-Qt5 REQUIRED)
- include_directories(${QUAZIP_INCLUDE_DIRS})
-
- add_subdirectory(tests)
-@@ -24,7 +25,7 @@ target_link_libraries(kritastore
- KF5::ConfigCore
- Qt5::Xml
- Qt5::Gui
-- ${QUAZIP_LIBRARIES}
-+ QuaZip::QuaZip
- )
-
- set_target_properties(kritastore PROPERTIES
-diff -up krita-5.0.0/CMakeLists.txt.omv~ krita-5.0.0/CMakeLists.txt
---- krita-5.0.0/CMakeLists.txt.omv~ 2021-12-23 15:02:24.337737295 +0100
-+++ krita-5.0.0/CMakeLists.txt 2021-12-23 15:03:20.118777693 +0100
-@@ -1001,6 +1001,7 @@ set_package_properties(QuaZip PROPERTIES
- PURPOSE "Needed for reading and writing KRA and ORA files"
- )
- include_directories(/usr/include/QuaZip-Qt5-1.1/quazip)
-+set(QUAZIP_LIBRARIES -lquazip1-qt5)
-
- # FIXME: better way to do this?
- list (APPEND ANDROID_EXTRA_LIBS QuaZip::QuaZip
-diff -up krita-5.0.0/libs/resources/CMakeLists.txt.omv~ krita-5.0.0/libs/resources/CMakeLists.txt
diff --git a/krita-4.4.3-libstdc++-11.patch b/krita-4.4.3-libstdc++-11.patch
deleted file mode 100644
index 0de4595..0000000
--- a/krita-4.4.3-libstdc++-11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up krita-4.4.3/libs/pigment/KoAlphaMaskApplicatorFactoryImpl.cpp.omv~ krita-4.4.3/libs/pigment/KoAlphaMaskApplicatorFactoryImpl.cpp
---- krita-4.4.3/libs/pigment/KoAlphaMaskApplicatorFactoryImpl.cpp.omv~ 2021-05-14 05:40:18.964774379 +0200
-+++ krita-4.4.3/libs/pigment/KoAlphaMaskApplicatorFactoryImpl.cpp 2021-05-14 05:40:28.076799794 +0200
-@@ -18,6 +18,7 @@
-
- #include "KoAlphaMaskApplicatorFactoryImpl.h"
- #include "KoAlphaMaskApplicator.h"
-+#include <limits>
-
- #include <KoConfig.h>
- #ifdef HAVE_OPENEXR
-diff -up krita-4.4.3/libs/pigment/KoAlphaMaskApplicatorFactoryImpl.h.omv~ krita-4.4.3/libs/pigment/KoAlphaMaskApplicatorFactoryImpl.h
---- krita-4.4.3/libs/pigment/KoAlphaMaskApplicatorFactoryImpl.h.omv~ 2021-05-14 05:41:56.014183341 +0200
-+++ krita-4.4.3/libs/pigment/KoAlphaMaskApplicatorFactoryImpl.h 2021-05-14 05:42:01.579215503 +0200
-@@ -18,6 +18,7 @@
- #ifndef KOALPHAMASKAPPLICATORFACTORYIMPL_H
- #define KOALPHAMASKAPPLICATORFACTORYIMPL_H
-
-+#include <limits>
- #include <KoAlphaMaskApplicatorBase.h>
- #include <KoVcMultiArchBuildSupport.h>
-
-diff -up krita-4.4.3/libs/pigment/KoAlphaMaskApplicatorFactoryImpl_Scalar.cpp.omv~ krita-4.4.3/libs/pigment/KoAlphaMaskApplicatorFactoryImpl_Scalar.cpp
diff --git a/krita-5.0.2-gmic-compile.patch b/krita-5.0.2-gmic-compile.patch
index acefb12..2da841e 100644
--- a/krita-5.0.2-gmic-compile.patch
+++ b/krita-5.0.2-gmic-compile.patch
@@ -1,12 +1,12 @@
-diff -up krita-5.0.2/3rdparty_plugins/ext_gmic/CMakeLists.txt.omv~ krita-5.0.2/3rdparty_plugins/ext_gmic/CMakeLists.txt
---- krita-5.0.2/3rdparty_plugins/ext_gmic/CMakeLists.txt.omv~ 2022-01-26 13:35:51.839179305 +0100
-+++ krita-5.0.2/3rdparty_plugins/ext_gmic/CMakeLists.txt 2022-01-26 23:00:04.088241206 +0100
+diff -up krita-5.0.8/3rdparty_plugins/ext_gmic/CMakeLists.txt.5~ krita-5.0.8/3rdparty_plugins/ext_gmic/CMakeLists.txt
+--- krita-5.0.8/3rdparty_plugins/ext_gmic/CMakeLists.txt.5~ 2022-05-26 11:24:07.203787118 +0200
++++ krita-5.0.8/3rdparty_plugins/ext_gmic/CMakeLists.txt 2022-05-26 11:24:58.900804982 +0200
@@ -9,7 +9,7 @@ ExternalProject_Add( ext_gmic
INSTALL_DIR ${PREFIX_ext_gmic}
-- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_gmic} -DGMIC_QT_HOST=krita-plugin -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
-+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_gmic} -DGMIC_QT_HOST=krita-plugin -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DKIS_IMAGE_INTERFACE_DIR=${INSTALL_ROOT}/include/
+- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_gmic} -DGMIC_QT_HOST=krita-plugin -DENABLE_SYSTEM_GMIC=FALSE -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
++ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_gmic} -DGMIC_QT_HOST=krita-plugin -DENABLE_SYSTEM_GMIC=FALSE -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DKIS_IMAGE_INTERFACE_DIR=${INSTALL_ROOT}/include/
LIST_SEPARATOR "|"
UPDATE_COMMAND ""
diff --git a/krita.spec b/krita.spec
index f8ffb9a..b6a37fc 100644
--- a/krita.spec
+++ b/krita.spec
@@ -6,22 +6,18 @@
#define _disable_lto 1
Name: krita
-Version: 5.0.2
-Release: 3
+Version: 5.1.5
+Release: 1
Source0: http://download.kde.org/stable/krita/%(echo %{version} |cut -d. -f1-3)/%{name}-%{version}%{?beta:%{beta}}.tar.xz
# The krita plugin requires a patched version of gmic
-Source1: https://files.kde.org/krita/build/dependencies/gmic-3.0.0.2-patched.tar.gz
+Source1: https://github.com/amyspark/gmic/archive/refs/tags/v3.1.6.1.tar.gz
Source1000: %{name}.rpmlintrc
#ifarch %{arm} %{armx}
#Patch0: krita-4.4.2-OpenMandriva-fix-build-with-OpenGLES-aarch64-and-armvhnl.patch
#endif
-Patch0: krita-4.4.3-find-quazip-1.1.patch
-Patch1: krita-4.4.3-libstdc++-11.patch
# Fix build with SSE
-Patch2: krita-4.4.8-sse-compile.patch
+#Patch2: krita-4.4.8-sse-compile.patch
Patch3: krita-5.0.0-fix-libatomic-linkage.patch
-# Update gmic
-Patch4: https://invent.kde.org/graphics/krita/-/commit/25f67fc173b3d425113bea67a46078dbd9b59a3c.patch
# And make it compile
Patch5: krita-5.0.2-gmic-compile.patch
@@ -59,6 +55,10 @@ BuildRequires: cmake(KF5ItemViews)
BuildRequires: cmake(KF5WindowSystem)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5Crash)
+#BuildRequires: cmake(KSeExpr)
+# FIXME figure out why -- doesn't look like anything is
+# actually insane enough to link libjpeg statically
+BuildRequires: jpeg-static-devel
BuildRequires: cmake(QuaZip-Qt5)
# x86 package
%ifarch %{ix86} %{x86_64}
@@ -91,7 +91,6 @@ BuildRequires: pkgconfig(OpenColorIO) >= 2
BuildRequires: pkgconfig(poppler-qt5)
BuildRequires: pkgconfig(xcb-util)
BuildRequires: pkgconfig(zlib)
-BuildRequires: gmic-devel
# for gmic
BuildRequires: pkgconfig(libavcodec)
BuildRequires: atomic-devel
@@ -115,6 +114,8 @@ Obsoletes: %{_lib}kritacolord < %{EVRD}
Obsoletes: %{_lib}kritacolor14 < %{EVRD}
Obsoletes: %{_lib}kritalibpaintop14 < %{EVRD}
Obsoletes: %{_lib}kritaui14 < %{EVRD}
+# This used to be part of gmic, it's now part of krita
+%rename krita-plugin-gmic
%define langlist af ar ast be bg br bs ca cs cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hne hr hu ia is it ja kk km ko lt lv mai mk mr ms nb nds ne nl nn oc pa pl pt pt_BR ro ru se sk sl sq sv ta tg th tr ug uk uz vi wa xh zh_CN zh_TW
@@ -127,17 +128,6 @@ and textures for rendering.
%prep
%autosetup -p1 -n %{name}-%{version}%{?beta:%{beta}}
-
-# We need to use the system version
-rm cmake/modules/FindQuaZip.cmake
-
-# As of Krita 4.3.0 and boost 1.73, krita failed to build due error:
-# /usr/include/boost/geometry/index/detail/rtree/node/variant_visitor.hpp:51:5: error: no matching function for call to 'apply_visitor'
-# boost::apply_visitor(v, n);
-# Looks like krita want to build with c++11 and this cause issue, to fix we need force c++14 here (angry)
-# Fix stolen from https://bugs.gentoo.org/728744
-sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
-
%cmake_kde5 \
-DUSE_QT_XCB:BOOL=TRUE \
-DENABLE_BSYMBOLICFUNCTIONS:BOOL=TRUE \
@@ -196,3 +186,4 @@ rm -f %{buildroot}%{_bindir}/AppImageUpdateDummy
%{_datadir}/kritaplugins
%{_datadir}/color/icc/krita
%{_datadir}/color-schemes/Krita*.colors
+%{_datadir}/gmic