commit: 07feba52ea302f7ea9205d3a3aaadf88ca764541 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jul 13 19:31:19 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jul 13 19:58:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07feba52
media-gfx/krita: add 5.2.3 Bug: https://bugs.gentoo.org/921972 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/krita/Manifest | 1 + .../krita/files/krita-5.2.3-tests-optional.patch | 90 ++++++++++++++ media-gfx/krita/krita-5.2.3.ebuild | 134 +++++++++++++++++++++ 3 files changed, 225 insertions(+) diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 48438ab65058..04a9cb5b8e5f 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,3 +1,4 @@ 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.2.tar.xz 189146788 BLAKE2B 1cfb9f404258467f2cc616bc0320a463f7291d2fe75c76b873982c3741d1f21a338aabed60bc216628e54ae01f7ba52d3b713c3a00d920b03645cba23927d207 SHA512 d2e55d9a6c7be79f5b6661a1bd605cdf1ce20ec78cdaab1ba19a4acca5397afa0c0e8bc1cbf60120993b156aef65ed35fde2de756841342d18221c82ea81a1eb +DIST krita-5.2.3.tar.xz 186685456 BLAKE2B 42943e7ebffdb46b9da085b2069701895e37ad9c457273b9217a095f1dfdf15c715cde0b88d440abb2d73dee656730da38844f11f27022885f87bb9cc9adab26 SHA512 69a0477e3119765dd53e0502fe5a64fcdc921dfcba3ddc5dec5c1bc4342a77b172b38276f134cc56f79741e6c47b51ef51786aadf0d178ce3955e24a9fd27b74 diff --git a/media-gfx/krita/files/krita-5.2.3-tests-optional.patch b/media-gfx/krita/files/krita-5.2.3-tests-optional.patch new file mode 100644 index 000000000000..48d9e314a295 --- /dev/null +++ b/media-gfx/krita/files/krita-5.2.3-tests-optional.patch @@ -0,0 +1,90 @@ +From 2e9369281d44a2701ac7364568d381cca0d92ec5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +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 <[email protected]> +--- + 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 <[email protected]> +Date: Wed, 17 Jun 2020 20:18:28 +0200 +Subject: [PATCH] Don't build tests when testing not requested + +Signed-off-by: Andreas Sturmlechner <[email protected]> + +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() +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1246,7 +1246,9 @@ + ${CMAKE_CURRENT_BINARY_DIR} + ) + ++if(BUILD_TESTING) + add_subdirectory(sdk/tests) ++endif() + + add_subdirectory(libs) + add_subdirectory(plugins) diff --git a/media-gfx/krita/krita-5.2.3.ebuild b/media-gfx/krita/krita-5.2.3.ebuild new file mode 100644 index 000000000000..266fe59b4453 --- /dev/null +++ b/media-gfx/krita/krita-5.2.3.ebuild @@ -0,0 +1,134 @@ +# 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" +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:= ) + webp? ( >=media-libs/libwebp-1.2.0:= ) + xsimd? ( dev-cpp/xsimd ) + +" +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 +) + +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 +}
