* [gentoo-commits] proj/kde:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2016-09-22 11:38 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2016-09-22 11:38 UTC (permalink / raw
To: gentoo-commits
commit: 3f62cdbbba05554ccc0230d532e5ba2193b8ac4c
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 11:38:03 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 11:38:08 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3f62cdbb
media-gfx/krita: avoid automagic CXXFLAG detection courtesy of dev-libs/vc
Gentoo-bug: 584118
Package-Manager: portage-2.3.1
media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch | 17 +++++++++++++++++
media-gfx/krita/krita-9999.ebuild | 5 ++++-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch b/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
new file mode 100644
index 0000000..11c1105
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
@@ -0,0 +1,17 @@
+Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
+
+Gentoo-bug: 584118
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -525,10 +525,6 @@
+ endif()
+ endmacro()
+
+- if (NOT PACKAGERS_BUILD)
+- # Optimize everything for the current architecture
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
+- endif ()
+ endif()
+ set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
+
diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 930b316..4634b46 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -70,7 +70,10 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra:4[calligra_features_krita]
"
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-breeze-collisions.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.1-breeze-collisions.patch"
+ "${FILESDIR}/${PN}-3.0.1-vc-cxxflags.patch"
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2016-12-17 17:55 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2016-12-17 17:55 UTC (permalink / raw
To: gentoo-commits
commit: 04b9e9a2ac731a7b07bed9f57ee3b816849196f8
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 17:54:38 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 17:54:38 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=04b9e9a2
media-gfx/krita: Sync with gentoo main tree
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch | 17 -----------------
media-gfx/krita/krita-9999.ebuild | 4 ----
2 files changed, 21 deletions(-)
diff --git a/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch b/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
deleted file mode 100644
index 11c1105..0000000
--- a/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
-
-Gentoo-bug: 584118
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -525,10 +525,6 @@
- endif()
- endmacro()
-
-- if (NOT PACKAGERS_BUILD)
-- # Optimize everything for the current architecture
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
-- endif ()
- endif()
- set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
-
diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 8ee6353..6360555 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -71,10 +71,6 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra-l10n:4[calligra_features_krita(+)]
"
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.1-vc-cxxflags.patch"
-)
-
src_configure() {
local mycmakeargs=(
-DWITH_FFTW3=$(usex fftw)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2020-06-08 12:55 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-06-08 12:55 UTC (permalink / raw
To: gentoo-commits
commit: 6b20c83a5932f207222474568b074202bfae3f64
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 8 12:54:51 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 8 12:54:51 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6b20c83a
media-gfx/krita: Add 4.3.0_beta2, python3_9
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../krita/files/krita-4.2.4-tests-optional.patch | 399 +++++++++++++++++++++
...{krita-9999.ebuild => krita-4.3.0_beta2.ebuild} | 15 +-
media-gfx/krita/krita-9999.ebuild | 2 +-
3 files changed, 411 insertions(+), 5 deletions(-)
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
new file mode 100644
index 0000000000..2f13c999b6
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
@@ -0,0 +1,399 @@
+--- 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/krita-9999.ebuild b/media-gfx/krita/krita-4.3.0_beta2.ebuild
similarity index 88%
copy from media-gfx/krita/krita-9999.ebuild
copy to media-gfx/krita/krita-4.3.0_beta2.ebuild
index 4181af666f..beace5e27f 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-4.3.0_beta2.ebuild
@@ -3,16 +3,18 @@
EAPI=7
-ECM_TEST="forceoptional-recursive"
-PYTHON_COMPAT=( python3_{7,8} )
+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"
- KEYWORDS="~amd64 ~ppc64 ~x86"
+ SRC_URI="mirror://kde/unstable/${PN}/${PV/_/-}/${P/_/-}.tar.xz
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
+ S="${WORKDIR}"/${P/_/-}
+ KEYWORDS=""
fi
DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
@@ -87,6 +89,11 @@ DEPEND="${RDEPEND}
# bug 630508
RESTRICT+=" test"
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.2.4-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
diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 4181af666f..abb2607180 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ECM_TEST="forceoptional-recursive"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
KFMIN=5.60.0
QTMIN=5.12.3
VIRTUALX_REQUIRED="test"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2020-06-18 17:38 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-06-18 17:38 UTC (permalink / raw
To: gentoo-commits
commit: c2e88029c765b838f605a9a72505232ac4b1c6d7
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 17:37:47 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c2e88029
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>
.../krita/files/krita-4.2.4-tests-optional.patch | 399 ---------------
.../krita/files/krita-4.3.0-tests-optional.patch | 536 +++++++++++++++++++++
...krita-4.3.0_beta2.ebuild => krita-4.3.0.ebuild} | 5 +-
3 files changed, 538 insertions(+), 402 deletions(-)
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 2f13c999b6..0000000000
--- 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.0-tests-optional.patch b/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
new file mode 100644
index 0000000000..b58dcf1f4a
--- /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_beta2.ebuild b/media-gfx/krita/krita-4.3.0.ebuild
similarity index 95%
rename from media-gfx/krita/krita-4.3.0_beta2.ebuild
rename to media-gfx/krita/krita-4.3.0.ebuild
index beace5e27f..405d176882 100644
--- a/media-gfx/krita/krita-4.3.0_beta2.ebuild
+++ b/media-gfx/krita/krita-4.3.0.ebuild
@@ -11,9 +11,8 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/${PV/_/-}/${P/_/-}.tar.xz
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
- S="${WORKDIR}"/${P/_/-}
KEYWORDS=""
fi
@@ -90,7 +89,7 @@ DEPEND="${RDEPEND}
RESTRICT+=" test"
PATCHES=(
- "${FILESDIR}"/${PN}-4.2.4-tests-optional.patch
+ "${FILESDIR}"/${P}-tests-optional.patch
"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2021-03-07 23:04 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-03-07 23:04 UTC (permalink / raw
To: gentoo-commits
commit: 8efd9077f3e3e4313ffd81c9af80df4c65e8d234
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 7 21:53:03 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 7 21:55:41 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8efd9077
media-gfx/krita: 4.4.3_beta1 version bump
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/files/krita-4.4.2-quazip1.patch | 36 +++++++
media-gfx/krita/krita-4.4.3_beta1.ebuild | 129 ++++++++++++++++++++++++
2 files changed, 165 insertions(+)
diff --git a/media-gfx/krita/files/krita-4.4.2-quazip1.patch b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
new file mode 100644
index 0000000000..6a49bd3ba2
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
@@ -0,0 +1,36 @@
+From 3eaf480ae5d615e8e26153cca98115ff0f23135f Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Mon, 5 Oct 2020 20:11:26 +0200
+Subject: [PATCH] Support quazip 1.0
+
+Update FindQuaZip to find the QuaZip 1.0 library names and include dirs. Once support for quazip<1 is dropped this should be ported to use quazip's own QuaZipConfig
+---
+ cmake/modules/FindQuaZip.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/FindQuaZip.cmake b/cmake/modules/FindQuaZip.cmake
+index 7e628fcd4b..345c7909ab 100644
+--- a/cmake/modules/FindQuaZip.cmake
++++ b/cmake/modules/FindQuaZip.cmake
+@@ -25,15 +25,15 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+ ELSE(WIN32)
+ FIND_PACKAGE(PkgConfig)
+ # pkg_check_modules(PC_QCA2 QUIET qca2)
+- pkg_check_modules(PC_QUAZIP quazip)
++ pkg_check_modules(PC_QUAZIP quazip quazip1-qt5)
+ FIND_LIBRARY(QUAZIP_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+- NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
++ NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} quazip1-qt5
+ HINTS /usr/lib /usr/lib64
+ )
+ FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
+ HINTS /usr/include /usr/local/include
+- PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
++ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} QuaZip-Qt5-1.0/quazip
+ )
+ FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
+ ENDIF (WIN32)
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-4.4.3_beta1.ebuild b/media-gfx/krita/krita-4.4.3_beta1.ebuild
new file mode 100644
index 0000000000..3c31724a57
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.3_beta1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 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.74.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/${PV/_/-}/${PN}-${PV/_/-}.tar.xz
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ S="${WORKDIR}/${PN}-${PV/_/-}"
+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}"
+
+# bug 630508
+RESTRICT+=" test"
+
+BDEPEND="
+ dev-cpp/eigen:3
+ dev-lang/perl
+ sys-devel/gettext
+"
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=
+ dev-libs/quazip:0=
+ $(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/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 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+ "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+ "${FILESDIR}"/${PN}-4.4.2-quazip1.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=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
+ $(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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2024-07-13 19:59 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2024-07-13 19:59 UTC (permalink / raw
To: gentoo-commits
commit: a9deb0ccf181018c7c6f8144cfdc05307d6fcdd3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 18:45:12 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 19:55:40 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a9deb0cc
media-gfx/krita: enable py3.12, add IUSE media, xsimd; re-add jpeg2k
IUSE raw switched back to kde-apps/libkdcraw
Upstream commit 02f4f845eaf789d3840805e69bdbb38f131a3cc7
IUSE media w/ media-video/mlt replaces IUSE qtmedia w/ dev-qt/qtmultimedia
Upstream commits:
7f976690636071a2387d8ca9c4203edb59489b0d
c76debce1c39b337bdd21c5dc2048605dc6d267d
New dependency on dev-libs/libunibreak
Upstream commit 3d0ba2926f576e9dd059c2bed5264cbd8f6adcf6
Rebase tests-optional.patch on 5.2.3
Upstream commit 2acfac835adf5cb39dd6d9149c739648da060385
Sync with ::gentoo w/ minor sorting fixes, plus:
- Pin down kde-apps/libkdcraw to SLOT 5
- Raise minimum dep on dev-cpp/xsimd to 13.0.0
- Drop unnecessary openjpeg patch
See also:
https://github.com/gentoo/gentoo/pull/34736
Bug: https://bugs.gentoo.org/921972
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/files/krita-5.2.2-fftw.patch | 18 ++++++++++++
...onal.patch => krita-5.2.3-tests-optional.patch} | 14 +++++++--
media-gfx/krita/krita-9999.ebuild | 33 +++++++++++++++-------
media-gfx/krita/metadata.xml | 3 +-
4 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/media-gfx/krita/files/krita-5.2.2-fftw.patch b/media-gfx/krita/files/krita-5.2.2-fftw.patch
new file mode 100644
index 0000000000..b805be6a21
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.2-fftw.patch
@@ -0,0 +1,18 @@
+Disable the cmake find_package method. It will instead fallback to use pkgconfig.
+Without this, it will fail to find fftw3 and error out.
+
+--- a/cmake/modules/FindFFTW3.cmake 2023-11-24 19:59:45.904059240 +0100
++++ b/cmake/modules/FindFFTW3.cmake 2023-11-24 20:00:17.029563107 +0100
+@@ -74,9 +74,9 @@
+ endforeach()
+ mark_as_advanced(PKG_FFTW_CONFIG_DIR)
+
+-find_package(FFTW3 QUIET NO_MODULE
+- HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3 /usr/local/lib/cmake/fftw3
+-)
++#find_package(FFTW3 QUIET NO_MODULE
++# HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3 /usr/local/lib/cmake/fftw3
++#)
+ mark_as_advanced(FFTW3_DIR)
+
+ # if we found the FFTW3 CMake package then we can start
diff --git a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch b/media-gfx/krita/files/krita-5.2.3-tests-optional.patch
similarity index 91%
rename from media-gfx/krita/files/krita-4.3.1-tests-optional.patch
rename to media-gfx/krita/files/krita-5.2.3-tests-optional.patch
index 37f2ac50ff..48d9e314a2 100644
--- a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
+++ b/media-gfx/krita/files/krita-5.2.3-tests-optional.patch
@@ -76,5 +76,15 @@ index 88c0516360..01f2383ddb 100644
+if(BUILD_TESTING)
+ add_subdirectory(tests)
+endif()
---
-2.27.0
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1246,7 +1246,9 @@
+ ${CMAKE_CURRENT_BINARY_DIR}
+ )
+
++if(BUILD_TESTING)
+ add_subdirectory(sdk/tests)
++endif()
+
+ add_subdirectory(libs)
+ add_subdirectory(plugins)
diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 425c755041..506ff60ab9 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -4,14 +4,14 @@
EAPI=8
ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
KFMIN=5.115.0
QTMIN=5.15.12
inherit ecm kde.org python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64"
fi
DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
@@ -19,7 +19,7 @@ HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
LICENSE="GPL-3"
SLOT="5"
-IUSE="color-management fftw gif +gsl heif jpegxl +mypaint-brush-engine openexr pdf qtmedia +raw webp"
+IUSE="color-management fftw gif +gsl heif jpeg2k jpegxl +mypaint-brush-engine openexr pdf media +raw +xsimd webp"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# bug 630508
@@ -27,6 +27,7 @@ RESTRICT="test"
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=
+ dev-libs/libunibreak:=
dev-libs/quazip:0=[qt5(+)]
$(python_gen_cond_dep '
dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
@@ -68,23 +69,34 @@ RDEPEND="${PYTHON_DEPS}
fftw? ( sci-libs/fftw:3.0= )
gif? ( media-libs/giflib )
gsl? ( sci-libs/gsl:= )
+ jpeg2k? ( media-libs/openjpeg:= )
jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825:= )
heif? ( >=media-libs/libheif-1.11:=[x265] )
+ media? ( media-libs/mlt:= )
mypaint-brush-engine? ( media-libs/libmypaint:= )
openexr? ( media-libs/openexr:= )
pdf? ( app-text/poppler[qt5] )
- qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
- raw? ( media-libs/libraw:= )
+ raw? ( kde-apps/libkdcraw:5 )
webp? ( >=media-libs/libwebp-1.2.0:= )
+ xsimd? ( >=dev-cpp/xsimd-13.0.0 )
+
+"
+DEPEND="${RDEPEND}
+ dev-libs/immer
+ dev-libs/lager
+ dev-libs/zug
"
-DEPEND="${RDEPEND}"
BDEPEND="
dev-cpp/eigen:3
dev-lang/perl
sys-devel/gettext
"
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+PATCHES=(
+ # downstream
+ "${FILESDIR}"/${PN}-5.2.3-tests-optional.patch
+ "${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
+)
pkg_setup() {
python-single-r1_pkg_setup
@@ -100,19 +112,20 @@ src_configure() {
-DENABLE_UPDATERS=OFF
-DKRITA_ENABLE_PCH=OFF # big mess.
-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
- -DCMAKE_DISABLE_FIND_PACKAGE_xsimd=ON # not packaged
$(cmake_use_find_package color-management OpenColorIO)
$(cmake_use_find_package fftw FFTW3)
$(cmake_use_find_package gif GIF)
$(cmake_use_find_package gsl GSL)
$(cmake_use_find_package heif HEIF)
+ $(cmake_use_find_package jpeg2k OpenJPEG)
$(cmake_use_find_package jpegxl JPEGXL)
+ $(cmake_use_find_package media Mlt7)
$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
$(cmake_use_find_package openexr OpenEXR)
$(cmake_use_find_package pdf Poppler)
- $(cmake_use_find_package qtmedia Qt5Multimedia)
- $(cmake_use_find_package raw LibRaw)
+ $(cmake_use_find_package raw KF5KDcraw)
$(cmake_use_find_package webp WebP)
+ $(cmake_use_find_package xsimd xsimd)
)
ecm_src_configure
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index ff6c095b3a..82ce837b71 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -10,7 +10,8 @@
</upstream>
<use>
<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
+ <flag name="media">Enable sound support for animations via <pkg>media-libs/mlt</pkg></flag>
<flag name="mypaint-brush-engine">Enable MyPaint brush engine support <pkg>media-libs/libmypaint</pkg></flag>
- <flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag>
+ <flag name="xsimd">Enable usage of SIMD instructions via <pkg>dev-cpp/xsimd</pkg></flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-13 19:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-07 23:04 [gentoo-commits] proj/kde:master commit in: media-gfx/krita/files/, media-gfx/krita/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-07-13 19:59 Andreas Sturmlechner
2020-06-18 17:38 Andreas Sturmlechner
2020-06-08 12:55 Andreas Sturmlechner
2016-12-17 17:55 Johannes Huber
2016-09-22 11:38 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox