From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4E781138334 for ; Thu, 27 Jun 2019 17:21:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FD00E0899; Thu, 27 Jun 2019 17:21:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C8B3FE0896 for ; Thu, 27 Jun 2019 17:21:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5EB88346BB8 for ; Thu, 27 Jun 2019 17:21:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 151F76D2 for ; Thu, 27 Jun 2019 17:21:20 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1561655883.a9b8decf11a9e648fc3e5cc175018b22a834f8d9.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/krita/Manifest media-gfx/krita/files/krita-4.2.2-fixuifiles.patch media-gfx/krita/files/krita-4.2.2-tests-optional.patch media-gfx/krita/krita-4.2.2.ebuild X-VCS-Directories: media-gfx/krita/ media-gfx/krita/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a9b8decf11a9e648fc3e5cc175018b22a834f8d9 X-VCS-Branch: master Date: Thu, 27 Jun 2019 17:21:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b1162108-cea2-43e9-97c4-b46def5ef43b X-Archives-Hash: 38256223fb761df8099ba2ebd3891d85 commit: a9b8decf11a9e648fc3e5cc175018b22a834f8d9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jun 27 16:08:05 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jun 27 17:18:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b8decf media-gfx/krita: 4.2.2 version bump Package-Manager: Portage-2.3.67, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/krita/Manifest | 1 + media-gfx/krita/files/krita-4.2.2-fixuifiles.patch | 25 ++ .../krita/files/krita-4.2.2-tests-optional.patch | 405 +++++++++++++++++++++ media-gfx/krita/krita-4.2.2.ebuild | 121 ++++++ 4 files changed, 552 insertions(+) diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 41abb11141a..2e2c22bf373 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,2 +1,3 @@ DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9 DIST krita-4.2.1.tar.gz 245929278 BLAKE2B 06544424bae7965be2fbf7a0e9d4fc260de80f16e6f8beba600432139e20f4c9bde24244d5b8ce5573fbc354ee0461c6930255f47798618998b895828a682390 SHA512 879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1 +DIST krita-4.2.2.tar.gz 246075662 BLAKE2B 0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e SHA512 7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096 diff --git a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch new file mode 100644 index 00000000000..1703386a3c7 --- /dev/null +++ b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch @@ -0,0 +1,25 @@ +From e46ad1f917705d84dc5562c2f261a06eb70a57b9 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 25 Jun 2019 06:57:40 +0200 +Subject: fixuifiles + +--- + libs/widgetutils/tests/dialogsavertestwidget.ui | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/libs/widgetutils/tests/dialogsavertestwidget.ui b/libs/widgetutils/tests/dialogsavertestwidget.ui +index 66e70b3..ba0f54f 100644 +--- a/libs/widgetutils/tests/dialogsavertestwidget.ui ++++ b/libs/widgetutils/tests/dialogsavertestwidget.ui +@@ -10,9 +10,6 @@ + 300 + + +- +- Form +- + + + +-- +cgit v1.1 diff --git a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch new file mode 100644 index 00000000000..2df715be04f --- /dev/null +++ b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch @@ -0,0 +1,405 @@ +--- a/plugins/filters/CMakeLists.txt 2019-06-27 18:48:55.049823682 +0200 ++++ b/plugins/filters/CMakeLists.txt 2019-06-27 18:48:55.056823729 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + add_subdirectory( blur ) + add_subdirectory( colors ) + add_subdirectory( colorsfilters ) +--- a/plugins/filters/unsharp/CMakeLists.txt 2019-06-27 18:48:55.063823776 +0200 ++++ b/plugins/filters/unsharp/CMakeLists.txt 2019-06-27 18:48:55.069823817 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + set(kritaunsharpfilter_SOURCES + unsharp.cpp +--- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-27 18:48:55.077823871 +0200 ++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-27 18:48:55.084823918 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(brush/tests) ++endif() + + include_directories(brush + duplicate +--- a/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-27 18:48:55.092823972 +0200 ++++ b/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-27 18:48:55.098824013 +0200 +@@ -104,4 +104,6 @@ + install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS}) + + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/plugins/dockers/lut/CMakeLists.txt 2019-06-27 18:48:55.105824060 +0200 ++++ b/plugins/dockers/lut/CMakeLists.txt 2019-06-27 18:48:55.112824107 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories(SYSTEM + ${OCIO_INCLUDE_DIR} +--- a/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.120824161 +0200 ++++ b/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.124824188 +0200 +@@ -1,5 +1,7 @@ + if (NOT WIN32 AND NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++add_subdirectory(tests) ++endif() + endif() + + set(KRITA_ANIMATIONDOCKER_SOURCES +--- a/plugins/extensions/qmic/CMakeLists.txt 2019-06-27 18:48:55.132824242 +0200 ++++ b/plugins/extensions/qmic/CMakeLists.txt 2019-06-27 18:48:55.136824270 +0200 +@@ -20,4 +20,6 @@ + target_link_libraries(kritaqmic kritaui) + install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/plugins/tools/basictools/CMakeLists.txt 2019-06-27 18:48:55.141824303 +0200 ++++ b/plugins/tools/basictools/CMakeLists.txt 2019-06-27 18:48:55.146824337 +0200 +@@ -1,5 +1,7 @@ + if (NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++add_subdirectory(tests) ++endif() + endif () + + set(kritadefaulttools_SOURCES +--- a/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 18:48:55.151824371 +0200 ++++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 18:48:55.155824398 +0200 +@@ -1,5 +1,7 @@ + if (NOT WIN32 AND NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++add_subdirectory(tests) ++endif() + endif() + + set(kritatooltransform_SOURCES +--- a/plugins/impex/ppm/CMakeLists.txt 2019-06-27 18:48:55.163824452 +0200 ++++ b/plugins/impex/ppm/CMakeLists.txt 2019-06-27 18:48:55.169824492 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) + +--- a/plugins/impex/svg/CMakeLists.txt 2019-06-27 18:48:55.175824533 +0200 ++++ b/plugins/impex/svg/CMakeLists.txt 2019-06-27 18:48:55.180824567 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritasvgimport_SOURCES + kis_svg_import.cc +--- a/plugins/impex/brush/CMakeLists.txt 2019-06-27 18:48:55.186824607 +0200 ++++ b/plugins/impex/brush/CMakeLists.txt 2019-06-27 18:48:55.190824634 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritabrushexport_PART_SRCS + kis_brush_export.cpp +--- a/plugins/impex/psd/CMakeLists.txt 2019-06-27 18:48:55.195824668 +0200 ++++ b/plugins/impex/psd/CMakeLists.txt 2019-06-27 18:48:55.199824695 +0200 +@@ -1,5 +1,7 @@ + if (NOT MSVC AND NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++add_subdirectory(tests) ++endif() + endif() + + configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h) +--- a/plugins/impex/tga/CMakeLists.txt 2019-06-27 18:48:55.206824742 +0200 ++++ b/plugins/impex/tga/CMakeLists.txt 2019-06-27 18:48:55.210824769 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritatgaexport_SOURCES + kis_tga_export.cpp +--- a/plugins/impex/libkra/CMakeLists.txt 2019-06-27 18:48:55.216824810 +0200 ++++ b/plugins/impex/libkra/CMakeLists.txt 2019-06-27 18:48:55.221824844 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritalibkra_LIB_SRCS + kis_colorize_dom_utils.cpp +--- a/plugins/impex/jpeg/CMakeLists.txt 2019-06-27 18:48:55.228824891 +0200 ++++ b/plugins/impex/jpeg/CMakeLists.txt 2019-06-27 18:48:55.233824924 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms") + +--- a/plugins/impex/gif/CMakeLists.txt 2019-06-27 18:48:55.239824965 +0200 ++++ b/plugins/impex/gif/CMakeLists.txt 2019-06-27 18:48:55.243824992 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritagifexport_SOURCES + kis_gif_export.cpp +--- a/plugins/impex/exr/CMakeLists.txt 2019-06-27 18:48:55.248825026 +0200 ++++ b/plugins/impex/exr/CMakeLists.txt 2019-06-27 18:48:55.253825060 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} ) + +--- a/plugins/impex/xcf/CMakeLists.txt 2019-06-27 18:48:55.260825107 +0200 ++++ b/plugins/impex/xcf/CMakeLists.txt 2019-06-27 18:48:55.268825160 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools") + +--- a/plugins/impex/tiff/CMakeLists.txt 2019-06-27 18:48:55.277825221 +0200 ++++ b/plugins/impex/tiff/CMakeLists.txt 2019-06-27 18:48:55.283825262 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(libkritatiffconverter_LIB_SRCS + kis_tiff_converter.cc +--- a/plugins/impex/ora/CMakeLists.txt 2019-06-27 18:48:55.290825310 +0200 ++++ b/plugins/impex/ora/CMakeLists.txt 2019-06-27 18:48:55.295825343 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(libkritaconverter_LIB_SRCS + ora_converter.cpp +--- a/plugins/impex/heif/CMakeLists.txt 2019-06-27 18:48:55.302825391 +0200 ++++ b/plugins/impex/heif/CMakeLists.txt 2019-06-27 18:48:55.309825438 +0200 +@@ -1,4 +1,6 @@ ++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}") +--- a/plugins/impex/pdf/CMakeLists.txt 2019-06-27 18:48:55.317825492 +0200 ++++ b/plugins/impex/pdf/CMakeLists.txt 2019-06-27 18:48:55.322825526 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp ) + +--- a/plugins/impex/csv/CMakeLists.txt 2019-06-27 18:48:55.332825593 +0200 ++++ b/plugins/impex/csv/CMakeLists.txt 2019-06-27 18:48:55.339825640 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + # import + +--- a/plugins/impex/heightmap/CMakeLists.txt 2019-06-27 18:48:55.347825694 +0200 ++++ b/plugins/impex/heightmap/CMakeLists.txt 2019-06-27 18:48:55.352825728 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) + +--- a/plugins/impex/raw/CMakeLists.txt 2019-06-27 18:48:55.359825775 +0200 ++++ b/plugins/impex/raw/CMakeLists.txt 2019-06-27 18:48:55.365825816 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + if(OPENEXR_FOUND) + include_directories(${OPENEXR_INCLUDE_DIR}) +--- a/plugins/impex/qimageio/CMakeLists.txt 2019-06-27 18:48:55.371825857 +0200 ++++ b/plugins/impex/qimageio/CMakeLists.txt 2019-06-27 18:48:55.376825890 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritaqimageioexport_SOURCES + kis_qimageio_export.cpp +--- a/plugins/impex/qml/CMakeLists.txt 2019-06-27 18:48:55.383825938 +0200 ++++ b/plugins/impex/qml/CMakeLists.txt 2019-06-27 18:48:55.389825978 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritaqmlexport_SOURCES + qml_converter.cc +--- a/plugins/impex/png/CMakeLists.txt 2019-06-27 18:48:55.396826025 +0200 ++++ b/plugins/impex/png/CMakeLists.txt 2019-06-27 18:48:55.401826059 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritapngimport_SOURCES + kis_png_import.cc +--- a/plugins/color/lcms2engine/CMakeLists.txt 2019-06-27 18:48:55.408826106 +0200 ++++ b/plugins/color/lcms2engine/CMakeLists.txt 2019-06-27 18:48:55.412826133 +0200 +@@ -1,6 +1,8 @@ + project( lcmsengine ) + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories(SYSTEM + ${LCMS2_INCLUDE_DIR} +--- a/libs/brush/CMakeLists.txt 2019-06-27 18:48:55.417826167 +0200 ++++ b/libs/brush/CMakeLists.txt 2019-06-27 18:48:55.421826194 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + include_directories(SYSTEM + ${EIGEN3_INCLUDE_DIR} +--- a/libs/global/CMakeLists.txt 2019-06-27 18:48:55.426826228 +0200 ++++ b/libs/global/CMakeLists.txt 2019-06-27 18:48:55.430826255 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + include(CheckFunctionExists) + check_function_exists(backtrace HAVE_BACKTRACE) +--- a/libs/image/CMakeLists.txt 2019-06-27 18:48:55.435826289 +0200 ++++ b/libs/image/CMakeLists.txt 2019-06-27 18:48:55.438826309 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + add_subdirectory( tiles3 ) + +--- a/libs/image/tiles3/CMakeLists.txt 2019-06-27 18:48:55.444826350 +0200 ++++ b/libs/image/tiles3/CMakeLists.txt 2019-06-27 18:48:55.447826370 +0200 +@@ -1 +1,3 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/libs/odf/CMakeLists.txt 2019-06-27 18:48:55.452826404 +0200 ++++ b/libs/odf/CMakeLists.txt 2019-06-27 18:48:55.456826430 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + set(kritaodf_LIB_SRCS + KoOdf.cpp +--- a/libs/metadata/CMakeLists.txt 2019-06-27 18:48:55.461826464 +0200 ++++ b/libs/metadata/CMakeLists.txt 2019-06-27 18:48:55.465826491 +0200 +@@ -29,4 +29,6 @@ + + install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS}) + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/libs/store/CMakeLists.txt 2019-06-27 18:48:55.470826525 +0200 ++++ b/libs/store/CMakeLists.txt 2019-06-27 18:48:55.473826545 +0200 +@@ -1,6 +1,8 @@ + include_directories(${QUAZIP_INCLUDE_DIRS}) + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritastore_LIB_SRCS + KoDirectoryStore.cpp +--- a/libs/libkis/CMakeLists.txt 2019-06-27 18:48:55.478826579 +0200 ++++ b/libs/libkis/CMakeLists.txt 2019-06-27 18:48:55.482826605 +0200 +@@ -47,4 +47,6 @@ + install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS}) + + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/libs/widgetutils/CMakeLists.txt 2019-06-27 18:48:55.487826640 +0200 ++++ b/libs/widgetutils/CMakeLists.txt 2019-06-27 18:48:55.491826667 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h ) + +--- a/libs/widgets/CMakeLists.txt 2019-06-27 18:48:55.496826701 +0200 ++++ b/libs/widgets/CMakeLists.txt 2019-06-27 18:48:55.500826727 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +--- a/libs/flake/CMakeLists.txt 2019-06-27 18:48:55.505826761 +0200 ++++ b/libs/flake/CMakeLists.txt 2019-06-27 18:48:55.510826795 +0200 +@@ -9,7 +9,9 @@ + ) + + add_subdirectory(styles) ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritaflake_SRCS + KoGradientHelper.cpp +--- a/libs/ui/CMakeLists.txt 2019-06-27 18:48:55.516826836 +0200 ++++ b/libs/ui/CMakeLists.txt 2019-06-27 18:48:55.520826863 +0200 +@@ -7,7 +7,9 @@ + ${OCIO_INCLUDE_DIR} + ) + ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + if (APPLE) + find_library(FOUNDATION_LIBRARY Foundation) +--- a/libs/pigment/CMakeLists.txt 2019-06-27 18:48:55.526826903 +0200 ++++ b/libs/pigment/CMakeLists.txt 2019-06-27 18:48:55.530826930 +0200 +@@ -31,7 +31,9 @@ + message("${__per_arch_factory_objs}") + endif() + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + add_subdirectory(benchmarks) + + set(kritapigment_SRCS diff --git a/media-gfx/krita/krita-4.2.2.ebuild b/media-gfx/krita/krita-4.2.2.ebuild new file mode 100644 index 00000000000..5a7e08cbf68 --- /dev/null +++ b/media-gfx/krita/krita-4.2.2.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KDE_TEST="forceoptional" +QT_MINIMAL="5.12.3" +VIRTUALX_REQUIRED="test" +PYTHON_COMPAT=( python3_{5,6,7} ) +inherit kde5 python-single-r1 + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" +HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/" +LICENSE="GPL-3" +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 +" +COMMON_DEPEND="${PYTHON_DEPS} + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kitemmodels) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui '-gles2' '' '5=') + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + $(add_qt_dep qtxml) + dev-libs/boost:= + dev-libs/quazip + dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/sip[${PYTHON_USEDEP}] + media-gfx/exiv2:= + media-libs/lcms + media-libs/libpng:0= + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libxcb + 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? ( $(add_qt_dep qtmultimedia) ) + raw? ( media-libs/libraw:= ) + tiff? ( media-libs/tiff:0 ) +" +DEPEND="${COMMON_DEPEND} + vc? ( >=dev-libs/vc-1.1.0 ) +" +RDEPEND="${COMMON_DEPEND} + !app-office/calligra:4[calligra_features_krita] + !app-office/calligra-l10n:4[calligra_features_krita(+)] +" + +# bug 630508 +RESTRICT+=" test" + +PATCHES=( + "${FILESDIR}"/${P}-tests-optional.patch + "${FILESDIR}"/${P}-fixuifiles.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + kde5_pkg_setup +} + +src_configure() { + # Prevent sandbox violation from FindPyQt5.py module + # See Gentoo-bug 655918 + addpredict /dev/dri + + local mycmakeargs=( + $(cmake-utils_use_find_package color-management OCIO) + $(cmake-utils_use_find_package fftw FFTW3) + $(cmake-utils_use_find_package gif GIF) + $(cmake-utils_use_find_package gsl GSL) + $(cmake-utils_use_find_package heif HEIF) + $(cmake-utils_use_find_package jpeg JPEG) + $(cmake-utils_use_find_package openexr OpenEXR) + $(cmake-utils_use_find_package pdf Poppler) + $(cmake-utils_use_find_package qtmedia Qt5Multimedia) + $(cmake-utils_use_find_package raw LibRaw) + $(cmake-utils_use_find_package tiff TIFF) + $(cmake-utils_use_find_package vc Vc) + ) + + kde5_src_configure +}