From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
Date: Thu, 18 Jun 2020 23:03:59 +0000 (UTC) [thread overview]
Message-ID: <1592521421.4823065bff02a67c88b3d685354b4062c74dd4e8.asturm@gentoo> (raw)
commit: 4823065bff02a67c88b3d685354b4062c74dd4e8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 17 16:49:55 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 23:03:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4823065b
media-gfx/krita: 4.3.0 version bump
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 +
.../krita/files/krita-4.3.0-tests-optional.patch | 536 +++++++++++++++++++++
media-gfx/krita/krita-4.3.0.ebuild | 122 +++++
3 files changed, 659 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index acb7f9fd647..65b1492d8b1 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
DIST krita-4.2.9.tar.xz 170082028 BLAKE2B dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66 SHA512 66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0
+DIST krita-4.3.0.tar.xz 166246720 BLAKE2B 74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c SHA512 5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4
diff --git a/media-gfx/krita/files/krita-4.3.0-tests-optional.patch b/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
new file mode 100644
index 00000000000..b58dcf1f4a8
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
@@ -0,0 +1,536 @@
+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/brush/CMakeLists.txt b/libs/brush/CMakeLists.txt
+index 536b1a4ac5..7d8435eec4 100644
+--- a/libs/brush/CMakeLists.txt
++++ b/libs/brush/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${EIGEN3_INCLUDE_DIR}
+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/global/CMakeLists.txt b/libs/global/CMakeLists.txt
+index e8162c5e46..f6ea6bc840 100644
+--- a/libs/global/CMakeLists.txt
++++ b/libs/global/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ include(CheckFunctionExists)
+ check_function_exists(backtrace HAVE_BACKTRACE)
+diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
+index 810dee2f16..44c72ba2d5 100644
+--- a/libs/image/CMakeLists.txt
++++ b/libs/image/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ add_subdirectory( tiles3 )
+
+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()
+diff --git a/libs/libkis/CMakeLists.txt b/libs/libkis/CMakeLists.txt
+index 958104aaaf..3b8a33eadc 100644
+--- a/libs/libkis/CMakeLists.txt
++++ b/libs/libkis/CMakeLists.txt
+@@ -48,4 +48,6 @@ set_target_properties(kritalibkis PROPERTIES
+ install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+diff --git a/libs/metadata/CMakeLists.txt b/libs/metadata/CMakeLists.txt
+index d33aff38fc..abdc2f7a36 100644
+--- a/libs/metadata/CMakeLists.txt
++++ b/libs/metadata/CMakeLists.txt
+@@ -29,4 +29,6 @@ set_target_properties(kritametadata PROPERTIES
+
+ install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+diff --git a/libs/odf/CMakeLists.txt b/libs/odf/CMakeLists.txt
+index 6acbf4d1a5..50e60b55d8 100644
+--- a/libs/odf/CMakeLists.txt
++++ b/libs/odf/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(kritaodf_LIB_SRCS
+ KoOdf.cpp
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index 7e38c6cb00..60879fcea2 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -33,8 +33,10 @@ else()
+ set(__per_arch_alpha_applicator_factory_objs KoAlphaMaskApplicatorFactoryImpl.cpp)
+ endif()
+
+-add_subdirectory(tests)
+-add_subdirectory(benchmarks)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++ add_subdirectory(benchmarks)
++endif()
+
+ set(kritapigment_SRCS
+ DebugPigment.cpp
+diff --git a/libs/store/CMakeLists.txt b/libs/store/CMakeLists.txt
+index b7c42996bd..30f9d5c5c6 100644
+--- a/libs/store/CMakeLists.txt
++++ b/libs/store/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ include_directories(${QUAZIP_INCLUDE_DIRS})
+
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(kritastore_LIB_SRCS
+ KoDirectoryStore.cpp
+diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
+index d273bf548a..d180fd8970 100644
+--- a/libs/ui/CMakeLists.txt
++++ b/libs/ui/CMakeLists.txt
+@@ -13,7 +13,9 @@ if (ANDROID)
+ include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+ endif()
+
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ if (APPLE)
+ find_library(FOUNDATION_LIBRARY Foundation)
+diff --git a/libs/widgets/CMakeLists.txt b/libs/widgets/CMakeLists.txt
+index 75eded9db1..c0093cfd3a 100644
+--- a/libs/widgets/CMakeLists.txt
++++ b/libs/widgets/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+diff --git a/libs/widgetutils/CMakeLists.txt b/libs/widgetutils/CMakeLists.txt
+index c62eeafb79..c33b16dd91 100644
+--- a/libs/widgetutils/CMakeLists.txt
++++ b/libs/widgetutils/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
+
+diff --git a/plugins/color/lcms2engine/CMakeLists.txt b/plugins/color/lcms2engine/CMakeLists.txt
+index e14de2ba7c..8c56372cb3 100644
+--- a/plugins/color/lcms2engine/CMakeLists.txt
++++ b/plugins/color/lcms2engine/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ project( lcmsengine )
+
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${LCMS2_INCLUDE_DIR}
+diff --git a/plugins/dockers/animation/CMakeLists.txt b/plugins/dockers/animation/CMakeLists.txt
+index a0b4b4beb4..b3de3f2749 100644
+--- a/plugins/dockers/animation/CMakeLists.txt
++++ b/plugins/dockers/animation/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-if (NOT WIN32 AND NOT APPLE)
++if(BUILD_TESTING AND NOT WIN32 AND NOT APPLE)
+ add_subdirectory(tests)
+ endif()
+
+diff --git a/plugins/dockers/lut/CMakeLists.txt b/plugins/dockers/lut/CMakeLists.txt
+index 01844be146..6745db73e6 100644
+--- a/plugins/dockers/lut/CMakeLists.txt
++++ b/plugins/dockers/lut/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${OCIO_INCLUDE_DIR}
+diff --git a/plugins/extensions/qmic/CMakeLists.txt b/plugins/extensions/qmic/CMakeLists.txt
+index afd390b726..f5766c1b50 100644
+--- a/plugins/extensions/qmic/CMakeLists.txt
++++ b/plugins/extensions/qmic/CMakeLists.txt
+@@ -20,4 +20,6 @@ add_library(kritaqmic MODULE ${kritaqmic_SOURCES})
+ target_link_libraries(kritaqmic kritaui)
+ install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+diff --git a/plugins/filters/CMakeLists.txt b/plugins/filters/CMakeLists.txt
+index 63a5de64e9..f8b4467926 100644
+--- a/plugins/filters/CMakeLists.txt
++++ b/plugins/filters/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+diff --git a/plugins/filters/unsharp/CMakeLists.txt b/plugins/filters/unsharp/CMakeLists.txt
+index e63725abb1..5a61b5f89c 100644
+--- a/plugins/filters/unsharp/CMakeLists.txt
++++ b/plugins/filters/unsharp/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(kritaunsharpfilter_SOURCES
+ unsharp.cpp
+diff --git a/plugins/impex/brush/CMakeLists.txt b/plugins/impex/brush/CMakeLists.txt
+index b0343eddd4..ef7c617a40 100644
+--- a/plugins/impex/brush/CMakeLists.txt
++++ b/plugins/impex/brush/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(kritabrushexport_PART_SRCS
+ kis_brush_export.cpp
+diff --git a/plugins/impex/csv/CMakeLists.txt b/plugins/impex/csv/CMakeLists.txt
+index 60eba64463..cf6e6ac9bd 100644
+--- a/plugins/impex/csv/CMakeLists.txt
++++ b/plugins/impex/csv/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ # import
+
+diff --git a/plugins/impex/exr/CMakeLists.txt b/plugins/impex/exr/CMakeLists.txt
+index aa39a91879..c80833941f 100644
+--- a/plugins/impex/exr/CMakeLists.txt
++++ b/plugins/impex/exr/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS} )
+
+diff --git a/plugins/impex/gif/CMakeLists.txt b/plugins/impex/gif/CMakeLists.txt
+index bb7f582b6c..b95c9d3d07 100644
+--- a/plugins/impex/gif/CMakeLists.txt
++++ b/plugins/impex/gif/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(kritagifexport_SOURCES
+ kis_gif_export.cpp
+diff --git a/plugins/impex/heif/CMakeLists.txt b/plugins/impex/heif/CMakeLists.txt
+index d25f3e1704..a7f663b13f 100644
+--- a/plugins/impex/heif/CMakeLists.txt
++++ b/plugins/impex/heif/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}")
+diff --git a/plugins/impex/heightmap/CMakeLists.txt b/plugins/impex/heightmap/CMakeLists.txt
+index a8b03308d9..04e0f1000a 100644
+--- a/plugins/impex/heightmap/CMakeLists.txt
++++ b/plugins/impex/heightmap/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+
+diff --git a/plugins/impex/jp2/CMakeLists.txt b/plugins/impex/jp2/CMakeLists.txt
+index c9393f6cfa..b4333025aa 100644
+--- a/plugins/impex/jp2/CMakeLists.txt
++++ b/plugins/impex/jp2/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenJPEG_CFLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenJPEG_CFLAGS}")
+diff --git a/plugins/impex/jpeg/CMakeLists.txt b/plugins/impex/jpeg/CMakeLists.txt
+index 50edb05c96..eaa90964a7 100644
+--- a/plugins/impex/jpeg/CMakeLists.txt
++++ b/plugins/impex/jpeg/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
+
+diff --git a/plugins/impex/libkra/CMakeLists.txt b/plugins/impex/libkra/CMakeLists.txt
+index 2b840c1e8a..88d849172f 100644
+--- a/plugins/impex/libkra/CMakeLists.txt
++++ b/plugins/impex/libkra/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(kritalibkra_LIB_SRCS
+ kis_colorize_dom_utils.cpp
+diff --git a/plugins/impex/ora/CMakeLists.txt b/plugins/impex/ora/CMakeLists.txt
+index a476f422b4..0f4e563505 100644
+--- a/plugins/impex/ora/CMakeLists.txt
++++ b/plugins/impex/ora/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(libkritaconverter_LIB_SRCS
+ ora_converter.cpp
+diff --git a/plugins/impex/pdf/CMakeLists.txt b/plugins/impex/pdf/CMakeLists.txt
+index 320da291a4..c423ff4214 100644
+--- a/plugins/impex/pdf/CMakeLists.txt
++++ b/plugins/impex/pdf/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp )
+
+diff --git a/plugins/impex/png/CMakeLists.txt b/plugins/impex/png/CMakeLists.txt
+index d567e8059e..6d3815f06f 100644
+--- a/plugins/impex/png/CMakeLists.txt
++++ b/plugins/impex/png/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(kritapngimport_SOURCES
+ kis_png_import.cc
+diff --git a/plugins/impex/psd/CMakeLists.txt b/plugins/impex/psd/CMakeLists.txt
+index 4112536da2..f81598d01d 100644
+--- a/plugins/impex/psd/CMakeLists.txt
++++ b/plugins/impex/psd/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-if (NOT MSVC AND NOT APPLE)
++if(BUILD_TESTING AND NOT MSVC AND NOT APPLE)
+ add_subdirectory(tests)
+ endif()
+
+diff --git a/plugins/impex/qimageio/CMakeLists.txt b/plugins/impex/qimageio/CMakeLists.txt
+index c916af4870..f1a068e9c2 100644
+--- a/plugins/impex/qimageio/CMakeLists.txt
++++ b/plugins/impex/qimageio/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(kritaqimageioexport_SOURCES
+ kis_qimageio_export.cpp
+diff --git a/plugins/impex/qml/CMakeLists.txt b/plugins/impex/qml/CMakeLists.txt
+index e53156905a..1dff196ac5 100644
+--- a/plugins/impex/qml/CMakeLists.txt
++++ b/plugins/impex/qml/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(kritaqmlexport_SOURCES
+ qml_converter.cc
+diff --git a/plugins/impex/raw/CMakeLists.txt b/plugins/impex/raw/CMakeLists.txt
+index 71cb5b355c..70241a8903 100644
+--- a/plugins/impex/raw/CMakeLists.txt
++++ b/plugins/impex/raw/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ if(OPENEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIRS})
+diff --git a/plugins/impex/svg/CMakeLists.txt b/plugins/impex/svg/CMakeLists.txt
+index 8f803a2783..6642112c11 100644
+--- a/plugins/impex/svg/CMakeLists.txt
++++ b/plugins/impex/svg/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(kritasvgimport_SOURCES
+ kis_svg_import.cc
+diff --git a/plugins/impex/tga/CMakeLists.txt b/plugins/impex/tga/CMakeLists.txt
+index b7fe804897..79c2aff4d4 100644
+--- a/plugins/impex/tga/CMakeLists.txt
++++ b/plugins/impex/tga/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(kritatgaexport_SOURCES
+ kis_tga_export.cpp
+diff --git a/plugins/impex/tiff/CMakeLists.txt b/plugins/impex/tiff/CMakeLists.txt
+index 8e57566510..0ee181c9bc 100644
+--- a/plugins/impex/tiff/CMakeLists.txt
++++ b/plugins/impex/tiff/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(libkritatiffconverter_LIB_SRCS
+ kis_tiff_converter.cc
+diff --git a/plugins/impex/xcf/CMakeLists.txt b/plugins/impex/xcf/CMakeLists.txt
+index d76985be87..a754b686ba 100644
+--- a/plugins/impex/xcf/CMakeLists.txt
++++ b/plugins/impex/xcf/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
+
+diff --git a/plugins/paintops/defaultpaintops/CMakeLists.txt b/plugins/paintops/defaultpaintops/CMakeLists.txt
+index 68ac300940..35cd140838 100644
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt
++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(brush/tests)
++if(BUILD_TESTING)
++ add_subdirectory(brush/tests)
++endif()
+
+ include_directories(brush
+ duplicate
+diff --git a/plugins/paintops/libpaintop/CMakeLists.txt b/plugins/paintops/libpaintop/CMakeLists.txt
+index 4d6d831760..59ca6657ca 100644
+--- a/plugins/paintops/libpaintop/CMakeLists.txt
++++ b/plugins/paintops/libpaintop/CMakeLists.txt
+@@ -103,5 +103,6 @@ set_target_properties(kritalibpaintop PROPERTIES
+
+ install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+-
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+diff --git a/plugins/tools/basictools/CMakeLists.txt b/plugins/tools/basictools/CMakeLists.txt
+index 9d725a7c7a..0221e604be 100644
+--- a/plugins/tools/basictools/CMakeLists.txt
++++ b/plugins/tools/basictools/CMakeLists.txt
+@@ -1,6 +1,6 @@
+-if (NOT APPLE)
++if(BUILD_TESTING AND NOT APPLE)
+ add_subdirectory(tests)
+-endif ()
++endif()
+
+ set(kritadefaulttools_SOURCES
+ default_tools.cc
+diff --git a/plugins/tools/tool_transform2/CMakeLists.txt b/plugins/tools/tool_transform2/CMakeLists.txt
+index e90230c48e..2cf727a991 100644
+--- a/plugins/tools/tool_transform2/CMakeLists.txt
++++ b/plugins/tools/tool_transform2/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-if (NOT WIN32 AND NOT APPLE)
++if(BUILD_TESTING AND NOT WIN32 AND NOT APPLE)
+ add_subdirectory(tests)
+ endif()
+
+--
+2.27.0
+
diff --git a/media-gfx/krita/krita-4.3.0.ebuild b/media-gfx/krita/krita-4.3.0.ebuild
new file mode 100644
index 00000000000..2bd200f968e
--- /dev/null
+++ b/media-gfx/krita/krita-4.3.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+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/${PN}-4.2.9-patchset.tar.xz"
+ KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/org.kde.krita https://krita.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+ dev-cpp/eigen:3
+ dev-lang/perl
+ sys-devel/gettext
+"
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=
+ dev-libs/quazip
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+ dev-python/sip[${PYTHON_MULTI_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/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}: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/libpng:0=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXi
+ color-management? ( media-libs/opencolorio )
+ fftw? ( sci-libs/fftw:3.0= )
+ gif? ( media-libs/giflib )
+ gsl? ( sci-libs/gsl:= )
+ jpeg? ( virtual/jpeg:0 )
+ heif? ( media-libs/libheif:= )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr
+ )
+ pdf? ( app-text/poppler[qt5] )
+ qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+ raw? ( media-libs/libraw:= )
+ tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+ vc? ( >=dev-libs/vc-1.1.0 )
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-tests-optional.patch
+ "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+)
+
+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=(
+ $(cmake_use_find_package color-management OCIO)
+ $(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 jpeg JPEG)
+ $(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 tiff TIFF)
+ $(cmake_use_find_package vc Vc)
+ )
+
+ ecm_src_configure
+}
next reply other threads:[~2020-06-18 23:04 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-18 23:03 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-02 21:51 [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/ Andreas Sturmlechner
2025-07-16 21:25 Andreas Sturmlechner
2024-08-26 23:37 Sam James
2024-07-13 19:59 Andreas Sturmlechner
2024-07-13 18:02 Sam James
2024-02-05 20:26 Andreas Sturmlechner
2023-12-26 8:59 Andreas Sturmlechner
2022-12-20 19:00 Andreas Sturmlechner
2022-06-15 17:18 Andreas Sturmlechner
2021-12-29 16:34 Andreas Sturmlechner
2021-11-15 13:37 Andreas Sturmlechner
2021-08-10 18:14 Andreas Sturmlechner
2021-06-20 8:33 Andreas Sturmlechner
2020-12-17 10:23 Andreas Sturmlechner
2020-04-03 14:57 Andreas Sturmlechner
2019-07-31 9:45 Andreas Sturmlechner
2019-01-14 16:04 Andreas Sturmlechner
2018-12-28 17:48 Andreas Sturmlechner
2018-11-09 18:54 Andreas Sturmlechner
2018-09-01 19:31 Andreas Sturmlechner
2018-08-29 16:48 Andreas Sturmlechner
2018-08-29 16:48 Andreas Sturmlechner
2017-09-08 21:00 Johannes Huber
2017-07-01 13:41 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1592521421.4823065bff02a67c88b3d685354b4062c74dd4e8.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox