media-gfx/krita: drop 5.1.5

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

7 files changed, 0 insertions, 379 deletions

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 57e97f2ef6ae..6071638e85ad 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,4 +1,2 @@
-DIST krita-5.1.5-exiv2-0.28.patch.xz 4664 BLAKE2B e364325be3d8e40e293a7d268136be3737ce5d2b9b5607f140b30ba3e687dc8d86545f4463348587711150f1652b521f87efc859a1bf2bc3b5ed704cf3236781 SHA512 130ba9cce7d6c0138f7ef6dab1445816c2e29752aa16643c32a7d9c00d7a156ac88f01afdb782ab03fc1e0822660a070f74c02e7cde4dfbcec30baaf3c3dba7f
-DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716 SHA512 b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1
 DIST krita-5.2.3.tar.xz 186685456 BLAKE2B 42943e7ebffdb46b9da085b2069701895e37ad9c457273b9217a095f1dfdf15c715cde0b88d440abb2d73dee656730da38844f11f27022885f87bb9cc9adab26 SHA512 69a0477e3119765dd53e0502fe5a64fcdc921dfcba3ddc5dec5c1bc4342a77b172b38276f134cc56f79741e6c47b51ef51786aadf0d178ce3955e24a9fd27b74
 DIST krita-5.2.6.tar.xz 186560016 BLAKE2B 788385983b371626214898391b08b1276a74b2ee3c9f01c1b1ae19d8791bfcf1ea1f59f6304643aeb6b16a2559fd2e45464596c721eb5d53546672d0efe17903 SHA512 8502ebef11ae066b298e999aba06df7858605cca14b889cec167b7ee3953b8ed86459b44ed90508d59bd7a9968cc9957309cefaa140a8d20293344f4dcb7fea7
