commit: 10138f205c3b67286431fce351868d1b265660b7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Sep 2 21:49:42 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Sep 2 21:51:16 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10138f20
media-gfx/krita: add 6.0.0_alpha_pre20250902 w/o keywords Bug: https://bugs.gentoo.org/955168 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/krita/Manifest | 1 + .../krita/files/krita-5.3.0-tests-optional.patch | 116 ++++++++++++++++++++ .../krita/krita-6.0.0_alpha_pre20250902.ebuild | 121 +++++++++++++++++++++ 3 files changed, 238 insertions(+) diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index c31c0e179e1c..14d56ccaea7d 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1 +1,2 @@ DIST krita-5.2.11.tar.xz 190966516 BLAKE2B 1626dcfeb593189cd9c0bf5ec7b51dc69691f5550837e5977f9f431daa6a7c9bb39895d5c7bed9c348bce8ada4bbfcb76b54f535c550c727b0acfe1dd190858d SHA512 1c388380f366118452f33ca028b4fb9ea134d8cd519f7878cc61d4f4fbd1d0fe51894fee9be8d4bed864d5d0df546986fae05812c9e25011516ce1000dd221de +DIST krita-6.0.0_alpha_pre20250902-cec72dd2.tar.gz 284205558 BLAKE2B 7b907b18c650c843b5c28af33dbe99ca023f470bdb8ea1fc9ab51768f00d214664af24d7289eec09deb5e942879738b31088486f0b63ff15f3a142e607e28577 SHA512 2854047e27bf654b955a585b4ba7b0903a20cc01b8b37f068fc7021f7085ab45f890e50b868843de0c44742a4bf094550a10ef3c933310f423342c2efbffdb54 diff --git a/media-gfx/krita/files/krita-5.3.0-tests-optional.patch b/media-gfx/krita/files/krita-5.3.0-tests-optional.patch new file mode 100644 index 000000000000..85f1b4adcafc --- /dev/null +++ b/media-gfx/krita/files/krita-5.3.0-tests-optional.patch @@ -0,0 +1,116 @@ +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 Qt${QT_MAJOR_VERSION}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 Qt${QT_MAJOR_VERSION}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 Qt${QT_MAJOR_VERSION}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) +From e0ba479d6e7a1a34ad9fc984605aef2872d653da Mon Sep 17 00:00:00 2001 +From: Lucio Sauer <[email protected]> +Date: Mon, 25 Aug 2025 13:20:34 +0200 +Subject: [PATCH] libs/koplugin: don't build tests when not testing + +Signed-off-by: Lucio Sauer <[email protected]> +--- + libs/koplugin/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/libs/koplugin/CMakeLists.txt b/libs/koplugin/CMakeLists.txt +index c3c6368..720ebe6 100644 +--- a/libs/koplugin/CMakeLists.txt ++++ b/libs/koplugin/CMakeLists.txt +@@ -28,4 +28,6 @@ set_target_properties(kritaplugin PROPERTIES + ) + install(TARGETS kritaplugin ${INSTALL_TARGETS_DEFAULT_ARGS} ) + +-add_subdirectory(tests) +\ No newline at end of file ++if (BUILD_TESTING) ++ add_subdirectory(tests) ++endif() +-- +2.49.1 + diff --git a/media-gfx/krita/krita-6.0.0_alpha_pre20250902.ebuild b/media-gfx/krita/krita-6.0.0_alpha_pre20250902.ebuild new file mode 100644 index 000000000000..e5e3b88a31c1 --- /dev/null +++ b/media-gfx/krita/krita-6.0.0_alpha_pre20250902.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KDE_ORG_COMMIT=cec72dd2575a562b967349169936b049b3076fc6 +PYTHON_COMPAT=( python3_{11..13} ) +KFMIN=6.9.0 +QTMIN=6.8.0 +inherit ecm kde.org python-single-r1 xdg + +DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" +HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"; + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="" +IUSE="color-management fftw gif +gsl heif jpeg2k jpegxl +mypaint-brush-engine openexr pdf media +raw webp" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# bug 630508 +RESTRICT="test" + +COMMON_DEPEND="${PYTHON_DEPS} + >=dev-cpp/xsimd-13.0.0 + dev-libs/boost:= + dev-libs/libunibreak:= + >=dev-libs/quazip-1.3-r2:0=[qt6(+)] + $(python_gen_cond_dep ' + dev-python/pyqt6[gui,qml,widgets,${PYTHON_USEDEP}] + dev-python/sip:=[${PYTHON_USEDEP}] + ') + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,-gles2-only,gui,network,opengl,sql,wayland,widgets,X,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + 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[qt6(-)] ) + raw? ( kde-apps/libkdcraw:6 ) + webp? ( >=media-libs/libwebp-1.2.0:= ) + +" +RDEPEND="${COMMON_DEPEND} + !${CATEGORY}/${PN}:5 +" +RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )" +DEPEND="${COMMON_DEPEND} + dev-libs/immer + dev-libs/lager + dev-libs/zug +" +BDEPEND=" + dev-cpp/eigen:3 + dev-lang/perl + sys-devel/gettext +" + +PATCHES=( + # downstream + "${FILESDIR}"/${PN}-5.3.0-tests-optional.patch + "${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518 +) + +src_configure() { + # Prevent sandbox violation from FindPyQt5.py module + # See Gentoo-bug 655918 + addpredict /dev/dri + + local mycmakeargs=( + -DBUILD_WITH_QT6=ON + -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 KDcrawQt6) + $(cmake_use_find_package webp WebP) + ) + ecm_src_configure +}
