summaryrefslogtreecommitdiff
path: root/media-gfx/krita
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/krita')
-rw-r--r--media-gfx/krita/Manifest8
-rw-r--r--media-gfx/krita/files/krita-4.2.4-tests-optional.patch399
-rw-r--r--media-gfx/krita/files/krita-4.3.1-tests-optional.patch80
-rw-r--r--media-gfx/krita/krita-4.3.0.ebuild4
-rw-r--r--media-gfx/krita/krita-4.4.1.ebuild (renamed from media-gfx/krita/krita-4.2.9.ebuild)25
5 files changed, 101 insertions, 415 deletions
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 8f672481b618..33b9e0c93785 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,8 +1,8 @@
-AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
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.2.9.tar.xz 170082028 BLAKE2B dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66 SHA512 66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0
DIST krita-4.3.0.tar.xz 166246720 BLAKE2B 74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c SHA512 5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4
-EBUILD krita-4.2.9.ebuild 3244 BLAKE2B 258e95d2a887e08bf8f57a35fd2a862a409d298f7638ba8c8f3a514ea4620a33ed17f3f390de944d286c2af96333e7ded6a061ce0488ee6fe2a6a8201bbf391f SHA512 3c01812b04489bbd292db164ff55244d237a54e707f43c756d4b2811beded4cb69aee065baa80bf20c67d319d97cdecf3d6a5f50fb761f377fe5cb38c583c034
-EBUILD krita-4.3.0.ebuild 3375 BLAKE2B a31a068f53e926e2763cb59d53f7a3a73dd6778fd8c66943c857657b8fac05eb2157e04cb835fd226ed939e6793554883e48cc9b6db7505d3570cecbf542d221 SHA512 352fbd63af6e738fad0654a886181bd22525c4d5c9e34681cce52476aef7b5c62eb88f12dba85c20ddcc24f6d08478f5102c62e7614e5de15a7a17a9841ffbdd
+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
MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.2.4-tests-optional.patch b/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
deleted file mode 100644
index 2f13c999b67e..000000000000
--- a/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
+++ /dev/null
@@ -1,399 +0,0 @@
---- a/plugins/filters/CMakeLists.txt 2019-07-31 11:22:19.572862843 +0200
-+++ b/plugins/filters/CMakeLists.txt 2019-07-31 11:22:19.576862870 +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-07-31 11:22:19.582862912 +0200
-+++ b/plugins/filters/unsharp/CMakeLists.txt 2019-07-31 11:22:19.587862947 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- set(kritaunsharpfilter_SOURCES
- unsharp.cpp
---- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-07-31 11:22:19.592862983 +0200
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-07-31 11:22:19.595863003 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(brush/tests)
-+endif()
-
- include_directories(brush
- duplicate
---- a/plugins/paintops/libpaintop/CMakeLists.txt 2019-07-31 11:22:19.600863038 +0200
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt 2019-07-31 11:22:19.603863060 +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-07-31 11:22:19.608863094 +0200
-+++ b/plugins/dockers/lut/CMakeLists.txt 2019-07-31 11:22:19.613863129 +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-07-31 11:22:19.619863171 +0200
-+++ b/plugins/dockers/animation/CMakeLists.txt 2019-07-31 11:22:19.624863206 +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-07-31 11:22:19.630863248 +0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt 2019-07-31 11:22:19.635863283 +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-07-31 11:22:19.641863325 +0200
-+++ b/plugins/tools/basictools/CMakeLists.txt 2019-07-31 11:22:19.645863353 +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-07-31 11:22:19.650863388 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-07-31 11:22:19.653863409 +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/svg/CMakeLists.txt 2019-07-31 11:22:19.658863444 +0200
-+++ b/plugins/impex/svg/CMakeLists.txt 2019-07-31 11:22:19.662863472 +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-07-31 11:22:19.668863514 +0200
-+++ b/plugins/impex/brush/CMakeLists.txt 2019-07-31 11:22:19.672863542 +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-07-31 11:22:19.678863584 +0200
-+++ b/plugins/impex/psd/CMakeLists.txt 2019-07-31 11:22:19.684863626 +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-07-31 11:22:19.690863668 +0200
-+++ b/plugins/impex/tga/CMakeLists.txt 2019-07-31 11:22:19.695863703 +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-07-31 11:22:19.700863738 +0200
-+++ b/plugins/impex/libkra/CMakeLists.txt 2019-07-31 11:22:19.704863766 +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-07-31 11:22:19.709863801 +0200
-+++ b/plugins/impex/jpeg/CMakeLists.txt 2019-07-31 11:22:19.713863829 +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-07-31 11:22:19.720863878 +0200
-+++ b/plugins/impex/gif/CMakeLists.txt 2019-07-31 11:22:19.726863920 +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-07-31 11:22:19.732863962 +0200
-+++ b/plugins/impex/exr/CMakeLists.txt 2019-07-31 11:22:19.736863990 +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-07-31 11:22:19.740864018 +0200
-+++ b/plugins/impex/xcf/CMakeLists.txt 2019-07-31 11:22:19.744864046 +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-07-31 11:22:19.750864088 +0200
-+++ b/plugins/impex/tiff/CMakeLists.txt 2019-07-31 11:22:19.755864123 +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-07-31 11:22:19.762864172 +0200
-+++ b/plugins/impex/ora/CMakeLists.txt 2019-07-31 11:22:19.767864207 +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-07-31 11:22:19.774864256 +0200
-+++ b/plugins/impex/heif/CMakeLists.txt 2019-07-31 11:22:19.778864284 +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-07-31 11:22:19.783864319 +0200
-+++ b/plugins/impex/pdf/CMakeLists.txt 2019-07-31 11:22:19.788864354 +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-07-31 11:22:19.796864410 +0200
-+++ b/plugins/impex/csv/CMakeLists.txt 2019-07-31 11:22:19.803864459 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- # import
-
---- a/plugins/impex/heightmap/CMakeLists.txt 2019-07-31 11:22:19.810864508 +0200
-+++ b/plugins/impex/heightmap/CMakeLists.txt 2019-07-31 11:22:19.819864571 +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-07-31 11:22:19.826864620 +0200
-+++ b/plugins/impex/raw/CMakeLists.txt 2019-07-31 11:22:19.830864648 +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-07-31 11:22:19.837864697 +0200
-+++ b/plugins/impex/qimageio/CMakeLists.txt 2019-07-31 11:22:19.844864746 +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-07-31 11:22:19.851864795 +0200
-+++ b/plugins/impex/qml/CMakeLists.txt 2019-07-31 11:22:19.856864830 +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-07-31 11:22:19.862864872 +0200
-+++ b/plugins/impex/png/CMakeLists.txt 2019-07-31 11:22:19.867864907 +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-07-31 11:22:19.872864942 +0200
-+++ b/plugins/color/lcms2engine/CMakeLists.txt 2019-07-31 11:22:19.876864969 +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-07-31 11:22:19.881865005 +0200
-+++ b/libs/brush/CMakeLists.txt 2019-07-31 11:22:19.885865033 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- include_directories(SYSTEM
- ${EIGEN3_INCLUDE_DIR}
---- a/libs/global/CMakeLists.txt 2019-07-31 11:22:19.890865068 +0200
-+++ b/libs/global/CMakeLists.txt 2019-07-31 11:22:19.896865110 +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-07-31 11:22:19.902865151 +0200
-+++ b/libs/image/CMakeLists.txt 2019-07-31 11:22:19.908865194 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- add_subdirectory( tiles3 )
-
---- a/libs/image/tiles3/CMakeLists.txt 2019-07-31 11:22:19.913865228 +0200
-+++ b/libs/image/tiles3/CMakeLists.txt 2019-07-31 11:22:19.917865256 +0200
-@@ -1 +1,3 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/odf/CMakeLists.txt 2019-07-31 11:22:19.922865291 +0200
-+++ b/libs/odf/CMakeLists.txt 2019-07-31 11:22:19.926865319 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- set(kritaodf_LIB_SRCS
- KoOdf.cpp
---- a/libs/metadata/CMakeLists.txt 2019-07-31 11:22:19.930865347 +0200
-+++ b/libs/metadata/CMakeLists.txt 2019-07-31 11:22:19.934865376 +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-07-31 11:22:19.940865418 +0200
-+++ b/libs/store/CMakeLists.txt 2019-07-31 11:22:19.944865445 +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-07-31 11:22:19.951865495 +0200
-+++ b/libs/libkis/CMakeLists.txt 2019-07-31 11:22:19.958865544 +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-07-31 11:22:19.968865614 +0200
-+++ b/libs/widgetutils/CMakeLists.txt 2019-07-31 11:22:19.981865705 +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-07-31 11:22:19.992865782 +0200
-+++ b/libs/widgets/CMakeLists.txt 2019-07-31 11:22:20.000865837 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
---- a/libs/flake/CMakeLists.txt 2019-07-31 11:22:20.010865908 +0200
-+++ b/libs/flake/CMakeLists.txt 2019-07-31 11:22:20.017865956 +0200
-@@ -9,8 +9,12 @@
- )
-
- add_subdirectory(styles)
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-+if(BUILD_TESTING)
- add_subdirectory(resources/tests)
-+endif()
-
- set(kritaflake_SRCS
- KoGradientHelper.cpp
---- a/libs/ui/CMakeLists.txt 2019-07-31 11:22:20.029866040 +0200
-+++ b/libs/ui/CMakeLists.txt 2019-07-31 11:22:20.039866111 +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-07-31 11:22:20.050866188 +0200
-+++ b/libs/pigment/CMakeLists.txt 2019-07-31 11:22:20.057866236 +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/files/krita-4.3.1-tests-optional.patch b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
new file mode 100644
index 000000000000..37f2ac50ffda
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
@@ -0,0 +1,80 @@
+From 2e9369281d44a2701ac7364568d381cca0d92ec5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ 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 <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/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()
+--
+2.27.0
diff --git a/media-gfx/krita/krita-4.3.0.ebuild b/media-gfx/krita/krita-4.3.0.ebuild
index 55f079f74824..745d2ca7bf00 100644
--- a/media-gfx/krita/krita-4.3.0.ebuild
+++ b/media-gfx/krita/krita-4.3.0.ebuild
@@ -13,11 +13,11 @@ 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!"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.krita https://krita.org/en/"
+HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/"
LICENSE="GPL-3"
SLOT="5"
diff --git a/media-gfx/krita/krita-4.2.9.ebuild b/media-gfx/krita/krita-4.4.1.ebuild
index 150df39c7060..1b8485696af3 100644
--- a/media-gfx/krita/krita-4.2.9.ebuild
+++ b/media-gfx/krita/krita-4.4.1.ebuild
@@ -4,20 +4,20 @@
EAPI=7
ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-KFMIN=5.60.0
-QTMIN=5.12.3
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.74.0
+QTMIN=5.15.1
VIRTUALX_REQUIRED="test"
inherit ecm kde.org python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz
- https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
- KEYWORDS="amd64 ~ppc64 ~x86"
+ 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/"
+HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/"
LICENSE="GPL-3"
SLOT="5"
@@ -46,7 +46,6 @@ RDEPEND="${PYTHON_DEPS}
>=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
@@ -89,8 +88,8 @@ DEPEND="${RDEPEND}
RESTRICT+=" test"
PATCHES=(
- "${FILESDIR}"/${PN}-4.2.4-tests-optional.patch
- "${WORKDIR}"/${P}-patchset
+ "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+ "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
)
pkg_setup() {
@@ -98,12 +97,18 @@ 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=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_SeExpr2=ON # not packaged
$(cmake_use_find_package color-management OCIO)
$(cmake_use_find_package fftw FFTW3)
$(cmake_use_find_package gif GIF)
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-06 20:18:29 +0000