diff --git a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
deleted file mode 100644
index 37f2ac50ffda..000000000000
--- a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2e9369281d44a2701ac7364568d381cca0d92ec5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 12 Jul 2020 18:55:31 +0200
-Subject: [PATCH] KritaAddBrokenUnitTest.cmake, MacroKritaAddBenchmark.cmake:
- Skip ecm_add_test early if Qt5::Test is not available
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- cmake/modules/KritaAddBrokenUnitTest.cmake | 4 ++++
- cmake/modules/MacroKritaAddBenchmark.cmake | 4 ++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/cmake/modules/KritaAddBrokenUnitTest.cmake b/cmake/modules/KritaAddBrokenUnitTest.cmake
-index b7d0e8d852..901a0a1f99 100644
---- a/cmake/modules/KritaAddBrokenUnitTest.cmake
-+++ b/cmake/modules/KritaAddBrokenUnitTest.cmake
-@@ -23,6 +23,10 @@ function(KRITA_ADD_BROKEN_UNIT_TEST)
-     message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"")
-   endif()
- 
-+  if(NOT TARGET Qt5::Test)
-+    return()
-+  endif()
-+
-   set(_testname ${ARG_NAME_PREFIX}${_targetname})
- 
-   # add test to the global list of disabled tests
-diff --git a/cmake/modules/MacroKritaAddBenchmark.cmake b/cmake/modules/MacroKritaAddBenchmark.cmake
-index c748d8e319..f804d9b8f4 100644
---- a/cmake/modules/MacroKritaAddBenchmark.cmake
-+++ b/cmake/modules/MacroKritaAddBenchmark.cmake
-@@ -23,6 +23,10 @@ macro (KRITA_ADD_BENCHMARK _test_NAME)
-         set(_nogui "NOGUI")
-     endif()
- 
-+    if(NOT TARGET Qt5::Test)
-+        return()
-+    endif()
-+
-     add_executable( ${_test_NAME} ${_srcList} )
-     ecm_mark_as_test(${_test_NAME})
- 
--- 
-2.27.0
-
-From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 17 Jun 2020 20:18:28 +0200
-Subject: [PATCH] Don't build tests when testing not requested
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-
-diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
-index cbdac265d2..1a50c1620a 100644
---- a/libs/flake/CMakeLists.txt
-+++ b/libs/flake/CMakeLists.txt
-@@ -9,8 +9,10 @@ include_directories(
- )
- 
- add_subdirectory(styles)
--add_subdirectory(tests)
--add_subdirectory(resources/tests)
-+if(BUILD_TESTING)
-+    add_subdirectory(tests)
-+    add_subdirectory(resources/tests)
-+endif()
- 
- set(kritaflake_SRCS
-     KoGradientHelper.cpp
-diff --git a/libs/image/tiles3/CMakeLists.txt b/libs/image/tiles3/CMakeLists.txt
-index 88c0516360..01f2383ddb 100644
---- a/libs/image/tiles3/CMakeLists.txt
-+++ b/libs/image/tiles3/CMakeLists.txt
-@@ -1 +1,3 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+    add_subdirectory(tests)
-+endif()
--- 
-2.27.0
diff --git a/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch b/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch
deleted file mode 100644
index a578f22c67f9..000000000000
--- a/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From ace7edcca6ad322581ab39620f21ccf3ffbd3b5a Mon Sep 17 00:00:00 2001
-From: Timo Gurr <timo.gurr@gmail.com>
-Date: Fri, 5 Jan 2024 14:04:50 +0000
-Subject: [PATCH] Fix build with libjxl 0.9.0
-
-Fix build with libjxl 0.9.0
-
-BUG:478987
-
-Test Plan
----------
-
-* Upgrade to libjxl 0.9.0
-* Apply patch from MR and build krita (5.2.2)
-* Open/Display a sample image e.g. https://jpegxl.info/test-page/red-room.jxl
-
-Formalities Checklist
----------------------
-
-- [x] I confirmed this builds.
-- [x] I confirmed Krita ran and the relevant functions work (Could successfully open/display a sample image https://jpegxl.info/test-page/red-room.jxl).
-- [ ] I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
-- [x] I made sure my commits build individually and have good descriptions as per [KDE guidelines](https://community.kde.org/Policies/Commit_Policy).
-- [x] I made sure my code conforms to the standards set in the HACKING file.
-- [x] I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per [KDE Licensing Policy](https://community.kde.org/Policies/Licensing_Policy).
-
-_**Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build.**_
-_**If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.**_
----
- plugins/impex/jxl/JPEGXLImport.cpp | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/impex/jxl/JPEGXLImport.cpp b/plugins/impex/jxl/JPEGXLImport.cpp
-index 573bae41247..f5b989b3b70 100644
---- a/plugins/impex/jxl/JPEGXLImport.cpp
-+++ b/plugins/impex/jxl/JPEGXLImport.cpp
-@@ -511,7 +511,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
-             JxlColorEncoding colorEncoding{};
-             if (JXL_DEC_SUCCESS
-                 == JxlDecoderGetColorAsEncodedProfile(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
-                                                       nullptr,
-+#endif
-                                                       JXL_COLOR_PROFILE_TARGET_DATA,
-                                                       &colorEncoding)) {
-                 const TransferCharacteristics transferFunction = [&]() {
-@@ -635,7 +637,12 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
-                 size_t iccSize = 0;
-                 QByteArray iccProfile;
-                 if (JXL_DEC_SUCCESS
--                    != JxlDecoderGetICCProfileSize(dec.get(), nullptr, JXL_COLOR_PROFILE_TARGET_DATA, &iccSize)) {
-+                    != JxlDecoderGetICCProfileSize(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
-+                                                   nullptr,
-+#endif
-+                                                   JXL_COLOR_PROFILE_TARGET_DATA,
-+                                                   &iccSize)) {
-                     errFile << "ICC profile size retrieval failed";
-                     document->setErrorMessage(i18nc("JPEG-XL errors", "Unable to read the image profile."));
-                     return ImportExportCodes::ErrorWhileReading;
-@@ -643,7 +650,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
-                 iccProfile.resize(static_cast<int>(iccSize));
-                 if (JXL_DEC_SUCCESS
-                     != JxlDecoderGetColorAsICCProfile(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
-                                                       nullptr,
-+#endif
-                                                       JXL_COLOR_PROFILE_TARGET_DATA,
-                                                       reinterpret_cast<uint8_t *>(iccProfile.data()),
-                                                       static_cast<size_t>(iccProfile.size()))) {
--- 
-GitLab
-
diff --git a/media-gfx/krita/files/krita-5.1.5-lto.patch b/media-gfx/krita/files/krita-5.1.5-lto.patch
deleted file mode 100644
index 0cccee5be00e..000000000000
--- a/media-gfx/krita/files/krita-5.1.5-lto.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2c4dd042df1518d67c117ced08c5a2f3729c3193 Mon Sep 17 00:00:00 2001
-From: Dmitry Kazakov <dimula73@gmail.com>
-Date: Tue, 30 Jan 2024 15:30:53 +0100
-Subject: [PATCH] Possibly fix ODR violation in the transform tool strategies
-
-BUG:480520
-
-
-(cherry picked from commit e33c7d7d533d5289c3a37007f8cf574af5bc7102)
----
- plugins/tools/tool_transform2/kis_free_transform_strategy.cpp  | 2 ++
- .../tool_transform2/kis_perspective_transform_strategy.cpp     | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
-index 49486b6bd7c..8a63bce74e3 100644
---- a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
-+++ b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
-@@ -23,6 +23,7 @@
- #include "kis_algebra_2d.h"
- 
- 
-+namespace {
- enum StrokeFunction {
-     ROTATE = 0,
-     MOVE,
-@@ -41,6 +42,7 @@ enum StrokeFunction {
-     MOVECENTER,
-     PERSPECTIVE
- };
-+}
- 
- struct KisFreeTransformStrategy::Private
- {
-diff --git a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
-index ad1d9ffe4d3..bca5b51e13f 100644
---- a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
-+++ b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
-@@ -23,7 +23,7 @@
- #include "kis_transform_utils.h"
- #include "kis_free_transform_strategy_gsl_helpers.h"
- 
--
-+namespace {
- enum StrokeFunction {
-     DRAG_HANDLE = 0,
-     DRAG_X_VANISHING_POINT,
-@@ -43,6 +43,7 @@ enum HandleIndexes {
-     HANDLE_MIDDLE_RIGHT,
-     HANDLE_COUNT,
- };
-+}
- 
- struct KisPerspectiveTransformStrategy::Private
- {
--- 
-GitLab
-
diff --git a/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch b/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch
deleted file mode 100644
index 534e24469e8a..000000000000
--- a/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 48edd05f32241c537cedf2831efc5eb91a112291 Mon Sep 17 00:00:00 2001
-From: killy |0veufOrever <80536642@qq.com>
-Date: Tue, 19 Sep 2023 02:18:54 +0000
-Subject: [PATCH] Update OCIO to version 2.3.0
-
----
- 3rdparty/ext_ocio/CMakeLists.txt                    | 4 ++--
- plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-From 21d384fe9fafde2f45f7339a2234f4022c53152f Mon Sep 17 00:00:00 2001
-From: killy |0veufOrever <80536642@qq.com>
-Date: Tue, 19 Sep 2023 03:17:17 +0000
-Subject: [PATCH] Dimensions are not required when the OCIO version is less
- than 2.3.0
-
----
- plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
- 
-diff --git a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
---- a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
-+++ b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
-@@ -507,7 +507,13 @@
-         unsigned height = 0;
-         OCIO::GpuShaderDesc::TextureType channel = OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL;
-         OCIO::Interpolation interpolation = OCIO::INTERP_LINEAR;
-+
-+#if OCIO_VERSION_HEX >= 0x2030000
-+        OCIO::GpuShaderCreator::TextureDimensions dimensions;
-+        shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, dimensions, interpolation);
-+#else
-         shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, interpolation);
-+#endif
- 
-         if (!textureName || !*textureName || !samplerName || !*samplerName || width == 0) {
-             errOpenGL << "The texture data is corrupted";
diff --git a/media-gfx/krita/krita-5.1.5.ebuild b/media-gfx/krita/krita-5.1.5.ebuild
deleted file mode 100644
index 9c80758f6367..000000000000
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{10..12} )
-KFMIN=5.82.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-exiv2-0.28.patch.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif jpegxl +mypaint-brush-engine openexr pdf qtmedia +raw webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip:0=[qt5(+)]
-	$(python_gen_cond_dep '
-		dev-python/pyqt5[declarative,gui,widgets,${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-	')
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( >=media-libs/opencolorio-2.0.0 )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825:= )
-	heif? ( >=media-libs/libheif-1.11:=[x265] )
-	mypaint-brush-engine? ( media-libs/libmypaint:= )
-	openexr? ( media-libs/openexr:= )
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
-	webp? ( >=media-libs/libwebp-1.2.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3.1-tests-optional.patch"
-	"${WORKDIR}/${P}-exiv2-0.28.patch" # bug 906472
-	"${FILESDIR}/${P}-ocio-2.3.0.patch" # bug 915107
-	"${FILESDIR}/${P}-sip-6.8.patch" # bug 919139
-	"${FILESDIR}/${P}-libjxl-0.9.patch" # bug 922524
-	"${FILESDIR}/${P}-lto.patch" # bug 922520
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		-DENABLE_UPDATERS=OFF
-		-DKRITA_ENABLE_PCH=OFF # big mess.
-		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
-		-DCMAKE_DISABLE_FIND_PACKAGE_xsimd=ON # not packaged
-		$(cmake_use_find_package color-management OpenColorIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpegxl JPEGXL)
-		$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package webp WebP)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index c586507e3736..82ce837b7102 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
 		<flag name="media">Enable sound support for animations via <pkg>media-libs/mlt</pkg></flag>
 		<flag name="mypaint-brush-engine">Enable MyPaint brush engine support <pkg>media-libs/libmypaint</pkg></flag>
-		<flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="xsimd">Enable usage of SIMD instructions via <pkg>dev-cpp/xsimd</pkg></flag>
 	</use>
 </pkgmetadata>