* [gentoo-commits] proj/kde:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 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: 2b1cbfea543a690796f4a6292d5c408106f75fd9
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 11:33:58 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=2b1cbfea
media-gfx/krita: add patch solving file collision with kde-plasma/breeze
Gentoo-bug: 594594
KDE-bug: 368093
Package-Manager: portage-2.3.1
.../krita/files/krita-3.0.1-breeze-collisions.patch | 16 ++++++++++++++++
media-gfx/krita/krita-9999.ebuild | 2 ++
2 files changed, 18 insertions(+)
diff --git a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
new file mode 100644
index 0000000..890f825
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
@@ -0,0 +1,16 @@
+Avoid installing files that collide with kde-plasma/breeze.
+
+Gentoo-bug: 594594
+KDE-bug: 368093
+
+--- a/krita/data/themes/CMakeLists.txt
++++ b/krita/data/themes/CMakeLists.txt
+@@ -1,8 +1,6 @@
+ ########### install files ###############
+
+ install(FILES
+-BreezeDark.colors
+-BreezeHighContrast.colors
+ BreezeLight.colors
+ KritaNeutral.colors
+ KritaBlender.colors
diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 0ad1ee1..930b316 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -70,6 +70,8 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra:4[calligra_features_krita]
"
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-breeze-collisions.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/, media-gfx/krita/files/
@ 2016-10-27 19:42 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2016-10-27 19:42 UTC (permalink / raw
To: gentoo-commits
commit: dee51a1b9f5e7511897a22a122a2fba4edb7ed82
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 19:41:40 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 19:41:51 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dee51a1b
media-gfx/krita: drop breeze collision patch
Upstream-commit: f50c5949365e333e9762b635722251a8406b3f81
Package-Manager: portage-2.3.2
.../krita/files/krita-3.0.1-breeze-collisions.patch | 16 ----------------
media-gfx/krita/krita-9999.ebuild | 1 -
2 files changed, 17 deletions(-)
diff --git a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
deleted file mode 100644
index 890f825..0000000
--- a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid installing files that collide with kde-plasma/breeze.
-
-Gentoo-bug: 594594
-KDE-bug: 368093
-
---- a/krita/data/themes/CMakeLists.txt
-+++ b/krita/data/themes/CMakeLists.txt
-@@ -1,8 +1,6 @@
- ########### install files ###############
-
- install(FILES
--BreezeDark.colors
--BreezeHighContrast.colors
- BreezeLight.colors
- KritaNeutral.colors
- KritaBlender.colors
diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 33d11a2..8ee6353 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -72,7 +72,6 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-3.0.1-breeze-collisions.patch"
"${FILESDIR}/${PN}-3.0.1-vc-cxxflags.patch"
)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2020-07-12 22:55 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-07-12 22:55 UTC (permalink / raw
To: gentoo-commits
commit: 568d5a1aea5a1931403de7653376fcd227694d6a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 11 21:58:50 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 22:53:27 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=568d5a1a
media-gfx/krita: Drop 4.3.0
Moved to Gentoo ebuild repository.
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../krita/files/krita-4.3.0-tests-optional.patch | 536 ---------------------
media-gfx/krita/krita-4.3.0.ebuild | 122 -----
2 files changed, 658 deletions(-)
diff --git a/media-gfx/krita/files/krita-4.3.0-tests-optional.patch b/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
deleted file mode 100644
index b58dcf1f4a..0000000000
--- a/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
+++ /dev/null
@@ -1,536 +0,0 @@
-From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 17 Jun 2020 20:18:28 +0200
-Subject: [PATCH] Don't build tests when testing not requested
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-
-diff --git a/libs/brush/CMakeLists.txt b/libs/brush/CMakeLists.txt
-index 536b1a4ac5..7d8435eec4 100644
---- a/libs/brush/CMakeLists.txt
-+++ b/libs/brush/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM
- ${EIGEN3_INCLUDE_DIR}
-diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
-index cbdac265d2..1a50c1620a 100644
---- a/libs/flake/CMakeLists.txt
-+++ b/libs/flake/CMakeLists.txt
-@@ -9,8 +9,10 @@ include_directories(
- )
-
- add_subdirectory(styles)
--add_subdirectory(tests)
--add_subdirectory(resources/tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+ add_subdirectory(resources/tests)
-+endif()
-
- set(kritaflake_SRCS
- KoGradientHelper.cpp
-diff --git a/libs/global/CMakeLists.txt b/libs/global/CMakeLists.txt
-index e8162c5e46..f6ea6bc840 100644
---- a/libs/global/CMakeLists.txt
-+++ b/libs/global/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- include(CheckFunctionExists)
- check_function_exists(backtrace HAVE_BACKTRACE)
-diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
-index 810dee2f16..44c72ba2d5 100644
---- a/libs/image/CMakeLists.txt
-+++ b/libs/image/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- add_subdirectory( tiles3 )
-
-diff --git a/libs/image/tiles3/CMakeLists.txt b/libs/image/tiles3/CMakeLists.txt
-index 88c0516360..01f2383ddb 100644
---- a/libs/image/tiles3/CMakeLists.txt
-+++ b/libs/image/tiles3/CMakeLists.txt
-@@ -1 +1,3 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-diff --git a/libs/libkis/CMakeLists.txt b/libs/libkis/CMakeLists.txt
-index 958104aaaf..3b8a33eadc 100644
---- a/libs/libkis/CMakeLists.txt
-+++ b/libs/libkis/CMakeLists.txt
-@@ -48,4 +48,6 @@ set_target_properties(kritalibkis PROPERTIES
- install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-diff --git a/libs/metadata/CMakeLists.txt b/libs/metadata/CMakeLists.txt
-index d33aff38fc..abdc2f7a36 100644
---- a/libs/metadata/CMakeLists.txt
-+++ b/libs/metadata/CMakeLists.txt
-@@ -29,4 +29,6 @@ set_target_properties(kritametadata PROPERTIES
-
- install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS})
-
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-diff --git a/libs/odf/CMakeLists.txt b/libs/odf/CMakeLists.txt
-index 6acbf4d1a5..50e60b55d8 100644
---- a/libs/odf/CMakeLists.txt
-+++ b/libs/odf/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritaodf_LIB_SRCS
- KoOdf.cpp
-diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
-index 7e38c6cb00..60879fcea2 100644
---- a/libs/pigment/CMakeLists.txt
-+++ b/libs/pigment/CMakeLists.txt
-@@ -33,8 +33,10 @@ else()
- set(__per_arch_alpha_applicator_factory_objs KoAlphaMaskApplicatorFactoryImpl.cpp)
- endif()
-
--add_subdirectory(tests)
--add_subdirectory(benchmarks)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+ add_subdirectory(benchmarks)
-+endif()
-
- set(kritapigment_SRCS
- DebugPigment.cpp
-diff --git a/libs/store/CMakeLists.txt b/libs/store/CMakeLists.txt
-index b7c42996bd..30f9d5c5c6 100644
---- a/libs/store/CMakeLists.txt
-+++ b/libs/store/CMakeLists.txt
-@@ -1,6 +1,8 @@
- include_directories(${QUAZIP_INCLUDE_DIRS})
-
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritastore_LIB_SRCS
- KoDirectoryStore.cpp
-diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
-index d273bf548a..d180fd8970 100644
---- a/libs/ui/CMakeLists.txt
-+++ b/libs/ui/CMakeLists.txt
-@@ -13,7 +13,9 @@ if (ANDROID)
- include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
- endif()
-
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- if (APPLE)
- find_library(FOUNDATION_LIBRARY Foundation)
-diff --git a/libs/widgets/CMakeLists.txt b/libs/widgets/CMakeLists.txt
-index 75eded9db1..c0093cfd3a 100644
---- a/libs/widgets/CMakeLists.txt
-+++ b/libs/widgets/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-diff --git a/libs/widgetutils/CMakeLists.txt b/libs/widgetutils/CMakeLists.txt
-index c62eeafb79..c33b16dd91 100644
---- a/libs/widgetutils/CMakeLists.txt
-+++ b/libs/widgetutils/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
-
-diff --git a/plugins/color/lcms2engine/CMakeLists.txt b/plugins/color/lcms2engine/CMakeLists.txt
-index e14de2ba7c..8c56372cb3 100644
---- a/plugins/color/lcms2engine/CMakeLists.txt
-+++ b/plugins/color/lcms2engine/CMakeLists.txt
-@@ -1,6 +1,8 @@
- project( lcmsengine )
-
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM
- ${LCMS2_INCLUDE_DIR}
-diff --git a/plugins/dockers/animation/CMakeLists.txt b/plugins/dockers/animation/CMakeLists.txt
-index a0b4b4beb4..b3de3f2749 100644
---- a/plugins/dockers/animation/CMakeLists.txt
-+++ b/plugins/dockers/animation/CMakeLists.txt
-@@ -1,4 +1,4 @@
--if (NOT WIN32 AND NOT APPLE)
-+if(BUILD_TESTING AND NOT WIN32 AND NOT APPLE)
- add_subdirectory(tests)
- endif()
-
-diff --git a/plugins/dockers/lut/CMakeLists.txt b/plugins/dockers/lut/CMakeLists.txt
-index 01844be146..6745db73e6 100644
---- a/plugins/dockers/lut/CMakeLists.txt
-+++ b/plugins/dockers/lut/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM
- ${OCIO_INCLUDE_DIR}
-diff --git a/plugins/extensions/qmic/CMakeLists.txt b/plugins/extensions/qmic/CMakeLists.txt
-index afd390b726..f5766c1b50 100644
---- a/plugins/extensions/qmic/CMakeLists.txt
-+++ b/plugins/extensions/qmic/CMakeLists.txt
-@@ -20,4 +20,6 @@ add_library(kritaqmic MODULE ${kritaqmic_SOURCES})
- target_link_libraries(kritaqmic kritaui)
- install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
-
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-diff --git a/plugins/filters/CMakeLists.txt b/plugins/filters/CMakeLists.txt
-index 63a5de64e9..f8b4467926 100644
---- a/plugins/filters/CMakeLists.txt
-+++ b/plugins/filters/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
- add_subdirectory( blur )
- add_subdirectory( colors )
- add_subdirectory( colorsfilters )
-diff --git a/plugins/filters/unsharp/CMakeLists.txt b/plugins/filters/unsharp/CMakeLists.txt
-index e63725abb1..5a61b5f89c 100644
---- a/plugins/filters/unsharp/CMakeLists.txt
-+++ b/plugins/filters/unsharp/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritaunsharpfilter_SOURCES
- unsharp.cpp
-diff --git a/plugins/impex/brush/CMakeLists.txt b/plugins/impex/brush/CMakeLists.txt
-index b0343eddd4..ef7c617a40 100644
---- a/plugins/impex/brush/CMakeLists.txt
-+++ b/plugins/impex/brush/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritabrushexport_PART_SRCS
- kis_brush_export.cpp
-diff --git a/plugins/impex/csv/CMakeLists.txt b/plugins/impex/csv/CMakeLists.txt
-index 60eba64463..cf6e6ac9bd 100644
---- a/plugins/impex/csv/CMakeLists.txt
-+++ b/plugins/impex/csv/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- # import
-
-diff --git a/plugins/impex/exr/CMakeLists.txt b/plugins/impex/exr/CMakeLists.txt
-index aa39a91879..c80833941f 100644
---- a/plugins/impex/exr/CMakeLists.txt
-+++ b/plugins/impex/exr/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS} )
-
-diff --git a/plugins/impex/gif/CMakeLists.txt b/plugins/impex/gif/CMakeLists.txt
-index bb7f582b6c..b95c9d3d07 100644
---- a/plugins/impex/gif/CMakeLists.txt
-+++ b/plugins/impex/gif/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritagifexport_SOURCES
- kis_gif_export.cpp
-diff --git a/plugins/impex/heif/CMakeLists.txt b/plugins/impex/heif/CMakeLists.txt
-index d25f3e1704..a7f663b13f 100644
---- a/plugins/impex/heif/CMakeLists.txt
-+++ b/plugins/impex/heif/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}")
-diff --git a/plugins/impex/heightmap/CMakeLists.txt b/plugins/impex/heightmap/CMakeLists.txt
-index a8b03308d9..04e0f1000a 100644
---- a/plugins/impex/heightmap/CMakeLists.txt
-+++ b/plugins/impex/heightmap/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
-
-diff --git a/plugins/impex/jp2/CMakeLists.txt b/plugins/impex/jp2/CMakeLists.txt
-index c9393f6cfa..b4333025aa 100644
---- a/plugins/impex/jp2/CMakeLists.txt
-+++ b/plugins/impex/jp2/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenJPEG_CFLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenJPEG_CFLAGS}")
-diff --git a/plugins/impex/jpeg/CMakeLists.txt b/plugins/impex/jpeg/CMakeLists.txt
-index 50edb05c96..eaa90964a7 100644
---- a/plugins/impex/jpeg/CMakeLists.txt
-+++ b/plugins/impex/jpeg/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
-
-diff --git a/plugins/impex/libkra/CMakeLists.txt b/plugins/impex/libkra/CMakeLists.txt
-index 2b840c1e8a..88d849172f 100644
---- a/plugins/impex/libkra/CMakeLists.txt
-+++ b/plugins/impex/libkra/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritalibkra_LIB_SRCS
- kis_colorize_dom_utils.cpp
-diff --git a/plugins/impex/ora/CMakeLists.txt b/plugins/impex/ora/CMakeLists.txt
-index a476f422b4..0f4e563505 100644
---- a/plugins/impex/ora/CMakeLists.txt
-+++ b/plugins/impex/ora/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(libkritaconverter_LIB_SRCS
- ora_converter.cpp
-diff --git a/plugins/impex/pdf/CMakeLists.txt b/plugins/impex/pdf/CMakeLists.txt
-index 320da291a4..c423ff4214 100644
---- a/plugins/impex/pdf/CMakeLists.txt
-+++ b/plugins/impex/pdf/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp )
-
-diff --git a/plugins/impex/png/CMakeLists.txt b/plugins/impex/png/CMakeLists.txt
-index d567e8059e..6d3815f06f 100644
---- a/plugins/impex/png/CMakeLists.txt
-+++ b/plugins/impex/png/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritapngimport_SOURCES
- kis_png_import.cc
-diff --git a/plugins/impex/psd/CMakeLists.txt b/plugins/impex/psd/CMakeLists.txt
-index 4112536da2..f81598d01d 100644
---- a/plugins/impex/psd/CMakeLists.txt
-+++ b/plugins/impex/psd/CMakeLists.txt
-@@ -1,4 +1,4 @@
--if (NOT MSVC AND NOT APPLE)
-+if(BUILD_TESTING AND NOT MSVC AND NOT APPLE)
- add_subdirectory(tests)
- endif()
-
-diff --git a/plugins/impex/qimageio/CMakeLists.txt b/plugins/impex/qimageio/CMakeLists.txt
-index c916af4870..f1a068e9c2 100644
---- a/plugins/impex/qimageio/CMakeLists.txt
-+++ b/plugins/impex/qimageio/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritaqimageioexport_SOURCES
- kis_qimageio_export.cpp
-diff --git a/plugins/impex/qml/CMakeLists.txt b/plugins/impex/qml/CMakeLists.txt
-index e53156905a..1dff196ac5 100644
---- a/plugins/impex/qml/CMakeLists.txt
-+++ b/plugins/impex/qml/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritaqmlexport_SOURCES
- qml_converter.cc
-diff --git a/plugins/impex/raw/CMakeLists.txt b/plugins/impex/raw/CMakeLists.txt
-index 71cb5b355c..70241a8903 100644
---- a/plugins/impex/raw/CMakeLists.txt
-+++ b/plugins/impex/raw/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- if(OPENEXR_FOUND)
- include_directories(${OPENEXR_INCLUDE_DIRS})
-diff --git a/plugins/impex/svg/CMakeLists.txt b/plugins/impex/svg/CMakeLists.txt
-index 8f803a2783..6642112c11 100644
---- a/plugins/impex/svg/CMakeLists.txt
-+++ b/plugins/impex/svg/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritasvgimport_SOURCES
- kis_svg_import.cc
-diff --git a/plugins/impex/tga/CMakeLists.txt b/plugins/impex/tga/CMakeLists.txt
-index b7fe804897..79c2aff4d4 100644
---- a/plugins/impex/tga/CMakeLists.txt
-+++ b/plugins/impex/tga/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritatgaexport_SOURCES
- kis_tga_export.cpp
-diff --git a/plugins/impex/tiff/CMakeLists.txt b/plugins/impex/tiff/CMakeLists.txt
-index 8e57566510..0ee181c9bc 100644
---- a/plugins/impex/tiff/CMakeLists.txt
-+++ b/plugins/impex/tiff/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(libkritatiffconverter_LIB_SRCS
- kis_tiff_converter.cc
-diff --git a/plugins/impex/xcf/CMakeLists.txt b/plugins/impex/xcf/CMakeLists.txt
-index d76985be87..a754b686ba 100644
---- a/plugins/impex/xcf/CMakeLists.txt
-+++ b/plugins/impex/xcf/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
-
-diff --git a/plugins/paintops/defaultpaintops/CMakeLists.txt b/plugins/paintops/defaultpaintops/CMakeLists.txt
-index 68ac300940..35cd140838 100644
---- a/plugins/paintops/defaultpaintops/CMakeLists.txt
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(brush/tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(brush/tests)
-+endif()
-
- include_directories(brush
- duplicate
-diff --git a/plugins/paintops/libpaintop/CMakeLists.txt b/plugins/paintops/libpaintop/CMakeLists.txt
-index 4d6d831760..59ca6657ca 100644
---- a/plugins/paintops/libpaintop/CMakeLists.txt
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt
-@@ -103,5 +103,6 @@ set_target_properties(kritalibpaintop PROPERTIES
-
- install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS})
-
--
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-diff --git a/plugins/tools/basictools/CMakeLists.txt b/plugins/tools/basictools/CMakeLists.txt
-index 9d725a7c7a..0221e604be 100644
---- a/plugins/tools/basictools/CMakeLists.txt
-+++ b/plugins/tools/basictools/CMakeLists.txt
-@@ -1,6 +1,6 @@
--if (NOT APPLE)
-+if(BUILD_TESTING AND NOT APPLE)
- add_subdirectory(tests)
--endif ()
-+endif()
-
- set(kritadefaulttools_SOURCES
- default_tools.cc
-diff --git a/plugins/tools/tool_transform2/CMakeLists.txt b/plugins/tools/tool_transform2/CMakeLists.txt
-index e90230c48e..2cf727a991 100644
---- a/plugins/tools/tool_transform2/CMakeLists.txt
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt
-@@ -1,4 +1,4 @@
--if (NOT WIN32 AND NOT APPLE)
-+if(BUILD_TESTING AND NOT WIN32 AND NOT APPLE)
- add_subdirectory(tests)
- endif()
-
---
-2.27.0
-
diff --git a/media-gfx/krita/krita-4.3.0.ebuild b/media-gfx/krita/krita-4.3.0.ebuild
deleted file mode 100644
index 405d176882..0000000000
--- a/media-gfx/krita/krita-4.3.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
- https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
- KEYWORDS=""
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.krita https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
- dev-cpp/eigen:3
- dev-lang/perl
- sys-devel/gettext
-"
-RDEPEND="${PYTHON_DEPS}
- dev-libs/boost:=
- dev-libs/quazip
- $(python_gen_cond_dep '
- dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
- dev-python/sip[${PYTHON_MULTI_USEDEP}]
- ')
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- media-gfx/exiv2:=
- media-libs/lcms
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXi
- color-management? ( media-libs/opencolorio )
- fftw? ( sci-libs/fftw:3.0= )
- gif? ( media-libs/giflib )
- gsl? ( sci-libs/gsl:= )
- jpeg? ( virtual/jpeg:0 )
- heif? ( media-libs/libheif:= )
- openexr? (
- media-libs/ilmbase:=
- media-libs/openexr
- )
- pdf? ( app-text/poppler[qt5] )
- qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
- raw? ( media-libs/libraw:= )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
- vc? ( >=dev-libs/vc-1.1.0 )
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-tests-optional.patch
- "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- ecm_pkg_setup
-}
-
-src_configure() {
- # Prevent sandbox violation from FindPyQt5.py module
- # See Gentoo-bug 655918
- addpredict /dev/dri
-
- local mycmakeargs=(
- $(cmake_use_find_package color-management OCIO)
- $(cmake_use_find_package fftw FFTW3)
- $(cmake_use_find_package gif GIF)
- $(cmake_use_find_package gsl GSL)
- $(cmake_use_find_package heif HEIF)
- $(cmake_use_find_package jpeg JPEG)
- $(cmake_use_find_package openexr OpenEXR)
- $(cmake_use_find_package pdf Poppler)
- $(cmake_use_find_package qtmedia Qt5Multimedia)
- $(cmake_use_find_package raw LibRaw)
- $(cmake_use_find_package tiff TIFF)
- $(cmake_use_find_package vc Vc)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2020-07-12 22:55 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-07-12 22:55 UTC (permalink / raw
To: gentoo-commits
commit: 07cda4a3a1bd5fd356ea8a4961d6e12a2c870b98
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 18:48:47 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 22:53:27 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=07cda4a3
media-gfx/krita: Update tests-optional patch
Now we rely on patched ECMAddTests.cmake to skip them.
The remaining patch is much smaller.
Bug: https://bugs.gentoo.org/651978
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../krita/files/krita-4.3.1-tests-optional.patch | 80 ++++++++++++++++++++++
media-gfx/krita/krita-9999.ebuild | 2 +
2 files changed, 82 insertions(+)
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 0000000000..37f2ac50ff
--- /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-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index fda25b11c0..215cf210d5 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -87,6 +87,8 @@ DEPEND="${RDEPEND}
# bug 630508
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+
pkg_setup() {
python-single-r1_pkg_setup
ecm_pkg_setup
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2021-03-26 21:18 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-03-26 21:18 UTC (permalink / raw
To: gentoo-commits
commit: 4847e3cf248e8af5be4dc7207f137ed42f27242c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 19:32:10 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 21:18:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4847e3cf
media-gfx/krita: Drop 4.4.3_beta2
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_beta2.ebuild | 129 ------------------------
2 files changed, 165 deletions(-)
diff --git a/media-gfx/krita/files/krita-4.4.2-quazip1.patch b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
deleted file mode 100644
index 6a49bd3ba2..0000000000
--- a/media-gfx/krita/files/krita-4.4.2-quazip1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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_beta2.ebuild b/media-gfx/krita/krita-4.4.3_beta2.ebuild
deleted file mode 100644
index 3c31724a57..0000000000
--- a/media-gfx/krita/krita-4.4.3_beta2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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/, media-gfx/krita/files/
@ 2024-11-25 22:52 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2024-11-25 22:52 UTC (permalink / raw
To: gentoo-commits
commit: 96a63e864379619689ed79680582c93429102fd5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 15:16:23 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 22:50:30 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=96a63e86
media-gfx/krita: enable py3.13
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=488680
See also: https://bugzilla.redhat.com/show_bug.cgi?id=2278646
Closes: https://bugs.gentoo.org/943149
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/files/krita-5.2.6-py3.13.patch | 120 +++++++++++++++++++++++++
media-gfx/krita/krita-9999.ebuild | 4 +-
2 files changed, 123 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-5.2.6-py3.13.patch b/media-gfx/krita/files/krita-5.2.6-py3.13.patch
new file mode 100644
index 0000000000..6714059895
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.6-py3.13.patch
@@ -0,0 +1,120 @@
+From 0f43ec3158225092f6a02422eb90c56421326570 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Tue, 18 Jun 2024 22:05:34 +0200
+Subject: [PATCH] Changes to build pykrita with Python 3.13
+
+Python 3.11 deprecated Py_SetPath() in 2022 and Python 3.13 removed it.
+Instead one needs to use the new PyConfig API (PEP 587) added to Python
+3.8.
+
+Fix: #488680
+---
+ .../extensions/pykrita/plugin/utilities.cpp | 61 +++++++++++++++++--
+ plugins/extensions/pykrita/plugin/utilities.h | 4 +-
+ 2 files changed, 57 insertions(+), 8 deletions(-)
+
+diff --git a/plugins/extensions/pykrita/plugin/utilities.cpp b/plugins/extensions/pykrita/plugin/utilities.cpp
+index 4f58183238..1e497b2681 100644
+--- a/plugins/extensions/pykrita/plugin/utilities.cpp
++++ b/plugins/extensions/pykrita/plugin/utilities.cpp
+@@ -19,8 +19,10 @@
+ #include <cmath>
+ #include <Python.h>
+
++#include <QDebug>
+ #include <QDir>
+ #include <QLibrary>
++#include <QProcessEnvironment>
+ #include <QString>
+ #include <QStringList>
+ #include <QVector>
+@@ -412,18 +414,65 @@ bool Python::setPath(const QStringList& scriptPaths)
+ joinedPaths = joinedPaths + pathSeparator + originalPath;
+ }
+ dbgScript << "Setting python paths:" << joinedPaths;
++
+ #ifdef Q_OS_WIN
+- QVector<wchar_t> joinedPathsWChars(joinedPaths.size() + 1, 0);
+- joinedPaths.toWCharArray(joinedPathsWChars.data());
+- Py_SetPath(joinedPathsWChars.data());
++ PyStatus status;
++ PyConfig config;
++ PyConfig_InitPythonConfig(&config);
++
++ for (const QString& path : joinedPaths.split(pathSeparator)) {
++ status = PyWideStringList_Append(&config.module_search_paths, path.toStdWString().c_str());
++ if (PyStatus_Exception(status)) {
++ qDebug() << "Error appending to PyWideStringList:" << status.err_msg;
++ dbgScript << "Error appending to PyWideStringList";
++ return false;
++ }
++ }
++
++ config.module_search_paths_set = true;
++ qDebug() << "Set module_search_paths";
++
++ status = Py_InitializeFromConfig(&config);
++ if (PyStatus_Exception(status)) {
++ qDebug() << "Cannot initialize Py_InitializeFromConfig:" << status.err_msg;
++ Py_ExitStatusException(status);
++ PyConfig_Clear(&config);
++ dbgScript << "Cannot initialize Py_InitializeFromConfig config";
++ return false;
++ }
++
++ PyConfig_Clear(&config);
+ #else
+ if (runningInBundle) {
+- QVector<wchar_t> joinedPathsWChars(joinedPaths.size() + 1, 0);
+- joinedPaths.toWCharArray(joinedPathsWChars.data());
+- Py_SetPath(joinedPathsWChars.data());
++ PyStatus status;
++ PyConfig config;
++ PyConfig_InitPythonConfig(&config);
++
++ for (const QString& path : joinedPaths.split(pathSeparator)) {
++ status = PyWideStringList_Append(&config.module_search_paths, path.toStdWString().c_str());
++ if (PyStatus_Exception(status)) {
++ qDebug() << "Error appending to PyWideStringList:" << status.err_msg;
++ dbgScript << "Error appending to PyWideStringList";
++ return false;
++ }
++ }
++
++ config.module_search_paths_set = true;
++
++ status = Py_InitializeFromConfig(&config);
++ if (PyStatus_Exception(status)) {
++ Py_ExitStatusException(status);
++ qDebug() << "Cannot initialize Py_InitializeFromConfig 2:" << status.err_msg;
++ PyConfig_Clear(&config);
++ dbgScript << "Cannot initialize Py_InitializeFromConfig config";
++ return false;
++ }
++
++ PyConfig_Clear(&config);
+ }
+ else {
+ qputenv("PYTHONPATH", joinedPaths.toLocal8Bit());
++ qDebug() << "Set PYTHONPATH environment variable";
+ }
+ #endif
+ isPythonPathSet = true;
+diff --git a/plugins/extensions/pykrita/plugin/utilities.h b/plugins/extensions/pykrita/plugin/utilities.h
+index fb309bd0b8..aec47da239 100644
+--- a/plugins/extensions/pykrita/plugin/utilities.h
++++ b/plugins/extensions/pykrita/plugin/utilities.h
+@@ -81,8 +81,8 @@ public:
+ static bool libraryLoad();
+
+ /**
+- * Set the Python paths by calling Py_SetPath. This should be called before
+- * initialization to ensure the proper libraries get loaded.
++ * Set the Python paths by calling Py_InitializeFromConfig. This should be
++ * called before initialization to ensure the proper libraries get loaded.
+ */
+ static bool setPath(const QStringList& scriptPaths);
+
+--
+2.45.2
+
diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 69c40eb547..11531fa6fa 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=8
ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
KFMIN=5.115.0
QTMIN=5.15.12
inherit ecm kde.org python-single-r1
@@ -96,6 +96,8 @@ PATCHES=(
# downstream
"${FILESDIR}"/${PN}-5.2.3-tests-optional.patch
"${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
+ # Fedora, non-upstreamed:
+ "${FILESDIR}"/${P}-py3.13.patch # bug 943149
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-11-25 22:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-25 22:52 [gentoo-commits] proj/kde:master commit in: media-gfx/krita/, media-gfx/krita/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-03-26 21:18 Andreas Sturmlechner
2020-07-12 22:55 Andreas Sturmlechner
2020-07-12 22:55 Andreas Sturmlechner
2016-10-27 19:42 Michael Palimaka
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