diff options
Diffstat (limited to 'media-gfx/krita')
-rw-r--r-- | media-gfx/krita/Manifest | 5 | ||||
-rw-r--r-- | media-gfx/krita/files/krita-4.3.0-tests-optional.patch | 536 | ||||
-rw-r--r-- | media-gfx/krita/krita-4.3.0.ebuild | 127 | ||||
-rw-r--r-- | media-gfx/krita/krita-4.4.1.ebuild | 2 |
4 files changed, 2 insertions, 668 deletions
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 33b9e0c93785..e1b71f99f0d5 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,8 +1,5 @@ -AUX krita-4.3.0-tests-optional.patch 16252 BLAKE2B 17c329e534f0591a63429416d6a9718948e4052160e318ff7f79ea1b7ff2e4e0135c0bbc2b3eff8aa843895c0e1ddb84722c0dff8c3e3eddc942f2a809129634 SHA512 e38428b2ac55516312cb6d01b1b17cc255d21fe7a57d5f36ca4eebf8023624af91b31c25a19f04d829f2dfee5896b5bb5275ecbf5ae61423951024501f690927 AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59 -DIST krita-4.3.0.tar.xz 166246720 BLAKE2B 74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c SHA512 5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4 DIST krita-4.4.1.tar.xz 169788052 BLAKE2B fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190 SHA512 8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccaaaadbc1b1f8bcbcdeb607909fee710afe -EBUILD krita-4.3.0.ebuild 3352 BLAKE2B f208f12608511dcb60794fecc77c53612271aa4c41270c08f676846ba8c26b682656b584272641ea8a6e99be894fd17ea853dd14332ee492b0a1f80d19dc5ff0 SHA512 9af651db98a10f23c45b58b4f444eb65a3b3d5a895df9a4b6657a2fa1d122e4f5569dcb8bc2154295325d1341c4b1ab308e827862be59d1834e94a7e25dcc3bc -EBUILD krita-4.4.1.ebuild 3379 BLAKE2B ecb1eaa51f8745e6e18c54154c432e37e5dc9e78a226d91dd906b3118784e068f19272a347eab1906448ba0d9fe8c6101c19cca1d15f3056eed8a9db6060a9f9 SHA512 e3c9ce1a6cbe4bb119f8914c2e24376446ba980a5c4952325204f98e76651fc9be6f00d7b41504b40ba3f74e8f72a964961e1ccd1f1a7305d96716513cee4c8b +EBUILD krita-4.4.1.ebuild 3378 BLAKE2B cb688076e24516790628ca8e9220d9bd4f6096fc53a0c2ed975edda112583ac4621f84dc28317518eac63e7d51c010576c7bcea6532e57d16a4d7fd219efcf68 SHA512 477c8ca1d6b694f3fb72c976b4ed478a615cbd108aa1a671427e84827f415ad264d4f5b4aa533831dc9f01cd05fdf6868b200f8133856a7741a3a8fb91184bae MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd 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 deleted file mode 100644 index b58dcf1f4a87..000000000000 --- a/media-gfx/krita/files/krita-4.3.0-tests-optional.patch +++ /dev/null @@ -1,536 +0,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/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 deleted file mode 100644 index 745d2ca7bf00..000000000000 --- a/media-gfx/krita/krita-4.3.0.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# 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://apps.kde.org/en/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_prepare() { - ecm_src_prepare - sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die -} - -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 -} diff --git a/media-gfx/krita/krita-4.4.1.ebuild b/media-gfx/krita/krita-4.4.1.ebuild index 1b8485696af3..c33ac85cc1b7 100644 --- a/media-gfx/krita/krita-4.4.1.ebuild +++ b/media-gfx/krita/krita-4.4.1.ebuild @@ -13,7 +13,7 @@ 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" + KEYWORDS="amd64 ~ppc64 ~x86" fi DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" |