[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     267245ab6fdb960c355e02c3a1e37fd6b6336be5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 17:33:53 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 28 17:33:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=267245ab

media-gfx/krita: drop 5.2.3

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

 media-gfx/krita/Manifest                           |   1 -
 .../krita/files/krita-5.2.3-znver4-xsimd.patch     |  38 ------
 media-gfx/krita/krita-5.2.3.ebuild                 | 135 ---------------------
 3 files changed, 174 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 6071638e85ad..03f79f628ff9 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-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-5.2.3-znver4-xsimd.patch b/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch
deleted file mode 100644
index df5fffb41d47..000000000000
--- a/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/936296
-https://invent.kde.org/graphics/krita/-/commit/cf2c74220b7edfae53a0715346cb4e2c7dfc38ae
-
-From cf2c74220b7edfae53a0715346cb4e2c7dfc38ae Mon Sep 17 00:00:00 2001
-From: Dmitry Kazakov <dimula73@gmail.com>
-Date: Mon, 26 Aug 2024 14:38:03 +0200
-Subject: [PATCH] Don't use xsimd::default_arch in the pixel scaler code
-
-Gentoo seems to build Krita with a global -march=znver4 flag,
-which causes "scalar" version of the code to be compiled with
-AVX512. Even though it is not how the system is supposed to work
-(and this avx512-optimization will never be used in real runtime),
-we shouldn't fail compilation.
-
-https://bugs.gentoo.org/936296
-https://github.com/xtensor-stack/xsimd/issues/1044
---- a/libs/pigment/KoOptimizedPixelDataScalerU8ToU16.h
-+++ b/libs/pigment/KoOptimizedPixelDataScalerU8ToU16.h
-@@ -28,7 +28,7 @@ public:
-         const int numColorChannels = m_channelsPerPixel * numColumns;
- 
- #if defined(HAVE_XSIMD) && XSIMD_WITH_AVX2
--        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::default_arch>;
-+        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::avx2>;
-         using uint16_v = xsimd::batch<uint16_t, xsimd::sse4_1>;
-         using uint8_v = xsimd::batch<uint8_t, xsimd::sse4_1>;
- 
-@@ -129,7 +129,7 @@ public:
-         const int numColorChannels = m_channelsPerPixel * numColumns;
- 
- #if defined(HAVE_XSIMD) && XSIMD_WITH_AVX2
--        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::default_arch>;
-+        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::avx2>;
-         using uint16_v = xsimd::batch<uint16_t, xsimd::sse4_1>;
- 
-         const int channelsPerAvx2Block = 32;
--- 
-GitLab

diff --git a/media-gfx/krita/krita-5.2.3.ebuild b/media-gfx/krita/krita-5.2.3.ebuild
deleted file mode 100644
index 2c081af6668e..000000000000
--- a/media-gfx/krita/krita-5.2.3.ebuild
+++ /dev/null
@@ -1,135 +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.115.0
-QTMIN=5.15.12
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~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 jpeg2k jpegxl +mypaint-brush-engine openexr pdf media +raw +xsimd webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/libunibreak:=
-	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:= )
-	jpeg2k? ( media-libs/openjpeg:= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825:= )
-	heif? ( >=media-libs/libheif-1.11:=[x265] )
-	media? ( media-libs/mlt:= )
-	mypaint-brush-engine? ( media-libs/libmypaint:= )
-	openexr? ( media-libs/openexr:= )
-	pdf? ( app-text/poppler[qt5] )
-	raw? ( kde-apps/libkdcraw:5 )
-	webp? ( >=media-libs/libwebp-1.2.0:= )
-	xsimd? ( >=dev-cpp/xsimd-13.0.0 )
-
-"
-DEPEND="${RDEPEND}
-	dev-libs/immer
-	dev-libs/lager
-	dev-libs/zug
-"
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-
-PATCHES=(
-	# downstream
-	"${FILESDIR}"/${P}-tests-optional.patch
-	"${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
-	# git master
-	"${FILESDIR}"/${PN}-5.1.5-sip-6.8.patch # bug 919139
-	"${FILESDIR}"/${PN}-5.2.3-znver4-xsimd.patch # bug 936296
-)
-
-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
-		$(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 jpeg2k OpenJPEG)
-		$(cmake_use_find_package jpegxl JPEGXL)
-		$(cmake_use_find_package media Mlt7)
-		$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package raw KF5KDcraw)
-		$(cmake_use_find_package webp WebP)
-		$(cmake_use_find_package xsimd xsimd)
-	)
-
-	ecm_src_configure
-}