* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2017-07-01 13:41 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2017-07-01 13:41 UTC (permalink / raw
To: gentoo-commits
commit: a9d8edad93cd754f53112207483258f467ce1e27
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 1 13:36:20 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 1 13:36:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d8edad
media-gfx/krita: Drop obsolete header, fix build with Qt-5.9
Reported-by: Vasco Gervasi <yellowhat46 <AT> gmail.com>
Gentoo-bug: 621420
Package-Manager: Portage-2.3.6, Repoman-2.3.1
media-gfx/krita/files/krita-3.1.4-qt-5.9.patch | 24 ++++++++++++++++++++++++
media-gfx/krita/krita-3.1.4.ebuild | 5 ++++-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-3.1.4-qt-5.9.patch b/media-gfx/krita/files/krita-3.1.4-qt-5.9.patch
new file mode 100644
index 00000000000..6bda9ddd206
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.1.4-qt-5.9.patch
@@ -0,0 +1,24 @@
+From 2f59d0d1d91e3f79342c20d0df68aa9a51817e8d Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Sat, 6 May 2017 16:00:21 +0200
+Subject: [PATCH] Drop QForeachContainer include and fix Qt 5.9 build
+
+It's not used anywhere.
+
+Acked by boud.
+---
+ libs/ui/KisResourceBundleManifest.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libs/ui/KisResourceBundleManifest.cpp b/libs/ui/KisResourceBundleManifest.cpp
+index e4f94ca788..83761657d8 100644
+--- a/libs/ui/KisResourceBundleManifest.cpp
++++ b/libs/ui/KisResourceBundleManifest.cpp
+@@ -22,7 +22,6 @@
+ #include <QDomElement>
+ #include <QDomNode>
+ #include <QDomNodeList>
+-#include <QForeachContainer>
+
+ #include <KoXmlNS.h>
+ #include <KoXmlReader.h>
diff --git a/media-gfx/krita/krita-3.1.4.ebuild b/media-gfx/krita/krita-3.1.4.ebuild
index 0b60191a36a..371f0260e9b 100644
--- a/media-gfx/krita/krita-3.1.4.ebuild
+++ b/media-gfx/krita/krita-3.1.4.ebuild
@@ -72,7 +72,10 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra-l10n:4[calligra_features_krita(+)]
"
-PATCHES=( "${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch
+ "${FILESDIR}"/${P}-qt-5.9.patch
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2017-09-08 21:00 Johannes Huber
0 siblings, 0 replies; 23+ messages in thread
From: Johannes Huber @ 2017-09-08 21:00 UTC (permalink / raw
To: gentoo-commits
commit: 2cc5dd0ef9bd058906055037bf798fa5127d7141
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 8 20:59:33 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Sep 8 20:59:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc5dd0e
media-gfx/krita: Remove 3.2.0
Package-Manager: Portage-2.3.8, Repoman-2.3.3
media-gfx/krita/Manifest | 1 -
media-gfx/krita/files/krita-3.2.0-unused-dep.patch | 69 ----------------
media-gfx/krita/krita-3.2.0.ebuild | 94 ----------------------
3 files changed, 164 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 1fab2f458db..58962f199bf 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
DIST krita-3.1.4.tar.gz 209778186 SHA256 741837b0d12afa795dbbca45d5efc78966f3041dbfb22a268c101c7dc23e82aa SHA512 6695d8d09552de2d98cb4a8fac1aefc6b5e35df50d7b72c088f11a25af54574b303a7445b4a9cb099844cdf0729a185f03fd208ab2f98329123398fd54a374df WHIRLPOOL 9b8819432594d10377ef6db5adaca06193044203ae5b870a2f014171c817dd2ffc251bd20af0a05183251a798d06fc6aa7b33c1a640879af3ac3c01c0e9869e7
-DIST krita-3.2.0.tar.gz 207016115 SHA256 0891be48a0338e1419d084da594900864b85de89cc4a38c8946d907cc1009356 SHA512 62fc8f333097eb23bd631f4e28a23c38bfffba2206277463454f2b9cd199a2972b185511407d50e62ce069c3dfbcfadcebbbb8faa89484f41bcbed3b352e27d5 WHIRLPOOL 403d0381af6fcf9404b790dc34feb26705629795f77c2fb61d50bfb6691872ffb1d9c56099841088a9d32135fe23ed91cd8f35eb491de2888aa0e6b01c83ef74
DIST krita-3.2.1.tar.gz 207014866 SHA256 ef06cee677d75861edca0e1f825bca42ff59b7200aeb827e16f8d1fb5ef14e39 SHA512 ddc7153a3fcef072de762cd48d4d6df765cc88b7a413028b3aec5690382c1ab7f61f6ae37070c78ef2be1bdc26107908d288976bfa12d14ca35934ce33fb10a3 WHIRLPOOL 79bc89b7ebf63b2a31bac726e91e4b77bf7b2a6eafe15a6bf15baf935f2bf56e2f612359fc16c7129251623dfe4d7fe53cd9d2f42d423385487a832309afd17e
diff --git a/media-gfx/krita/files/krita-3.2.0-unused-dep.patch b/media-gfx/krita/files/krita-3.2.0-unused-dep.patch
deleted file mode 100644
index 34031b51bac..00000000000
--- a/media-gfx/krita/files/krita-3.2.0-unused-dep.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 176546ed492883b63f6b8c274a97ce781af3631c Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Wed, 16 Aug 2017 23:35:07 +0200
-Subject: Remove unused dependency
-
-Summary:
-libcurl doesn't seem to be used anymore since
-427a9ede658e4bee0e96e09741adb879e396c0c1 and the removal of the gmic
-plugin.
-
-Test Plan: Still builds fine.
-
-Reviewers: #krita, rempt
-
-Subscribers: woltherav
-
-Tags: #krita
-
-Differential Revision: https://phabricator.kde.org/D7360
----
- CMakeLists.txt | 10 ----------
- README_PACKAGERS.md | 3 ---
- 2 files changed, 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5575b8c..b1edfc1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -604,16 +604,6 @@ set_package_properties(OpenMP PROPERTIES
- TYPE OPTIONAL
- PURPOSE "Optionally used by the G'Mic plugin")
-
--##
--## Test for Curl (for G'Mic)
--##
--find_package(CURL)
--set_package_properties(CURL PROPERTIES
-- DESCRIPTION "A tool to fetch remote data"
-- URL "http://curl.haxx.se/"
-- TYPE OPTIONAL
-- PURPOSE "Optionally used by the G'Mic plugin")
--
- ############################
- #############################
- ## Add Krita helper macros ##
-diff --git a/README_PACKAGERS.md b/README_PACKAGERS.md
-index ef66f9d..bd3d694 100644
---- a/README_PACKAGERS.md
-+++ b/README_PACKAGERS.md
-@@ -23,8 +23,6 @@ There are four forks of 3rd party libraries that are relevant and cannot be repl
-
- * plugins/impex/xcf/3rdparty contains the xcftools code. This has never been released as a library
-
--* plugins/extensions/gmic/3rdparty contains G'Mic. This has never been released as a shared library.
--
- * libs/image/3rdparty contains einspline. This code is directly linke d into the kritaimage library and has never been released as a separate library.
-
- == Build flags ==
-@@ -47,7 +45,6 @@ Krita depends on:
- * ilmbase
- * jpeg: Note that libjpeg-turbo is recommended.
- * lcms2
-- * libcurl
- * libraw
- * opencolorio
- * openexr
---
-cgit v0.11.2
-
diff --git a/media-gfx/krita/krita-3.2.0.ebuild b/media-gfx/krita/krita-3.2.0.ebuild
deleted file mode 100644
index fb7757c8404..00000000000
--- a/media-gfx/krita/krita-3.2.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
-
-COMMON_DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui '-gles2')
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtx11extras)
- $(add_qt_dep qtxml)
- dev-libs/boost:=
- media-gfx/exiv2:=
- media-libs/lcms
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXi
- color-management? ( media-libs/opencolorio )
- fftw? ( sci-libs/fftw:3.0= )
- gsl? ( sci-libs/gsl:= )
- jpeg? ( virtual/jpeg:0 )
- openexr? (
- media-libs/ilmbase:=
- media-libs/openexr
- )
- pdf? ( app-text/poppler[qt5] )
- qtmedia? ( $(add_qt_dep qtmultimedia) )
- raw? ( media-libs/libraw:= )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-lang/perl
- sys-devel/gettext
- vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/calligra:4[calligra_features_krita]
- !app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-tests-optional.patch
- "${FILESDIR}"/${P}-unused-dep.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package color-management OCIO)
- $(cmake-utils_use_find_package fftw FFTW3)
- $(cmake-utils_use_find_package gsl GSL)
- $(cmake-utils_use_find_package jpeg JPEG)
- $(cmake-utils_use_find_package openexr OpenEXR)
- $(cmake-utils_use_find_package pdf Poppler)
- $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
- $(cmake-utils_use_find_package raw LibRaw)
- $(cmake-utils_use_find_package tiff TIFF)
- $(cmake-utils_use_find_package vc Vc)
- )
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2018-08-29 16:48 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-08-29 16:48 UTC (permalink / raw
To: gentoo-commits
commit: 1073bbaf30c2a586930d2738f9ad958889c64416
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 16:17:02 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 16:47:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1073bbaf
media-gfx/krita: Fix build with >=libraw-0.19
Reverting 88d14e3.
Closes: https://bugs.gentoo.org/659904
Package-Manager: Portage-2.3.48, Repoman-2.3.10
.../krita/files/krita-4.0.3-libraw-0.19.patch | 77 ++++++++++++++++++++++
media-gfx/krita/krita-4.0.3.ebuild | 4 +-
2 files changed, 80 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch b/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch
new file mode 100644
index 00000000000..03dd3c6bc75
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch
@@ -0,0 +1,77 @@
+From 9fd6b44701e674058b0eaa5d3f98a99e410a1e03 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 29 Aug 2018 17:50:28 +0200
+Subject: [PATCH] Fix build with libraw 0.19
+
+Summary:
+Patch taken from arojas in https://phabricator.kde.org/D15132 applied
+with little offset.
+
+Test Plan: Built fine against libraw-0.19 with krita.git master.
+
+Reviewers: rempt, #krita
+
+Subscribers: lbeltrame, rdieter, pino, arojas
+
+Tags: #krita
+
+Differential Revision: https://phabricator.kde.org/D15148
+---
+ plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+index 1c761f8563..adc26d2662 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+@@ -375,6 +375,7 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
+ raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
+ break;
+ }
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
+ case RawDecodingSettings::LINENR:
+ {
+ // (100 - 1000) => (0.001 - 0.02) conversion.
+@@ -391,23 +392,28 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
+ raw.imgdata.params.cfa_clean = true;
+ break;
+ }
++#endif
+ default: // No Noise Reduction
+ {
+ raw.imgdata.params.threshold = 0;
+ raw.imgdata.params.fbdd_noiserd = 0;
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
+ raw.imgdata.params.linenoise = 0;
+ raw.imgdata.params.cfaline = false;
+ raw.imgdata.params.lclean = 0;
+ raw.imgdata.params.cclean = 0;
+ raw.imgdata.params.cfa_clean = false;
++#endif
+ break;
+ }
+ }
+
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
+ // Chromatic aberration correction.
+ raw.imgdata.params.ca_correc = m_parent->m_rawDecodingSettings.enableCACorrection;
+ raw.imgdata.params.cared = m_parent->m_rawDecodingSettings.caMultiplier[0];
+ raw.imgdata.params.cablue = m_parent->m_rawDecodingSettings.caMultiplier[1];
++#endif
+
+ // Exposure Correction before interpolation.
+ raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection;
+@@ -461,8 +467,10 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
+
+ raw.imgdata.params.dcb_iterations = m_parent->m_rawDecodingSettings.dcbIterations;
+ raw.imgdata.params.dcb_enhance_fl = m_parent->m_rawDecodingSettings.dcbEnhanceFl;
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
+ raw.imgdata.params.eeci_refine = m_parent->m_rawDecodingSettings.eeciRefine;
+ raw.imgdata.params.es_med_passes = m_parent->m_rawDecodingSettings.esMedPasses;
++#endif
+
+ //-------------------------------------------------------------------------------------------
+
+--
+2.18.0
+
diff --git a/media-gfx/krita/krita-4.0.3.ebuild b/media-gfx/krita/krita-4.0.3.ebuild
index ef2f33ef248..fd16ae05438 100644
--- a/media-gfx/krita/krita-4.0.3.ebuild
+++ b/media-gfx/krita/krita-4.0.3.ebuild
@@ -69,7 +69,7 @@ COMMON_DEPEND="
dev-python/sip[${PYTHON_USEDEP}]
)
qtmedia? ( $(add_qt_dep qtmultimedia) )
- raw? ( <media-libs/libraw-0.19:= )
+ raw? ( media-libs/libraw:= )
tiff? ( media-libs/tiff:0 )
"
DEPEND="${COMMON_DEPEND}
@@ -86,6 +86,8 @@ RDEPEND="${COMMON_DEPEND}
# bug 630508
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-libraw-0.19.patch" )
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2018-08-29 16:48 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-08-29 16:48 UTC (permalink / raw
To: gentoo-commits
commit: bac6717f669476b6de842bb51a3cfa65c4e944c0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 16:26:41 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 16:47:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bac6717f
media-gfx/krita: Use patch, not KDE_TEST=forceoptional-recursive
Package-Manager: Portage-2.3.48, Repoman-2.3.10
.../krita/files/krita-4.0.3-tests-optional.patch | 324 +++++++++++++++++++++
media-gfx/krita/krita-4.0.3.ebuild | 7 +-
2 files changed, 329 insertions(+), 2 deletions(-)
diff --git a/media-gfx/krita/files/krita-4.0.3-tests-optional.patch b/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
new file mode 100644
index 00000000000..c9e3ddc2aea
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
@@ -0,0 +1,324 @@
+Autogenerated by KDE_TEST=forceoptional-recursive and edited.
+
+--- a/plugins/paintops/libpaintop/CMakeLists.txt 2018-08-29 18:17:38.843385842 +0200
++++ b/plugins/paintops/libpaintop/CMakeLists.txt 2018-08-29 18:17:38.846385865 +0200
+@@ -104,4 +104,6 @@
+ install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2018-08-29 18:17:38.851385903 +0200
++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2018-08-29 18:17:38.854385926 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+
+ include_directories(brush
+ duplicate
+--- a/plugins/impex/libkra/CMakeLists.txt 2018-08-29 18:17:38.858385956 +0200
++++ b/plugins/impex/libkra/CMakeLists.txt 2018-08-29 18:17:38.861385978 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritalibkra_LIB_SRCS
+ kis_colorize_dom_utils.cpp
+--- a/plugins/impex/exr/CMakeLists.txt 2018-08-29 18:17:38.866386016 +0200
++++ b/plugins/impex/exr/CMakeLists.txt 2018-08-29 18:17:38.869386039 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
+
+--- a/plugins/impex/svg/CMakeLists.txt 2018-08-29 18:17:38.874386077 +0200
++++ b/plugins/impex/svg/CMakeLists.txt 2018-08-29 18:17:38.878386107 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritasvgimport_SOURCES
+ kis_svg_import.cc
+--- a/plugins/impex/jpeg/CMakeLists.txt 2018-08-29 18:17:38.883386145 +0200
++++ b/plugins/impex/jpeg/CMakeLists.txt 2018-08-29 18:17:38.887386175 +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/heightmap/CMakeLists.txt 2018-08-29 18:17:38.892386213 +0200
++++ b/plugins/impex/heightmap/CMakeLists.txt 2018-08-29 18:17:38.896386243 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+
+--- a/plugins/impex/psd/CMakeLists.txt 2018-08-29 18:17:38.901386281 +0200
++++ b/plugins/impex/psd/CMakeLists.txt 2018-08-29 18:17:38.904386304 +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/ppm/CMakeLists.txt 2018-08-29 18:17:38.909386342 +0200
++++ b/plugins/impex/ppm/CMakeLists.txt 2018-08-29 18:17:38.913386372 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+
+--- a/plugins/impex/png/CMakeLists.txt 2018-08-29 18:17:38.918386410 +0200
++++ b/plugins/impex/png/CMakeLists.txt 2018-08-29 18:17:38.922386440 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritapngimport_SOURCES
+ kis_png_import.cc
+--- a/plugins/impex/csv/CMakeLists.txt 2018-08-29 18:17:38.927386478 +0200
++++ b/plugins/impex/csv/CMakeLists.txt 2018-08-29 18:17:38.931386508 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ # import
+
+--- a/plugins/impex/xcf/CMakeLists.txt 2018-08-29 18:17:38.936386546 +0200
++++ b/plugins/impex/xcf/CMakeLists.txt 2018-08-29 18:17:38.940386576 +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 2018-08-29 18:17:38.944386606 +0200
++++ b/plugins/impex/tiff/CMakeLists.txt 2018-08-29 18:17:38.947386630 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(libkritatiffconverter_LIB_SRCS
+ kis_tiff_converter.cc
+--- a/plugins/extensions/qmic/CMakeLists.txt 2018-08-29 18:17:38.952386667 +0200
++++ b/plugins/extensions/qmic/CMakeLists.txt 2018-08-29 18:17:38.955386690 +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/filters/CMakeLists.txt 2018-08-29 18:17:38.959386720 +0200
++++ b/plugins/filters/CMakeLists.txt 2018-08-29 18:17:38.963386750 +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 2018-08-29 18:17:38.968386788 +0200
++++ b/plugins/filters/unsharp/CMakeLists.txt 2018-08-29 18:17:38.971386811 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ set(kritaunsharpfilter_SOURCES
+ unsharp.cpp
+--- a/plugins/tools/basictools/CMakeLists.txt 2018-08-29 18:17:38.976386849 +0200
++++ b/plugins/tools/basictools/CMakeLists.txt 2018-08-29 18:17:38.980386879 +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 2018-08-29 18:17:38.985386917 +0200
++++ b/plugins/tools/tool_transform2/CMakeLists.txt 2018-08-29 18:17:38.989386947 +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/color/lcms2engine/CMakeLists.txt 2018-08-29 18:17:38.994386985 +0200
++++ b/plugins/color/lcms2engine/CMakeLists.txt 2018-08-29 18:17:38.998387015 +0200
+@@ -1,6 +1,8 @@
+ project( lcmsengine )
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${LCMS2_INCLUDE_DIR}
+--- a/plugins/dockers/defaultdockers/CMakeLists.txt 2018-08-29 18:17:39.003387053 +0200
++++ b/plugins/dockers/defaultdockers/CMakeLists.txt 2018-08-29 18:17:39.007387084 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ set(kritadefaultdockers_SOURCES
+ kis_layer_box.cpp
+--- a/plugins/dockers/animation/CMakeLists.txt 2018-08-29 18:17:39.012387121 +0200
++++ b/plugins/dockers/animation/CMakeLists.txt 2018-08-29 18:17:39.016387151 +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/dockers/lut/CMakeLists.txt 2018-08-29 18:17:39.021387189 +0200
++++ b/plugins/dockers/lut/CMakeLists.txt 2018-08-29 18:17:39.025387220 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${OCIO_INCLUDE_DIR}
+--- a/libs/store/CMakeLists.txt 2018-08-29 18:17:39.030387258 +0200
++++ b/libs/store/CMakeLists.txt 2018-08-29 18:17:39.033387280 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritastore_LIB_SRCS
+ KoDirectoryStore.cpp
+--- a/libs/flake/CMakeLists.txt 2018-08-29 18:17:39.038387318 +0200
++++ b/libs/flake/CMakeLists.txt 2018-08-29 18:17:39.042387349 +0200
+@@ -9,7 +9,9 @@
+ )
+
+ add_subdirectory(styles)
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritaflake_SRCS
+ KoGradientHelper.cpp
+--- a/libs/widgetutils/CMakeLists.txt 2018-08-29 18:17:39.046387379 +0200
++++ b/libs/widgetutils/CMakeLists.txt 2018-08-29 18:17:39.049387401 +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/odf/CMakeLists.txt 2018-08-29 18:17:39.054387439 +0200
++++ b/libs/odf/CMakeLists.txt 2018-08-29 18:17:39.058387469 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ set(kritaodf_LIB_SRCS
+ KoOdf.cpp
+--- a/libs/pigment/CMakeLists.txt 2018-08-29 18:17:39.062387500 +0200
++++ b/libs/pigment/CMakeLists.txt 2018-08-29 18:17:39.067387538 +0200
+@@ -31,7 +31,9 @@
+ message("${__per_arch_factory_objs}")
+ endif()
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ add_subdirectory(benchmarks)
+
+ set(kritapigment_SRCS
+--- a/libs/widgets/CMakeLists.txt 2018-08-29 18:17:39.073387583 +0200
++++ b/libs/widgets/CMakeLists.txt 2018-08-29 18:17:39.078387621 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+--- a/libs/ui/CMakeLists.txt 2018-08-29 18:17:39.084387666 +0200
++++ b/libs/ui/CMakeLists.txt 2018-08-29 18:17:39.088387697 +0200
+@@ -8,7 +8,9 @@
+ ${OCIO_INCLUDE_DIR}
+ )
+
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ if (APPLE)
+ find_library(FOUNDATION_LIBRARY Foundation)
+--- a/libs/image/CMakeLists.txt 2018-08-29 18:17:39.092387727 +0200
++++ b/libs/image/CMakeLists.txt 2018-08-29 18:17:39.096387757 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ add_subdirectory( tiles3 )
+
+--- a/libs/image/tiles3/CMakeLists.txt 2018-08-29 18:17:39.101387795 +0200
++++ b/libs/image/tiles3/CMakeLists.txt 2018-08-29 18:17:39.105387825 +0200
+@@ -1 +1,3 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/global/CMakeLists.txt 2018-08-29 18:17:39.110387863 +0200
++++ b/libs/global/CMakeLists.txt 2018-08-29 18:17:39.113387886 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ include(CheckFunctionExists)
+ check_function_exists(backtrace HAVE_BACKTRACE)
+--- a/libs/brush/CMakeLists.txt 2018-08-29 18:17:39.117387916 +0200
++++ b/libs/brush/CMakeLists.txt 2018-08-29 18:17:39.121387946 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ include_directories(SYSTEM
+ ${EIGEN3_INCLUDE_DIR}
+--- a/libs/libkis/CMakeLists.txt 2018-08-29 18:17:39.126387984 +0200
++++ b/libs/libkis/CMakeLists.txt 2018-08-29 18:17:39.131388022 +0200
+@@ -46,4 +46,6 @@
+ install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
diff --git a/media-gfx/krita/krita-4.0.3.ebuild b/media-gfx/krita/krita-4.0.3.ebuild
index fd16ae05438..72fdccfb662 100644
--- a/media-gfx/krita/krita-4.0.3.ebuild
+++ b/media-gfx/krita/krita-4.0.3.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-KDE_TEST="forceoptional-recursive"
+KDE_TEST="forceoptional"
VIRTUALX_REQUIRED="test"
PYTHON_COMPAT=( python3_{4,5,6} )
inherit kde5 python-single-r1
@@ -86,7 +86,10 @@ RDEPEND="${COMMON_DEPEND}
# bug 630508
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${P}-libraw-0.19.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-tests-optional.patch"
+ "${FILESDIR}/${P}-libraw-0.19.patch"
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2018-09-01 19:31 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-09-01 19:31 UTC (permalink / raw
To: gentoo-commits
commit: a1f2a30c593f6d748720218a462bc5640f4a071b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 30 11:57:00 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 1 19:31:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1f2a30c
media-gfx/krita: Drop 3.3.3
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-gfx/krita/Manifest | 1 -
.../krita/files/krita-3.2.0-tests-optional.patch | 282 ---------------------
media-gfx/krita/krita-3.3.3.ebuild | 94 -------
3 files changed, 377 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 81392963b2a..2725ffd07b5 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
-DIST krita-3.3.3.tar.gz 207582956 BLAKE2B 36fd2978956fbba870ff8d8c28c31db0731742385620d6b5fd0cc275d74bf6352635c4fd4a537a87b7994fa41d140ee05000593d5a95cd288fd07959e8ef1693 SHA512 b6dc30809e0d6c19fee4bbb240aa53c65e88361ebe273c73c2f24f43904c3cd51719dadb9c11fb7f691f17d75732374295ce904810d8893b7f95b45f859901e0
DIST krita-4.0.3.tar.gz 241332929 BLAKE2B 222a3425f64c98d964f421c84f48295d5cb72e622631e9b1cb5a2ac9980a6f59cbf12b0815df68a09daf138efc2d4e2e83cb46034c8e12ddd621cb49f1117b72 SHA512 13b3263a09dbb955dea435e97bf12b6f0670fce68c4c2c9e97e7b45b480301119f317e72fac63eec07caff295885b7d62ac7c6255545a139e1e5f4b1106989e8
DIST krita-4.0.4.tar.gz 241431012 BLAKE2B c8bb51132f089276761d5a6897fee416a23154267fef72ad525660125770d0fe4b6ab93f70b67ba11c8344f2b27f82bbadc96306d111ff77145b4056ec2c7601 SHA512 a1d82366f7b145c5db4c74ea8c31672a96a3dccd1b31fe2758606de50a4a8e5f8fd794e319127f98cc80f067d851edd4bc6e2f842eba76b807cc3a075a997f45
diff --git a/media-gfx/krita/files/krita-3.2.0-tests-optional.patch b/media-gfx/krita/files/krita-3.2.0-tests-optional.patch
deleted file mode 100644
index 0f143ff1cc5..00000000000
--- a/media-gfx/krita/files/krita-3.2.0-tests-optional.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-Autogenerated by KDE_TEST=forceoptional-recursive and edited.
-
---- a/plugins/paintops/libpaintop/CMakeLists.txt 2017-08-19 23:45:06.235796211 +0200
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt 2017-08-19 23:45:06.241796045 +0200
-@@ -95,4 +95,6 @@
- install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2017-08-19 23:45:06.250795797 +0200
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2017-08-19 23:45:06.258795576 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(brush/tests)
-+endif()
-
- include_directories(brush)
- include_directories(duplicate)
---- a/plugins/impex/exr/CMakeLists.txt 2017-08-19 23:45:06.266795355 +0200
-+++ b/plugins/impex/exr/CMakeLists.txt 2017-08-19 23:45:06.274795134 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
-
---- a/plugins/impex/jpeg/CMakeLists.txt 2017-08-19 23:45:06.282794913 +0200
-+++ b/plugins/impex/jpeg/CMakeLists.txt 2017-08-19 23:45:06.289794720 +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/psd/CMakeLists.txt 2017-08-19 23:45:06.297794499 +0200
-+++ b/plugins/impex/psd/CMakeLists.txt 2017-08-19 23:45:06.304794306 +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/ppm/CMakeLists.txt 2017-08-19 23:45:06.313794058 +0200
-+++ b/plugins/impex/ppm/CMakeLists.txt 2017-08-19 23:45:06.319793892 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
-
---- a/plugins/impex/png/CMakeLists.txt 2017-08-19 23:45:06.327793672 +0200
-+++ b/plugins/impex/png/CMakeLists.txt 2017-08-19 23:45:06.334793478 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritapngimport_SOURCES
- kis_png_import.cc
---- a/plugins/impex/csv/CMakeLists.txt 2017-08-19 23:45:06.343793230 +0200
-+++ b/plugins/impex/csv/CMakeLists.txt 2017-08-19 23:45:06.349793064 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM
- ${Boost_INCLUDE_DIRS}
---- a/plugins/impex/xcf/CMakeLists.txt 2017-08-19 23:45:06.357792843 +0200
-+++ b/plugins/impex/xcf/CMakeLists.txt 2017-08-19 23:45:06.364792650 +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 2017-08-19 23:45:06.372792429 +0200
-+++ b/plugins/impex/tiff/CMakeLists.txt 2017-08-19 23:45:06.379792236 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(libkritatiffconverter_LIB_SRCS
- kis_tiff_converter.cc
---- a/plugins/extensions/qmic/CMakeLists.txt 2017-08-19 23:45:06.387792016 +0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt 2017-08-19 23:45:06.393791850 +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/filters/CMakeLists.txt 2017-08-19 23:45:06.401791629 +0200
-+++ b/plugins/filters/CMakeLists.txt 2017-08-19 23:45:06.408791436 +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 2017-08-19 23:45:06.416791215 +0200
-+++ b/plugins/filters/unsharp/CMakeLists.txt 2017-08-19 23:45:06.422791049 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- set(kritaunsharpfilter_SOURCES
- unsharp.cpp
---- a/plugins/tools/basictools/CMakeLists.txt 2017-08-19 23:45:06.430790829 +0200
-+++ b/plugins/tools/basictools/CMakeLists.txt 2017-08-19 23:45:06.437790636 +0200
-@@ -1,5 +1,7 @@
- if (NOT APPLE)
-- add_subdirectory(tests)
-+ if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+ endif()
- endif ()
-
- include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
---- a/plugins/tools/tool_transform2/CMakeLists.txt 2017-08-19 23:45:06.446790387 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt 2017-08-19 23:45:06.453790194 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
-- add_subdirectory(tests)
-+ if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+ endif()
- endif()
-
- include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
---- a/plugins/color/lcms2engine/CMakeLists.txt 2017-08-19 23:45:06.461789973 +0200
-+++ b/plugins/color/lcms2engine/CMakeLists.txt 2017-08-19 23:45:06.468789780 +0200
-@@ -1,6 +1,8 @@
- project( lcmsengine )
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM
- ${LCMS2_INCLUDE_DIR}
---- a/plugins/dockers/defaultdockers/CMakeLists.txt 2017-08-19 23:45:06.476789559 +0200
-+++ b/plugins/dockers/defaultdockers/CMakeLists.txt 2017-08-19 23:45:06.483789366 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- set(kritadefaultdockers_SOURCES
- kis_layer_box.cpp
---- a/plugins/dockers/animation/CMakeLists.txt 2017-08-19 23:45:06.491789145 +0200
-+++ b/plugins/dockers/animation/CMakeLists.txt 2017-08-19 23:45:06.497788980 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
-- add_subdirectory(tests)
-+ if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+ endif()
- endif()
-
- include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
---- a/plugins/dockers/lut/CMakeLists.txt 2017-08-19 23:45:06.506788731 +0200
-+++ b/plugins/dockers/lut/CMakeLists.txt 2017-08-19 23:45:06.512788565 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
-- add_subdirectory(tests)
-+ if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+ endif()
- endif()
-
- include_directories(SYSTEM
---- a/libs/store/CMakeLists.txt 2017-08-19 23:45:06.520788345 +0200
-+++ b/libs/store/CMakeLists.txt 2017-08-19 23:45:06.527788151 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritastore_LIB_SRCS
- KoDirectoryStore.cpp
---- a/libs/flake/CMakeLists.txt 2017-08-19 23:45:06.536787903 +0200
-+++ b/libs/flake/CMakeLists.txt 2017-08-19 23:45:06.542787737 +0200
-@@ -8,7 +8,9 @@
- )
-
- add_subdirectory(styles)
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritaflake_SRCS
- KoGradientHelper.cpp
---- a/libs/widgetutils/CMakeLists.txt 2017-08-19 23:45:06.550787517 +0200
-+++ b/libs/widgetutils/CMakeLists.txt 2017-08-19 23:45:06.557787323 +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/odf/CMakeLists.txt 2017-08-19 23:45:06.565787103 +0200
-+++ b/libs/odf/CMakeLists.txt 2017-08-19 23:45:06.572786910 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- set(kritaodf_LIB_SRCS
- KoOdf.cpp
---- a/libs/pigment/CMakeLists.txt 2017-08-19 23:45:06.580786689 +0200
-+++ b/libs/pigment/CMakeLists.txt 2017-08-19 23:45:06.587786495 +0200
-@@ -34,7 +34,9 @@
- message(${__per_arch_factory_objs})
- endif()
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- add_subdirectory(benchmarks)
-
- set(kritapigment_SRCS
---- a/libs/widgets/CMakeLists.txt 2017-08-19 23:45:06.595786275 +0200
-+++ b/libs/widgets/CMakeLists.txt 2017-08-19 23:45:06.601786109 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
---- a/libs/ui/CMakeLists.txt 2017-08-19 23:45:06.610785861 +0200
-+++ b/libs/ui/CMakeLists.txt 2017-08-19 23:45:06.617785667 +0200
-@@ -9,7 +9,9 @@
- ${Boost_INCLUDE_DIRS}
- )
-
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- if (APPLE)
- find_library(FOUNDATION_LIBRARY Foundation)
---- a/libs/image/CMakeLists.txt 2017-08-19 23:45:06.626785419 +0200
-+++ b/libs/image/CMakeLists.txt 2017-08-19 23:45:06.632785254 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- add_subdirectory( tiles3 )
-
---- a/libs/image/tiles3/CMakeLists.txt 2017-08-19 23:45:06.641785005 +0200
-+++ b/libs/image/tiles3/CMakeLists.txt 2017-08-19 23:45:06.647784839 +0200
-@@ -1,2 +1,4 @@
- include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/brush/CMakeLists.txt 2017-08-19 23:45:06.658784536 +0200
-+++ b/libs/brush/CMakeLists.txt 2017-08-19 23:45:06.665784343 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- include_directories(SYSTEM
- ${EIGEN3_INCLUDE_DIR}
diff --git a/media-gfx/krita/krita-3.3.3.ebuild b/media-gfx/krita/krita-3.3.3.ebuild
deleted file mode 100644
index b99c804b692..00000000000
--- a/media-gfx/krita/krita-3.3.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~x86"
-IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
-
-COMMON_DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui '-gles2')
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtx11extras)
- $(add_qt_dep qtxml)
- dev-libs/boost:=
- media-gfx/exiv2:=
- media-libs/lcms
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXi
- color-management? ( media-libs/opencolorio )
- fftw? ( sci-libs/fftw:3.0= )
- gsl? ( sci-libs/gsl:= )
- jpeg? ( virtual/jpeg:0 )
- openexr? (
- media-libs/ilmbase:=
- media-libs/openexr
- )
- pdf? ( app-text/poppler[qt5] )
- qtmedia? ( $(add_qt_dep qtmultimedia) )
- raw? ( <media-libs/libraw-0.19:= )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-lang/perl
- sys-devel/gettext
- vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/calligra:4[calligra_features_krita]
- !app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package color-management OCIO)
- $(cmake-utils_use_find_package fftw FFTW3)
- $(cmake-utils_use_find_package gsl GSL)
- $(cmake-utils_use_find_package jpeg JPEG)
- $(cmake-utils_use_find_package openexr OpenEXR)
- $(cmake-utils_use_find_package pdf Poppler)
- $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
- $(cmake-utils_use_find_package raw LibRaw)
- $(cmake-utils_use_find_package tiff TIFF)
- $(cmake-utils_use_find_package vc Vc)
- )
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2018-11-09 18:54 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-11-09 18:54 UTC (permalink / raw
To: gentoo-commits
commit: e3d9bbef39f9dfd42d46d4fa33eebbab2214ef13
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 9 18:53:32 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 9 18:54:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d9bbef
media-gfx/krita: Drop 4.0.3
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 -
.../krita/files/krita-4.0.3-libraw-0.19.patch | 77 --------------
media-gfx/krita/krita-4.0.4.ebuild | 116 ---------------------
3 files changed, 194 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 26c3c9590ab..3b9fcf2006d 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-DIST krita-4.0.4.tar.gz 241431012 BLAKE2B c8bb51132f089276761d5a6897fee416a23154267fef72ad525660125770d0fe4b6ab93f70b67ba11c8344f2b27f82bbadc96306d111ff77145b4056ec2c7601 SHA512 a1d82366f7b145c5db4c74ea8c31672a96a3dccd1b31fe2758606de50a4a8e5f8fd794e319127f98cc80f067d851edd4bc6e2f842eba76b807cc3a075a997f45
DIST krita-4.1.5.tar.gz 243929094 BLAKE2B 7288717978e3370b435d73dc1f7005dc339f3d11e0023cb29abf964d16a5751107287d0eca31b053a2068978c4ed40b745358afc5667b71df98e41373171ff82 SHA512 7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499
diff --git a/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch b/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch
deleted file mode 100644
index 03dd3c6bc75..00000000000
--- a/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 9fd6b44701e674058b0eaa5d3f98a99e410a1e03 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 29 Aug 2018 17:50:28 +0200
-Subject: [PATCH] Fix build with libraw 0.19
-
-Summary:
-Patch taken from arojas in https://phabricator.kde.org/D15132 applied
-with little offset.
-
-Test Plan: Built fine against libraw-0.19 with krita.git master.
-
-Reviewers: rempt, #krita
-
-Subscribers: lbeltrame, rdieter, pino, arojas
-
-Tags: #krita
-
-Differential Revision: https://phabricator.kde.org/D15148
----
- plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
-index 1c761f8563..adc26d2662 100644
---- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
-+++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
-@@ -375,6 +375,7 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
- raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
- break;
- }
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
- case RawDecodingSettings::LINENR:
- {
- // (100 - 1000) => (0.001 - 0.02) conversion.
-@@ -391,23 +392,28 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
- raw.imgdata.params.cfa_clean = true;
- break;
- }
-+#endif
- default: // No Noise Reduction
- {
- raw.imgdata.params.threshold = 0;
- raw.imgdata.params.fbdd_noiserd = 0;
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
- raw.imgdata.params.linenoise = 0;
- raw.imgdata.params.cfaline = false;
- raw.imgdata.params.lclean = 0;
- raw.imgdata.params.cclean = 0;
- raw.imgdata.params.cfa_clean = false;
-+#endif
- break;
- }
- }
-
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
- // Chromatic aberration correction.
- raw.imgdata.params.ca_correc = m_parent->m_rawDecodingSettings.enableCACorrection;
- raw.imgdata.params.cared = m_parent->m_rawDecodingSettings.caMultiplier[0];
- raw.imgdata.params.cablue = m_parent->m_rawDecodingSettings.caMultiplier[1];
-+#endif
-
- // Exposure Correction before interpolation.
- raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection;
-@@ -461,8 +467,10 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
-
- raw.imgdata.params.dcb_iterations = m_parent->m_rawDecodingSettings.dcbIterations;
- raw.imgdata.params.dcb_enhance_fl = m_parent->m_rawDecodingSettings.dcbEnhanceFl;
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
- raw.imgdata.params.eeci_refine = m_parent->m_rawDecodingSettings.eeciRefine;
- raw.imgdata.params.es_med_passes = m_parent->m_rawDecodingSettings.esMedPasses;
-+#endif
-
- //-------------------------------------------------------------------------------------------
-
---
-2.18.0
-
diff --git a/media-gfx/krita/krita-4.0.4.ebuild b/media-gfx/krita/krita-4.0.4.ebuild
deleted file mode 100644
index 8e5ccf9eb20..00000000000
--- a/media-gfx/krita/krita-4.0.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui '-gles2')
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtx11extras)
- $(add_qt_dep qtxml)
- dev-libs/boost:=
- dev-python/PyQt5[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- media-gfx/exiv2:=
- media-libs/lcms
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXi
- color-management? ( media-libs/opencolorio )
- fftw? ( sci-libs/fftw:3.0= )
- gif? ( media-libs/giflib )
- gsl? ( sci-libs/gsl:= )
- jpeg? ( virtual/jpeg:0 )
- openexr? (
- media-libs/ilmbase:=
- media-libs/openexr
- )
- pdf? ( app-text/poppler[qt5] )
- qtmedia? ( $(add_qt_dep qtmultimedia) )
- raw? ( media-libs/libraw:= )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-lang/perl
- sys-devel/gettext
- vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/calligra:4[calligra_features_krita]
- !app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
- "${FILESDIR}/${PN}-4.0.3-libraw-0.19.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- kde5_pkg_setup
-}
-
-src_configure() {
- # Prevent sandbox violation from FindPyQt5.py module
- # See Gentoo-bug 655918
- addpredict /dev/dri
-
- local mycmakeargs=(
- $(cmake-utils_use_find_package color-management OCIO)
- $(cmake-utils_use_find_package fftw FFTW3)
- $(cmake-utils_use_find_package gif GIF)
- $(cmake-utils_use_find_package gsl GSL)
- $(cmake-utils_use_find_package jpeg JPEG)
- $(cmake-utils_use_find_package openexr OpenEXR)
- $(cmake-utils_use_find_package pdf Poppler)
- $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
- $(cmake-utils_use_find_package raw LibRaw)
- $(cmake-utils_use_find_package tiff TIFF)
- $(cmake-utils_use_find_package vc Vc)
- )
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2018-12-28 17:48 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-12-28 17:48 UTC (permalink / raw
To: gentoo-commits
commit: 2bbfd797742c55c3b7ccb14dbc36ab931e9d5bfe
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 26 12:03:06 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 28 17:47:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbfd797
media-gfx/krita: Fix build with >=exiv2-0.27
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch | 354 +++++++++++++++++++++
media-gfx/krita/krita-4.1.7.ebuild | 5 +-
2 files changed, 358 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch b/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch
new file mode 100644
index 00000000000..41b290852eb
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch
@@ -0,0 +1,354 @@
+From 6b6758bb37da4997be36a7e2a839b07278160559 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu, 27 Dec 2018 22:40:44 +0100
+Subject: [PATCH] Fix building against exiv2-0.27
+
+Summary:
+Copied FindLibExiv2.cmake from ECM 5.53.0 until we raise min version.
+
+Thanks-to: Boudewijn Rempt <boud@valdyas.org>
+for final fix to kis_xmp_io.cpp.
+
+CCBUG: 402566
+
+Test Plan: Built fine against exiv2-0.26 and exiv2-0.27.
+
+Reviewers: #krita, rempt
+
+Reviewed By: #krita, rempt
+
+Subscribers: pino
+
+Tags: #krita
+
+Differential Revision: https://phabricator.kde.org/D17810
+---
+ CMakeLists.txt | 6 +-
+ cmake/modules/FindLibExiv2.cmake | 115 ++++++++++++++++++++++++++++++
+ libs/ui/CMakeLists.txt | 3 +-
+ libs/ui/kisexiv2/kis_exif_io.cpp | 14 ++--
+ libs/ui/kisexiv2/kis_exiv2.h | 2 +-
+ libs/ui/kisexiv2/kis_iptc_io.cpp | 4 +-
+ libs/ui/kisexiv2/kis_xmp_io.cpp | 6 +-
+ plugins/impex/jpeg/CMakeLists.txt | 5 +-
+ 8 files changed, 130 insertions(+), 25 deletions(-)
+ create mode 100644 cmake/modules/FindLibExiv2.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5558088200..b2d2cd497e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -607,11 +607,7 @@ set_package_properties(Eigen3 PROPERTIES
+ ##
+ ## Test for exiv2
+ ##
+-find_package(Exiv2 0.16 REQUIRED)
+-set_package_properties(Exiv2 PROPERTIES
+- DESCRIPTION "Image metadata library and tools"
+- URL "http://www.exiv2.org"
+- PURPOSE "Required by Krita")
++find_package(LibExiv2 0.16 REQUIRED)
+
+ ##
+ ## Test for lcms
+diff --git a/cmake/modules/FindLibExiv2.cmake b/cmake/modules/FindLibExiv2.cmake
+new file mode 100644
+index 0000000000..935cee2c55
+--- /dev/null
++++ b/cmake/modules/FindLibExiv2.cmake
+@@ -0,0 +1,115 @@
++#.rst:
++# FindLibExiv2
++# ------------
++#
++# Try to find the Exiv2 library.
++#
++# This will define the following variables:
++#
++# ``LibExiv2_FOUND``
++# System has LibExiv2.
++#
++# ``LibExiv2_VERSION``
++# The version of LibExiv2.
++#
++# ``LibExiv2_INCLUDE_DIRS``
++# This should be passed to target_include_directories() if
++# the target is not used for linking.
++#
++# ``LibExiv2_LIBRARIES``
++# The LibExiv2 library.
++# This can be passed to target_link_libraries() instead of
++# the ``LibExiv2::LibExiv2`` target
++#
++# If ``LibExiv2_FOUND`` is TRUE, the following imported target
++# will be available:
++#
++# ``LibExiv2::LibExiv2``
++# The Exiv2 library
++#
++# Since 5.53.0.
++#
++#=============================================================================
++# Copyright (c) 2018, Christophe Giboudeaux, <christophe@krop.fr>
++# Copyright (c) 2010, Alexander Neundorf, <neundorf@kde.org>
++# Copyright (c) 2008, Gilles Caulier, <caulier.gilles@gmail.com>
++#
++#
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++#
++# 1. Redistributions of source code must retain the copyright
++# notice, this list of conditions and the following disclaimer.
++# 2. Redistributions in binary form must reproduce the copyright
++# notice, this list of conditions and the following disclaimer in the
++# documentation and/or other materials provided with the distribution.
++# 3. The name of the author may not be used to endorse or promote products
++# derived from this software without specific prior written permission.
++#
++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++#=============================================================================
++
++find_package(PkgConfig QUIET)
++pkg_check_modules(PC_EXIV2 QUIET exiv2)
++
++find_path(LibExiv2_INCLUDE_DIRS NAMES exiv2/exif.hpp
++ HINTS ${PC_EXIV2_INCLUDEDIR}
++)
++
++find_library(LibExiv2_LIBRARIES NAMES exiv2 libexiv2
++ HINTS ${PC_EXIV2_LIBRARY_DIRS}
++)
++
++set(LibExiv2_VERSION ${PC_EXIV2_VERSION})
++
++if(NOT LibExiv2_VERSION AND DEFINED LibExiv2_INCLUDE_DIRS)
++ # With exiv >= 0.27, the version #defines are in exv_conf.h instead of version.hpp
++ foreach(_exiv2_version_file "version.hpp" "exv_conf.h")
++ if(EXISTS "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}")
++ file(READ "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}" _exiv_version_file_content)
++ string(REGEX MATCH "#define EXIV2_MAJOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MAJOR_VERSION_MATCH ${_exiv_version_file_content})
++ string(REGEX MATCH "#define EXIV2_MINOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MINOR_VERSION_MATCH ${_exiv_version_file_content})
++ string(REGEX MATCH "#define EXIV2_PATCH_VERSION[ ]+\\([0-9]+\\)" EXIV2_PATCH_VERSION_MATCH ${_exiv_version_file_content})
++ if(EXIV2_MAJOR_VERSION_MATCH)
++ string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MAJOR_VERSION ${EXIV2_MAJOR_VERSION_MATCH})
++ string(REGEX REPLACE ".*_MINOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MINOR_VERSION ${EXIV2_MINOR_VERSION_MATCH})
++ string(REGEX REPLACE ".*_PATCH_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_PATCH_VERSION ${EXIV2_PATCH_VERSION_MATCH})
++ endif()
++ endif()
++ endforeach()
++
++ set(LibExiv2_VERSION "${EXIV2_MAJOR_VERSION}.${EXIV2_MINOR_VERSION}.${EXIV2_PATCH_VERSION}")
++endif()
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(LibExiv2
++ FOUND_VAR LibExiv2_FOUND
++ REQUIRED_VARS LibExiv2_LIBRARIES LibExiv2_INCLUDE_DIRS
++ VERSION_VAR LibExiv2_VERSION
++)
++
++mark_as_advanced(LibExiv2_INCLUDE_DIRS LibExiv2_LIBRARIES)
++
++if(LibExiv2_FOUND AND NOT TARGET LibExiv2::LibExiv2)
++ add_library(LibExiv2::LibExiv2 UNKNOWN IMPORTED)
++ set_target_properties(LibExiv2::LibExiv2 PROPERTIES
++ IMPORTED_LOCATION "${LibExiv2_LIBRARIES}"
++ INTERFACE_INCLUDE_DIRECTORIES "${LibExiv2_INCLUDE_DIRS}"
++ )
++endif()
++
++include(FeatureSummary)
++set_package_properties(LibExiv2 PROPERTIES
++ URL "http://www.exiv2.org"
++ DESCRIPTION "Image metadata support"
++)
+diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
+index f14d3591bc..ff57f53158 100644
+--- a/libs/ui/CMakeLists.txt
++++ b/libs/ui/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/qtlockedfile
+- ${EXIV2_INCLUDE_DIR}
+ )
+
+ include_directories(SYSTEM
+@@ -544,7 +543,7 @@ add_library(kritaui SHARED ${kritaui_HEADERS_MOC} ${kritaui_LIB_SRCS} )
+ generate_export_header(kritaui BASE_NAME kritaui)
+
+ target_link_libraries(kritaui KF5::CoreAddons KF5::Completion KF5::I18n KF5::ItemViews Qt5::Network
+- kritaimpex kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} ${EXIV2_LIBRARIES}
++ kritaimpex kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} LibExiv2::LibExiv2
+ )
+
+ if (HAVE_QT_MULTIMEDIA)
+diff --git a/libs/ui/kisexiv2/kis_exif_io.cpp b/libs/ui/kisexiv2/kis_exif_io.cpp
+index 1a01fedf33..4a7857aa9c 100644
+--- a/libs/ui/kisexiv2/kis_exif_io.cpp
++++ b/libs/ui/kisexiv2/kis_exif_io.cpp
+@@ -438,11 +438,10 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
+ if (entry.value().asArray().size() > 0) {
+ creator = entry.value().asArray()[0];
+ }
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
++#if !EXIV2_TEST_VERSION(0,21,0)
+ v = kmdValueToExivValue(creator, Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+ #else
+ v = kmdValueToExivValue(creator, exifKey.defaultTypeId());
+-
+ #endif
+ } else if (exivKey == "Exif.Photo.OECF") {
+ v = kmdOECFStructureToExifOECF(entry.value());
+@@ -456,13 +455,13 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
+ Q_ASSERT(entry.value().type() == KisMetaData::Value::LangArray);
+ QMap<QString, KisMetaData::Value> langArr = entry.value().asLangArray();
+ if (langArr.contains("x-default")) {
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
++#if !EXIV2_TEST_VERSION(0,21,0)
+ v = kmdValueToExivValue(langArr.value("x-default"), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+ #else
+ v = kmdValueToExivValue(langArr.value("x-default"), exifKey.defaultTypeId());
+ #endif
+ } else if (langArr.size() > 0) {
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
++#if !EXIV2_TEST_VERSION(0,21,0)
+ v = kmdValueToExivValue(langArr.begin().value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+ #else
+ v = kmdValueToExivValue(langArr.begin().value(), exifKey.defaultTypeId());
+@@ -470,7 +469,7 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
+ }
+ } else {
+ dbgMetaData << exifKey.tag();
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
++#if !EXIV2_TEST_VERSION(0,21,0)
+ v = kmdValueToExivValue(entry.value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+ #else
+ v = kmdValueToExivValue(entry.value(), exifKey.defaultTypeId());
+@@ -487,7 +486,7 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
+ dbgMetaData << "exiv error " << e.what();
+ }
+ }
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
++#if !EXIV2_TEST_VERSION(0,18,0)
+ Exiv2::DataBuf rawData = exifData.copy();
+ ioDevice->write((const char*) rawData.pData_, rawData.size_);
+ #else
+@@ -514,7 +513,7 @@ bool KisExifIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
+ QByteArray arr = ioDevice->readAll();
+ Exiv2::ExifData exifData;
+ Exiv2::ByteOrder byteOrder;
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
++#if !EXIV2_TEST_VERSION(0,18,0)
+ exifData.load((const Exiv2::byte*)arr.data(), arr.size());
+ byteOrder = exifData.byteOrder();
+ #else
+@@ -529,7 +528,6 @@ bool KisExifIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
+ dbgKrita << "Received unknown exception trying to parse exiv data";
+ return false;
+ }
+-
+ #endif
+ dbgMetaData << "Byte order = " << byteOrder << ppVar(Exiv2::bigEndian) << ppVar(Exiv2::littleEndian);
+ dbgMetaData << "There are" << exifData.count() << " entries in the exif section";
+diff --git a/libs/ui/kisexiv2/kis_exiv2.h b/libs/ui/kisexiv2/kis_exiv2.h
+index 9343265f1e..6b66aa7852 100644
+--- a/libs/ui/kisexiv2/kis_exiv2.h
++++ b/libs/ui/kisexiv2/kis_exiv2.h
+@@ -21,7 +21,7 @@
+
+
+ #include <metadata/kis_meta_data_value.h>
+-#include <exiv2/value.hpp>
++#include <exiv2/exiv2.hpp>
+ #include "kritaui_export.h"
+
+ /// Convert an exiv value to a KisMetaData value
+diff --git a/libs/ui/kisexiv2/kis_iptc_io.cpp b/libs/ui/kisexiv2/kis_iptc_io.cpp
+index d2eb7c9b2f..0ac881f61b 100644
+--- a/libs/ui/kisexiv2/kis_iptc_io.cpp
++++ b/libs/ui/kisexiv2/kis_iptc_io.cpp
+@@ -126,7 +126,7 @@ bool KisIptcIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
+ }
+ }
+ }
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
++#if !EXIV2_TEST_VERSION(0,18,0)
+ Exiv2::DataBuf rawData = iptcData.copy();
+ #else
+ Exiv2::DataBuf rawData = Exiv2::IptcParser::encode(iptcData);
+@@ -167,7 +167,7 @@ bool KisIptcIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
+ ioDevice->open(QIODevice::ReadOnly);
+ QByteArray arr = ioDevice->readAll();
+ Exiv2::IptcData iptcData;
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
++#if !EXIV2_TEST_VERSION(0,18,0)
+ iptcData.load((const Exiv2::byte*)arr.data(), arr.size());
+ #else
+ Exiv2::IptcParser::decode(iptcData, (const Exiv2::byte*)arr.data(), arr.size());
+diff --git a/libs/ui/kisexiv2/kis_xmp_io.cpp b/libs/ui/kisexiv2/kis_xmp_io.cpp
+index c4663efe7d..72fa5c5d38 100644
+--- a/libs/ui/kisexiv2/kis_xmp_io.cpp
++++ b/libs/ui/kisexiv2/kis_xmp_io.cpp
+@@ -17,7 +17,6 @@
+ #include "kis_xmp_io.h"
+
+ #include <string>
+-#include <exiv2/xmp.hpp>
+
+ #include "kis_exiv2.h"
+
+@@ -277,9 +276,8 @@ bool KisXMPIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
+ const Exiv2::XmpArrayValue* xav = dynamic_cast<const Exiv2::XmpArrayValue*>(value.get());
+ Q_ASSERT(xav);
+ QList<KisMetaData::Value> array;
+- for (std::vector< std::string >::const_iterator it = xav->value_.begin();
+- it != xav->value_.end(); ++it) {
+- QString value = it->c_str();
++ for (int i = 0; i < xav->size(); ++i) {
++ QString value = QString::fromStdString(xav->toString(i));
+ if (parser) {
+ array.push_back(parser->parse(value));
+ } else {
+diff --git a/plugins/impex/jpeg/CMakeLists.txt b/plugins/impex/jpeg/CMakeLists.txt
+index 347e46dbe3..50edb05c96 100644
+--- a/plugins/impex/jpeg/CMakeLists.txt
++++ b/plugins/impex/jpeg/CMakeLists.txt
+@@ -4,7 +4,6 @@ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
+
+ include_directories(
+ ${ICCJPEG_SOURCE_DIR}
+- ${EXIV2_INCLUDE_DIR}
+ )
+
+ include_directories(SYSTEM
+@@ -25,7 +24,7 @@ set(kritajpegimport_SOURCES
+
+ add_library(kritajpegimport MODULE ${kritajpegimport_SOURCES})
+
+-target_link_libraries(kritajpegimport kritaui ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
++target_link_libraries(kritajpegimport kritaui ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} LibExiv2::LibExiv2 )
+
+ install(TARGETS kritajpegimport DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+
+@@ -38,7 +37,7 @@ ki18n_wrap_ui(kritajpegexport_SOURCES kis_wdg_options_jpeg.ui )
+
+ add_library(kritajpegexport MODULE ${kritajpegexport_SOURCES})
+
+-target_link_libraries(kritajpegexport kritaui kritaimpex ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
++target_link_libraries(kritajpegexport kritaui kritaimpex ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} LibExiv2::LibExiv2 )
+
+ install(TARGETS kritajpegexport DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+ install( PROGRAMS krita_jpeg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+--
+2.20.1
+
diff --git a/media-gfx/krita/krita-4.1.7.ebuild b/media-gfx/krita/krita-4.1.7.ebuild
index 9982412f267..efe9923bc33 100644
--- a/media-gfx/krita/krita-4.1.7.ebuild
+++ b/media-gfx/krita/krita-4.1.7.ebuild
@@ -86,7 +86,10 @@ RDEPEND="${COMMON_DEPEND}
# bug 630508
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
+ "${FILESDIR}/${P}-exiv2-0.27.patch"
+)
S="${S}.101"
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2019-01-14 16:04 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2019-01-14 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 7b0e3372c1436dadb12b09499a8f8f74c7e456e0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 14 15:11:50 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 14 16:03:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b0e3372
media-gfx/krita: Drop 4.1.5
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-gfx/krita/Manifest | 1 -
.../krita/files/krita-4.1.5-desktopfile.patch | 39 -------
media-gfx/krita/krita-4.1.5.ebuild | 118 ---------------------
3 files changed, 158 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index e3b4fa1a135..fc40c80ff6e 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
-DIST krita-4.1.5.tar.gz 243929094 BLAKE2B 7288717978e3370b435d73dc1f7005dc339f3d11e0023cb29abf964d16a5751107287d0eca31b053a2068978c4ed40b745358afc5667b71df98e41373171ff82 SHA512 7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499
DIST krita-4.1.7-patchset.tar.xz 7208 BLAKE2B 0c5ca308d5d11878f63312a3980e66838d82a50ad64f67326a4cf35e36b500b22e5d56441516f65c3c09dd9ec7adf2f3b76ed90e3644c24e86a8ddbc499bf772 SHA512 a4290b7973cbe157c1d21f914130a3d43fcf6afa223795d1c52ca2ef22b552f0eac7714f97766d70cbfee2b88f5367c5da21baeb76febd7490cec5896791f3b4
DIST krita-4.1.7.101.tar.gz 243977488 BLAKE2B 84cfb0f7e6e7b63c3bb9303793c2b74f180982f66ed0756c8878bf8db64b5d9bf9d3cbdb28afba11a952737b02e46759a465d90a2e8822fbb382ae679ba3c3de SHA512 8558501684bc686f431660f3dffeb75575fea3bd23662b6c598c27173cce3145c3ec2caff32b56dd597c50907a69b2faab5259cc6f518f5a0e160cae89004791
diff --git a/media-gfx/krita/files/krita-4.1.5-desktopfile.patch b/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
deleted file mode 100644
index 8721ab8a8a9..00000000000
--- a/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d267979af9524372f00a0759f02e75c60f604da5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 15 Oct 2018 13:08:09 +0200
-Subject: [PATCH] krita_qimageio.desktop: Fix MimeType separators
-
-Summary:
-desktop file did not pass validation.
-
-/usr/share/applications/krita_qimageio.desktop: error: (will be fatal in the future): value "image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" for key
-"MimeType" in group "Desktop Entry" contains value "image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" which is an invalid MIME type:
-"image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" contains an invalid character in the subtype
-
-Reviewers: #krita, rempt
-
-Reviewed By: #krita, rempt
-
-Tags: #krita
-
-Differential Revision: https://phabricator.kde.org/D16222
----
- plugins/impex/qimageio/krita_qimageio.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/impex/qimageio/krita_qimageio.desktop b/plugins/impex/qimageio/krita_qimageio.desktop
-index 4d7dabe235..af366fef07 100644
---- a/plugins/impex/qimageio/krita_qimageio.desktop
-+++ b/plugins/impex/qimageio/krita_qimageio.desktop
-@@ -63,7 +63,7 @@ Name[x-test]=xxKritaxx
- Name[zh_CN]=Krita
- Name[zh_TW]=Krita
- Exec=krita %f
--MimeType=image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon
-+MimeType=image/bmp;image/x-xpixmap;image/x-xbitmap;image/webp;image/vnd.microsoft.icon;
- Type=Application
- Icon=calligrakrita
- Categories=Qt;KDE;Office;Graphics;
---
-2.18.0
-
diff --git a/media-gfx/krita/krita-4.1.5.ebuild b/media-gfx/krita/krita-4.1.5.ebuild
deleted file mode 100644
index 71d42ec6ccc..00000000000
--- a/media-gfx/krita/krita-4.1.5.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui '-gles2')
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtx11extras)
- $(add_qt_dep qtxml)
- dev-libs/boost:=
- dev-python/PyQt5[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- media-gfx/exiv2:=
- media-libs/lcms
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXi
- color-management? ( media-libs/opencolorio )
- fftw? ( sci-libs/fftw:3.0= )
- gif? ( media-libs/giflib )
- gsl? ( sci-libs/gsl:= )
- jpeg? ( virtual/jpeg:0 )
- heif? ( media-libs/libheif:= )
- openexr? (
- media-libs/ilmbase:=
- media-libs/openexr
- )
- pdf? ( app-text/poppler[qt5] )
- qtmedia? ( $(add_qt_dep qtmultimedia) )
- raw? ( media-libs/libraw:= )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-lang/perl
- sys-devel/gettext
- vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/calligra:4[calligra_features_krita]
- !app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
- "${FILESDIR}/${P}-desktopfile.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- kde5_pkg_setup
-}
-
-src_configure() {
- # Prevent sandbox violation from FindPyQt5.py module
- # See Gentoo-bug 655918
- addpredict /dev/dri
-
- local mycmakeargs=(
- $(cmake-utils_use_find_package color-management OCIO)
- $(cmake-utils_use_find_package fftw FFTW3)
- $(cmake-utils_use_find_package gif GIF)
- $(cmake-utils_use_find_package gsl GSL)
- $(cmake-utils_use_find_package heif HEIF)
- $(cmake-utils_use_find_package jpeg JPEG)
- $(cmake-utils_use_find_package openexr OpenEXR)
- $(cmake-utils_use_find_package pdf Poppler)
- $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
- $(cmake-utils_use_find_package raw LibRaw)
- $(cmake-utils_use_find_package tiff TIFF)
- $(cmake-utils_use_find_package vc Vc)
- )
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2019-07-31 9:45 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2019-07-31 9:45 UTC (permalink / raw
To: gentoo-commits
commit: 7c5b52a734a337fa6afe2e4ab1e5780aacdc8f25
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 09:25:46 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 09:45:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5b52a7
media-gfx/krita: Drop 4.2.3
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 -
.../krita/files/krita-4.2.2-tests-optional.patch | 405 ---------------------
media-gfx/krita/krita-4.2.3.ebuild | 118 ------
3 files changed, 524 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 8865613c448..a81da4ec9a4 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.3.tar.gz 246136588 BLAKE2B 1d7a371f7aeb8cf3747adcd4ab681b0ecf849e64ace16b456e9c2b8ed5fd958be895fd64c623931e47ae81bdf35b3e54161ecb204501f48c97b35ac2dcb8ac59 SHA512 6493740183b360a939d85cc7bc646cb173dc923a3dc63966d0f178bf308675ffead01d3bfefeeffb376f5efd7d90ee7f271b3ff412787123113dd125cc022ab5
DIST krita-4.2.4.tar.gz 246227960 BLAKE2B 94513a835526ee79c0747ed8c6004666b549d7070c02ad82800555282f319e5aa4dc1f35dafc6b4179284b244c8c80367b453548f5c8cd585154259a0512222a SHA512 c778653f8e72724d16322405fffdff5b82418c5a19021ccbada6a15389afd58f9d9017bc562eb5d91b0d4e10587bca1e616fc7ecc9ec7dbf82fae5247b81ea5e
diff --git a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
deleted file mode 100644
index 2df715be04f..00000000000
--- a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
+++ /dev/null
@@ -1,405 +0,0 @@
---- a/plugins/filters/CMakeLists.txt 2019-06-27 18:48:55.049823682 +0200
-+++ b/plugins/filters/CMakeLists.txt 2019-06-27 18:48:55.056823729 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- add_subdirectory( blur )
- add_subdirectory( colors )
- add_subdirectory( colorsfilters )
---- a/plugins/filters/unsharp/CMakeLists.txt 2019-06-27 18:48:55.063823776 +0200
-+++ b/plugins/filters/unsharp/CMakeLists.txt 2019-06-27 18:48:55.069823817 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- set(kritaunsharpfilter_SOURCES
- unsharp.cpp
---- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-27 18:48:55.077823871 +0200
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-27 18:48:55.084823918 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(brush/tests)
-+endif()
-
- include_directories(brush
- duplicate
---- a/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-27 18:48:55.092823972 +0200
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-27 18:48:55.098824013 +0200
-@@ -104,4 +104,6 @@
- install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/dockers/lut/CMakeLists.txt 2019-06-27 18:48:55.105824060 +0200
-+++ b/plugins/dockers/lut/CMakeLists.txt 2019-06-27 18:48:55.112824107 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM
- ${OCIO_INCLUDE_DIR}
---- a/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.120824161 +0200
-+++ b/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.124824188 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
-- add_subdirectory(tests)
-+ if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
-
- set(KRITA_ANIMATIONDOCKER_SOURCES
---- a/plugins/extensions/qmic/CMakeLists.txt 2019-06-27 18:48:55.132824242 +0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt 2019-06-27 18:48:55.136824270 +0200
-@@ -20,4 +20,6 @@
- target_link_libraries(kritaqmic kritaui)
- install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/tools/basictools/CMakeLists.txt 2019-06-27 18:48:55.141824303 +0200
-+++ b/plugins/tools/basictools/CMakeLists.txt 2019-06-27 18:48:55.146824337 +0200
-@@ -1,5 +1,7 @@
- if (NOT APPLE)
-- add_subdirectory(tests)
-+ if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif ()
-
- set(kritadefaulttools_SOURCES
---- a/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 18:48:55.151824371 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 18:48:55.155824398 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
-- add_subdirectory(tests)
-+ if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
-
- set(kritatooltransform_SOURCES
---- a/plugins/impex/ppm/CMakeLists.txt 2019-06-27 18:48:55.163824452 +0200
-+++ b/plugins/impex/ppm/CMakeLists.txt 2019-06-27 18:48:55.169824492 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
-
---- a/plugins/impex/svg/CMakeLists.txt 2019-06-27 18:48:55.175824533 +0200
-+++ b/plugins/impex/svg/CMakeLists.txt 2019-06-27 18:48:55.180824567 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritasvgimport_SOURCES
- kis_svg_import.cc
---- a/plugins/impex/brush/CMakeLists.txt 2019-06-27 18:48:55.186824607 +0200
-+++ b/plugins/impex/brush/CMakeLists.txt 2019-06-27 18:48:55.190824634 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritabrushexport_PART_SRCS
- kis_brush_export.cpp
---- a/plugins/impex/psd/CMakeLists.txt 2019-06-27 18:48:55.195824668 +0200
-+++ b/plugins/impex/psd/CMakeLists.txt 2019-06-27 18:48:55.199824695 +0200
-@@ -1,5 +1,7 @@
- if (NOT MSVC AND NOT APPLE)
-- add_subdirectory(tests)
-+ if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
-
- configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
---- a/plugins/impex/tga/CMakeLists.txt 2019-06-27 18:48:55.206824742 +0200
-+++ b/plugins/impex/tga/CMakeLists.txt 2019-06-27 18:48:55.210824769 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritatgaexport_SOURCES
- kis_tga_export.cpp
---- a/plugins/impex/libkra/CMakeLists.txt 2019-06-27 18:48:55.216824810 +0200
-+++ b/plugins/impex/libkra/CMakeLists.txt 2019-06-27 18:48:55.221824844 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritalibkra_LIB_SRCS
- kis_colorize_dom_utils.cpp
---- a/plugins/impex/jpeg/CMakeLists.txt 2019-06-27 18:48:55.228824891 +0200
-+++ b/plugins/impex/jpeg/CMakeLists.txt 2019-06-27 18:48:55.233824924 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
-
---- a/plugins/impex/gif/CMakeLists.txt 2019-06-27 18:48:55.239824965 +0200
-+++ b/plugins/impex/gif/CMakeLists.txt 2019-06-27 18:48:55.243824992 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritagifexport_SOURCES
- kis_gif_export.cpp
---- a/plugins/impex/exr/CMakeLists.txt 2019-06-27 18:48:55.248825026 +0200
-+++ b/plugins/impex/exr/CMakeLists.txt 2019-06-27 18:48:55.253825060 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
-
---- a/plugins/impex/xcf/CMakeLists.txt 2019-06-27 18:48:55.260825107 +0200
-+++ b/plugins/impex/xcf/CMakeLists.txt 2019-06-27 18:48:55.268825160 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
-
---- a/plugins/impex/tiff/CMakeLists.txt 2019-06-27 18:48:55.277825221 +0200
-+++ b/plugins/impex/tiff/CMakeLists.txt 2019-06-27 18:48:55.283825262 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(libkritatiffconverter_LIB_SRCS
- kis_tiff_converter.cc
---- a/plugins/impex/ora/CMakeLists.txt 2019-06-27 18:48:55.290825310 +0200
-+++ b/plugins/impex/ora/CMakeLists.txt 2019-06-27 18:48:55.295825343 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(libkritaconverter_LIB_SRCS
- ora_converter.cpp
---- a/plugins/impex/heif/CMakeLists.txt 2019-06-27 18:48:55.302825391 +0200
-+++ b/plugins/impex/heif/CMakeLists.txt 2019-06-27 18:48:55.309825438 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}")
---- a/plugins/impex/pdf/CMakeLists.txt 2019-06-27 18:48:55.317825492 +0200
-+++ b/plugins/impex/pdf/CMakeLists.txt 2019-06-27 18:48:55.322825526 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp )
-
---- a/plugins/impex/csv/CMakeLists.txt 2019-06-27 18:48:55.332825593 +0200
-+++ b/plugins/impex/csv/CMakeLists.txt 2019-06-27 18:48:55.339825640 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- # import
-
---- a/plugins/impex/heightmap/CMakeLists.txt 2019-06-27 18:48:55.347825694 +0200
-+++ b/plugins/impex/heightmap/CMakeLists.txt 2019-06-27 18:48:55.352825728 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
-
---- a/plugins/impex/raw/CMakeLists.txt 2019-06-27 18:48:55.359825775 +0200
-+++ b/plugins/impex/raw/CMakeLists.txt 2019-06-27 18:48:55.365825816 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- if(OPENEXR_FOUND)
- include_directories(${OPENEXR_INCLUDE_DIR})
---- a/plugins/impex/qimageio/CMakeLists.txt 2019-06-27 18:48:55.371825857 +0200
-+++ b/plugins/impex/qimageio/CMakeLists.txt 2019-06-27 18:48:55.376825890 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritaqimageioexport_SOURCES
- kis_qimageio_export.cpp
---- a/plugins/impex/qml/CMakeLists.txt 2019-06-27 18:48:55.383825938 +0200
-+++ b/plugins/impex/qml/CMakeLists.txt 2019-06-27 18:48:55.389825978 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritaqmlexport_SOURCES
- qml_converter.cc
---- a/plugins/impex/png/CMakeLists.txt 2019-06-27 18:48:55.396826025 +0200
-+++ b/plugins/impex/png/CMakeLists.txt 2019-06-27 18:48:55.401826059 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritapngimport_SOURCES
- kis_png_import.cc
---- a/plugins/color/lcms2engine/CMakeLists.txt 2019-06-27 18:48:55.408826106 +0200
-+++ b/plugins/color/lcms2engine/CMakeLists.txt 2019-06-27 18:48:55.412826133 +0200
-@@ -1,6 +1,8 @@
- project( lcmsengine )
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM
- ${LCMS2_INCLUDE_DIR}
---- a/libs/brush/CMakeLists.txt 2019-06-27 18:48:55.417826167 +0200
-+++ b/libs/brush/CMakeLists.txt 2019-06-27 18:48:55.421826194 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- include_directories(SYSTEM
- ${EIGEN3_INCLUDE_DIR}
---- a/libs/global/CMakeLists.txt 2019-06-27 18:48:55.426826228 +0200
-+++ b/libs/global/CMakeLists.txt 2019-06-27 18:48:55.430826255 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- include(CheckFunctionExists)
- check_function_exists(backtrace HAVE_BACKTRACE)
---- a/libs/image/CMakeLists.txt 2019-06-27 18:48:55.435826289 +0200
-+++ b/libs/image/CMakeLists.txt 2019-06-27 18:48:55.438826309 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- add_subdirectory( tiles3 )
-
---- a/libs/image/tiles3/CMakeLists.txt 2019-06-27 18:48:55.444826350 +0200
-+++ b/libs/image/tiles3/CMakeLists.txt 2019-06-27 18:48:55.447826370 +0200
-@@ -1 +1,3 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/odf/CMakeLists.txt 2019-06-27 18:48:55.452826404 +0200
-+++ b/libs/odf/CMakeLists.txt 2019-06-27 18:48:55.456826430 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- set(kritaodf_LIB_SRCS
- KoOdf.cpp
---- a/libs/metadata/CMakeLists.txt 2019-06-27 18:48:55.461826464 +0200
-+++ b/libs/metadata/CMakeLists.txt 2019-06-27 18:48:55.465826491 +0200
-@@ -29,4 +29,6 @@
-
- install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/store/CMakeLists.txt 2019-06-27 18:48:55.470826525 +0200
-+++ b/libs/store/CMakeLists.txt 2019-06-27 18:48:55.473826545 +0200
-@@ -1,6 +1,8 @@
- include_directories(${QUAZIP_INCLUDE_DIRS})
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritastore_LIB_SRCS
- KoDirectoryStore.cpp
---- a/libs/libkis/CMakeLists.txt 2019-06-27 18:48:55.478826579 +0200
-+++ b/libs/libkis/CMakeLists.txt 2019-06-27 18:48:55.482826605 +0200
-@@ -47,4 +47,6 @@
- install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/widgetutils/CMakeLists.txt 2019-06-27 18:48:55.487826640 +0200
-+++ b/libs/widgetutils/CMakeLists.txt 2019-06-27 18:48:55.491826667 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
-
---- a/libs/widgets/CMakeLists.txt 2019-06-27 18:48:55.496826701 +0200
-+++ b/libs/widgets/CMakeLists.txt 2019-06-27 18:48:55.500826727 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
---- a/libs/flake/CMakeLists.txt 2019-06-27 18:48:55.505826761 +0200
-+++ b/libs/flake/CMakeLists.txt 2019-06-27 18:48:55.510826795 +0200
-@@ -9,7 +9,9 @@
- )
-
- add_subdirectory(styles)
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritaflake_SRCS
- KoGradientHelper.cpp
---- a/libs/ui/CMakeLists.txt 2019-06-27 18:48:55.516826836 +0200
-+++ b/libs/ui/CMakeLists.txt 2019-06-27 18:48:55.520826863 +0200
-@@ -7,7 +7,9 @@
- ${OCIO_INCLUDE_DIR}
- )
-
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- if (APPLE)
- find_library(FOUNDATION_LIBRARY Foundation)
---- a/libs/pigment/CMakeLists.txt 2019-06-27 18:48:55.526826903 +0200
-+++ b/libs/pigment/CMakeLists.txt 2019-06-27 18:48:55.530826930 +0200
-@@ -31,7 +31,9 @@
- message("${__per_arch_factory_objs}")
- endif()
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- add_subdirectory(benchmarks)
-
- set(kritapigment_SRCS
diff --git a/media-gfx/krita/krita-4.2.3.ebuild b/media-gfx/krita/krita-4.2.3.ebuild
deleted file mode 100644
index b1daa80676c..00000000000
--- a/media-gfx/krita/krita-4.2.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.12.3"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/"
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
- dev-cpp/eigen:3
- dev-lang/perl
- sys-devel/gettext
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui '-gles2' '' '5=')
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtx11extras)
- $(add_qt_dep qtxml)
- dev-libs/boost:=
- dev-libs/quazip
- dev-python/PyQt5[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- media-gfx/exiv2:=
- media-libs/lcms
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXi
- color-management? ( media-libs/opencolorio )
- fftw? ( sci-libs/fftw:3.0= )
- gif? ( media-libs/giflib )
- gsl? ( sci-libs/gsl:= )
- jpeg? ( virtual/jpeg:0 )
- heif? ( media-libs/libheif:= )
- openexr? (
- media-libs/ilmbase:=
- media-libs/openexr
- )
- pdf? ( app-text/poppler[qt5] )
- qtmedia? ( $(add_qt_dep qtmultimedia) )
- raw? ( media-libs/libraw:= )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
- vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/calligra:4[calligra_features_krita]
- !app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.2-tests-optional.patch )
-
-pkg_setup() {
- python-single-r1_pkg_setup
- kde5_pkg_setup
-}
-
-src_configure() {
- # Prevent sandbox violation from FindPyQt5.py module
- # See Gentoo-bug 655918
- addpredict /dev/dri
-
- local mycmakeargs=(
- $(cmake-utils_use_find_package color-management OCIO)
- $(cmake-utils_use_find_package fftw FFTW3)
- $(cmake-utils_use_find_package gif GIF)
- $(cmake-utils_use_find_package gsl GSL)
- $(cmake-utils_use_find_package heif HEIF)
- $(cmake-utils_use_find_package jpeg JPEG)
- $(cmake-utils_use_find_package openexr OpenEXR)
- $(cmake-utils_use_find_package pdf Poppler)
- $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
- $(cmake-utils_use_find_package raw LibRaw)
- $(cmake-utils_use_find_package tiff TIFF)
- $(cmake-utils_use_find_package vc Vc)
- )
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2020-04-03 14:57 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2020-04-03 14:57 UTC (permalink / raw
To: gentoo-commits
commit: a8bb0bded01f24e82706af39c4efbfafb9107d07
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 2 13:10:30 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 3 14:56:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8bb0bde
media-gfx/krita: 4.2.9 version bump
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 +
.../krita/files/krita-4.2.9-ecm-findopenexr.patch | 352 +++++++++++++++++++++
media-gfx/krita/krita-4.2.9.ebuild | 121 +++++++
3 files changed, 474 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 8cf7a3d4191..2bab9ddbf4a 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
DIST krita-4.2.8.2-patchset.tar.xz 13848 BLAKE2B 86059e08833541b7d4dfda2c36cd1479809452171353b755ab3a264fa41fb99fc7ffacf064af3767aa095fda81aa9a2212b63c7242c72f94ca23a83b34c0502f SHA512 79532700c967f94479af22e2fbd33c0b6d8c4295c872316935800b99258dceaedbac2b1c6314251d4d621c25a328ea602f49d415cc9275095bc3cd2f29756a61
DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4 SHA512 5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7
+DIST krita-4.2.9.tar.xz 170082028 BLAKE2B dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66 SHA512 66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0
diff --git a/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch b/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch
new file mode 100644
index 00000000000..0a7c7ca6984
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch
@@ -0,0 +1,352 @@
+From dae9ddcd45a95fd3b1ec3d42510556a671b08f15 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 31 Mar 2020 19:56:48 +0200
+Subject: [PATCH 1/2] Revert "Revert "Use e-c-m's findopenexr.cmake module""
+
+This reverts commit d978a33acebb724b862c38895788fc459111c364.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ cmake/modules/FindOpenEXR.cmake | 98 ---------------------------------
+ 2 files changed, 1 insertion(+), 99 deletions(-)
+ delete mode 100644 cmake/modules/FindOpenEXR.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a7d9adaa3f..7a4211da13 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -251,7 +251,7 @@ endif(MINGW)
+ ########################
+
+ find_package(ECM 5.22 REQUIRED NOMODULE)
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${ECM_FIND_MODULE_DIR})
+ include(ECMOptionalAddSubdirectory)
+ include(ECMAddAppIcon)
+ include(ECMSetupVersion)
+diff --git a/cmake/modules/FindOpenEXR.cmake b/cmake/modules/FindOpenEXR.cmake
+deleted file mode 100644
+index bb75a03bf0..0000000000
+--- a/cmake/modules/FindOpenEXR.cmake
++++ /dev/null
+@@ -1,98 +0,0 @@
+-#
+-# Copyright 2016 Pixar
+-#
+-# Licensed under the Apache License, Version 2.0 (the "Apache License")
+-# with the following modification; you may not use this file except in
+-# compliance with the Apache License and the following modification to it:
+-# Section 6. Trademarks. is deleted and replaced with:
+-#
+-# 6. Trademarks. This License does not grant permission to use the trade
+-# names, trademarks, service marks, or product names of the Licensor
+-# and its affiliates, except as required to comply with Section 4(c) of
+-# the License and to reproduce the content of the NOTICE file.
+-#
+-# You may obtain a copy of the Apache License at
+-#
+-# http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the Apache License with the above modification is
+-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-# KIND, either express or implied. See the Apache License for the specific
+-# language governing permissions and limitations under the Apache License.
+-#
+-
+-find_path(OPENEXR_INCLUDE_DIR
+- OpenEXR/half.h
+-HINTS
+- "${OPENEXR_LOCATION}"
+- "$ENV{OPENEXR_LOCATION}"
+-PATH_SUFFIXES
+- include/
+-DOC
+- "OpenEXR headers path"
+-)
+-
+-if(OPENEXR_INCLUDE_DIR)
+- set(openexr_config_file "${OPENEXR_INCLUDE_DIR}/OpenEXR/OpenEXRConfig.h")
+- if(EXISTS ${openexr_config_file})
+- file(STRINGS
+- ${openexr_config_file}
+- TMP
+- REGEX "#define OPENEXR_VERSION_STRING.*$")
+- string(REGEX MATCHALL "[0-9.]+" OPENEXR_VERSION ${TMP})
+-
+- file(STRINGS
+- ${openexr_config_file}
+- TMP
+- REGEX "#define OPENEXR_VERSION_MAJOR.*$")
+- string(REGEX MATCHALL "[0-9]" OPENEXR_MAJOR_VERSION ${TMP})
+-
+- file(STRINGS
+- ${openexr_config_file}
+- TMP
+- REGEX "#define OPENEXR_VERSION_MINOR.*$")
+- string(REGEX MATCHALL "[0-9]" OPENEXR_MINOR_VERSION ${TMP})
+- endif()
+-endif()
+-
+-foreach(OPENEXR_LIB
+- Half
+- Iex
+- Imath
+- IlmImf
+- IlmThread
+- )
+-
+- # OpenEXR libraries may be suffixed with the version number, so we search
+- # using both versioned and unversioned names.
+- find_library(OPENEXR_${OPENEXR_LIB}_LIBRARY
+- NAMES
+- ${OPENEXR_LIB}-${OPENEXR_MAJOR_VERSION}_${OPENEXR_MINOR_VERSION}
+- ${OPENEXR_LIB}
+- HINTS
+- "${OPENEXR_LOCATION}"
+- "$ENV{OPENEXR_LOCATION}"
+- PATH_SUFFIXES
+- lib/
+- DOC
+- "OPENEXR's ${OPENEXR_LIB} library path"
+- )
+-
+- if(OPENEXR_${OPENEXR_LIB}_LIBRARY)
+- list(APPEND OPENEXR_LIBRARIES ${OPENEXR_${OPENEXR_LIB}_LIBRARY})
+- endif()
+-endforeach(OPENEXR_LIB)
+-
+-# So #include <half.h> works
+-list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR})
+-list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}/OpenEXR)
+-
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(OpenEXR
+- REQUIRED_VARS
+- OPENEXR_INCLUDE_DIRS
+- OPENEXR_LIBRARIES
+- VERSION_VAR
+- OPENEXR_VERSION
+-)
+--
+2.26.0
+
+
+From b6e1c9c015989c47688c3cc3efa85e51eb02696f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 2 Apr 2020 14:49:10 +0200
+Subject: [PATCH 2/2] For ECM FindOpenEXR.cmake, in CMakeLists.txt, do
+ s/OPENEXR/OpenEXR/
+
+---
+ CMakeLists.txt | 8 ++++----
+ libs/image/CMakeLists.txt | 4 ++--
+ libs/pigment/CMakeLists.txt | 6 +++---
+ libs/ui/CMakeLists.txt | 2 +-
+ plugins/color/colorspaceextensions/CMakeLists.txt | 2 +-
+ plugins/color/lcms2engine/CMakeLists.txt | 10 +++++-----
+ plugins/color/lcms2engine/tests/CMakeLists.txt | 4 ++--
+ plugins/dockers/specificcolorselector/CMakeLists.txt | 2 +-
+ plugins/impex/CMakeLists.txt | 2 +-
+ plugins/impex/exr/CMakeLists.txt | 6 +++---
+ plugins/impex/raw/CMakeLists.txt | 4 ++--
+ 11 files changed, 25 insertions(+), 25 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a4211da13..5ff18bbb17 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -571,11 +571,11 @@ set_package_properties(OpenEXR PROPERTIES
+ URL "http://www.openexr.com"
+ TYPE OPTIONAL
+ PURPOSE "Required by the Krita OpenEXR filter")
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
+- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
+- set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
++if(OpenEXR_FOUND)
++ include_directories(SYSTEM ${OpenEXR_INCLUDE_DIRS})
++ set(LINK_OPENEXR_LIB ${OpenEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+ endif()
+
+diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
+index 6d7c6a4daa..74d78103ab 100644
+--- a/libs/image/CMakeLists.txt
++++ b/libs/image/CMakeLists.txt
+@@ -349,8 +349,8 @@ if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
+ endif()
+ endif()
+
+-if(OPENEXR_FOUND)
+- target_link_libraries(kritaimage PUBLIC ${OPENEXR_LIBRARIES})
++if(OpenEXR_FOUND)
++ target_link_libraries(kritaimage PUBLIC ${OpenEXR_LIBRARIES})
+ endif()
+
+ if(FFTW3_FOUND)
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index 2a574a6c77..53e34cc029 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -14,9 +14,9 @@ include_directories(
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
+- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
+- set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
++if(OpenEXR_FOUND)
++ include_directories(SYSTEM ${OpenEXR_INCLUDE_DIRS})
++ set(LINK_OPENEXR_LIB ${OpenEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+ endif()
+
+diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
+index 73f36e4e68..151c46f711 100644
+--- a/libs/ui/CMakeLists.txt
++++ b/libs/ui/CMakeLists.txt
+@@ -576,7 +576,7 @@ if(APPLE)
+ endif ()
+
+
+-target_link_libraries(kritaui ${OPENEXR_LIBRARIES})
++target_link_libraries(kritaui ${OpenEXR_LIBRARIES})
+
+ # Add VSync disable workaround
+ if(NOT WIN32 AND NOT APPLE)
+diff --git a/plugins/color/colorspaceextensions/CMakeLists.txt b/plugins/color/colorspaceextensions/CMakeLists.txt
+index ee8033afed..523e11cfb9 100644
+--- a/plugins/color/colorspaceextensions/CMakeLists.txt
++++ b/plugins/color/colorspaceextensions/CMakeLists.txt
+@@ -12,5 +12,5 @@ set( extensions_plugin_SOURCES
+ )
+
+ add_library(krita_colorspaces_extensions MODULE ${extensions_plugin_SOURCES} )
+-target_link_libraries(krita_colorspaces_extensions kritapigment kritaglobal ${OPENEXR_LIBRARIES} KF5::I18n KF5::CoreAddons)
++target_link_libraries(krita_colorspaces_extensions kritapigment kritaglobal ${OpenEXR_LIBRARIES} KF5::I18n KF5::CoreAddons)
+ install( TARGETS krita_colorspaces_extensions DESTINATION ${KRITA_PLUGIN_INSTALL_DIR} )
+diff --git a/plugins/color/lcms2engine/CMakeLists.txt b/plugins/color/lcms2engine/CMakeLists.txt
+index e14de2ba7c..109a708b2d 100644
+--- a/plugins/color/lcms2engine/CMakeLists.txt
++++ b/plugins/color/lcms2engine/CMakeLists.txt
+@@ -28,7 +28,7 @@ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -38,9 +38,9 @@ endif ()
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
+- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
+- set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
++if(OpenEXR_FOUND)
++ include_directories(SYSTEM ${OpenEXR_INCLUDE_DIRS})
++ set(LINK_OPENEXR_LIB ${OpenEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+ endif()
+
+@@ -77,7 +77,7 @@ set ( lcmsengine_SRCS
+ LcmsEnginePlugin.cpp
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ set ( lcmsengine_SRCS
+ ${lcmsengine_SRCS}
+ colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/color/lcms2engine/tests/CMakeLists.txt b/plugins/color/lcms2engine/tests/CMakeLists.txt
+index eea9e9e846..87ca907148 100644
+--- a/plugins/color/lcms2engine/tests/CMakeLists.txt
++++ b/plugins/color/lcms2engine/tests/CMakeLists.txt
+@@ -12,8 +12,8 @@ include_directories( ../colorspaces/cmyk_u16
+ ../colorprofiles
+ ..
+ )
+-if(OPENEXR_FOUND)
+- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
++if(OpenEXR_FOUND)
++ include_directories(SYSTEM ${OpenEXR_INCLUDE_DIRS})
+ endif()
+ include_directories( ${LCMS2_INCLUDE_DIR} )
+
+diff --git a/plugins/dockers/specificcolorselector/CMakeLists.txt b/plugins/dockers/specificcolorselector/CMakeLists.txt
+index 97f7ab2cdd..214a46eaa9 100644
+--- a/plugins/dockers/specificcolorselector/CMakeLists.txt
++++ b/plugins/dockers/specificcolorselector/CMakeLists.txt
+@@ -10,5 +10,5 @@ ki18n_wrap_ui(KRITA_SPECIFICCOLORSELECTOR_SOURCES
+
+
+ add_library(kritaspecificcolorselector MODULE ${KRITA_SPECIFICCOLORSELECTOR_SOURCES})
+-target_link_libraries(kritaspecificcolorselector kritaui ${OPENEXR_LIBRARIES})
++target_link_libraries(kritaspecificcolorselector kritaui ${OpenEXR_LIBRARIES})
+ install(TARGETS kritaspecificcolorselector DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+diff --git a/plugins/impex/CMakeLists.txt b/plugins/impex/CMakeLists.txt
+index 51056ecf47..838f34b6eb 100644
+--- a/plugins/impex/CMakeLists.txt
++++ b/plugins/impex/CMakeLists.txt
+@@ -19,7 +19,7 @@ if(PNG_FOUND)
+ add_subdirectory(csv)
+ endif()
+
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ add_subdirectory(exr)
+ endif()
+
+diff --git a/plugins/impex/exr/CMakeLists.txt b/plugins/impex/exr/CMakeLists.txt
+index aa39a91879..cb07f6b01a 100644
+--- a/plugins/impex/exr/CMakeLists.txt
++++ b/plugins/impex/exr/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ add_subdirectory(tests)
+
+-include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS} )
++include_directories(SYSTEM ${OpenEXR_INCLUDE_DIRS} )
+
+ add_definitions(${OPENEXR_DEFINITIONS})
+
+@@ -17,7 +17,7 @@ set(kritaexrimport_SOURCES
+
+ add_library(kritaexrimport MODULE ${kritaexrimport_SOURCES})
+
+-target_link_libraries(kritaexrimport kritaui kritalibkra ${OPENEXR_LIBRARIES} )
++target_link_libraries(kritaexrimport kritaui kritalibkra ${OpenEXR_LIBRARIES} )
+
+ install(TARGETS kritaexrimport DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+
+@@ -30,7 +30,7 @@ ki18n_wrap_ui(kritaexrexport_SOURCES exr_export_widget.ui )
+
+ add_library(kritaexrexport MODULE ${kritaexrexport_SOURCES})
+
+-target_link_libraries(kritaexrexport kritaui kritalibkra kritaimpex ${OPENEXR_LIBRARIES} )
++target_link_libraries(kritaexrexport kritaui kritalibkra kritaimpex ${OpenEXR_LIBRARIES} )
+
+ install(TARGETS kritaexrexport DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+
+diff --git a/plugins/impex/raw/CMakeLists.txt b/plugins/impex/raw/CMakeLists.txt
+index 71cb5b355c..d20cbe63c5 100644
+--- a/plugins/impex/raw/CMakeLists.txt
++++ b/plugins/impex/raw/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ add_subdirectory(tests)
+
+-if(OPENEXR_FOUND)
+- include_directories(${OPENEXR_INCLUDE_DIRS})
++if(OpenEXR_FOUND)
++ include_directories(${OpenEXR_INCLUDE_DIRS})
+ endif()
+ include_directories(${LibRaw_INCLUDE_DIR})
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libkdcraw/src)
+--
+2.26.0
+
diff --git a/media-gfx/krita/krita-4.2.9.ebuild b/media-gfx/krita/krita-4.2.9.ebuild
new file mode 100644
index 00000000000..0ac0bce413e
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.9.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{6,7,8} )
+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}/$(ver_cut 1-3)/${P}.tar.xz"
+ KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/org.kde.krita https://krita.org/en/"
+
+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]
+ >=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}"/${PN}-4.2.4-tests-optional.patch
+ "${FILESDIR}"/${P}-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] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2020-06-18 23:03 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2020-06-18 23:03 UTC (permalink / raw
To: gentoo-commits
commit: 4823065bff02a67c88b3d685354b4062c74dd4e8
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 23:03:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4823065b
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>
media-gfx/krita/Manifest | 1 +
.../krita/files/krita-4.3.0-tests-optional.patch | 536 +++++++++++++++++++++
media-gfx/krita/krita-4.3.0.ebuild | 122 +++++
3 files changed, 659 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index acb7f9fd647..65b1492d8b1 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
DIST krita-4.2.9.tar.xz 170082028 BLAKE2B dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66 SHA512 66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0
+DIST krita-4.3.0.tar.xz 166246720 BLAKE2B 74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c SHA512 5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4
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 00000000000..b58dcf1f4a8
--- /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.ebuild b/media-gfx/krita/krita-4.3.0.ebuild
new file mode 100644
index 00000000000..2bd200f968e
--- /dev/null
+++ b/media-gfx/krita/krita-4.3.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
+ KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://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] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2020-12-17 10:23 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2020-12-17 10:23 UTC (permalink / raw
To: gentoo-commits
commit: 7329bad3b388d903d42986336279e0b7a25bf09e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 10:11:31 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 10:23:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7329bad3
media-gfx/krita: Drop 4.3.0
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 -
.../krita/files/krita-4.3.0-tests-optional.patch | 536 ---------------------
media-gfx/krita/krita-4.3.0.ebuild | 127 -----
3 files changed, 664 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2d039017079..789a2b08b4f 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
-DIST krita-4.3.0.tar.xz 166246720 BLAKE2B 74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c SHA512 5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4
DIST krita-4.4.1.tar.xz 169788052 BLAKE2B fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190 SHA512 8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccaaaadbc1b1f8bcbcdeb607909fee710afe
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 b58dcf1f4a8..00000000000
--- 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 745d2ca7bf0..00000000000
--- a/media-gfx/krita/krita-4.3.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
- https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
- KEYWORDS="amd64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
- dev-cpp/eigen:3
- dev-lang/perl
- sys-devel/gettext
-"
-RDEPEND="${PYTHON_DEPS}
- dev-libs/boost:=
- dev-libs/quazip
- $(python_gen_cond_dep '
- dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
- dev-python/sip[${PYTHON_MULTI_USEDEP}]
- ')
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- media-gfx/exiv2:=
- media-libs/lcms
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXi
- color-management? ( media-libs/opencolorio )
- fftw? ( sci-libs/fftw:3.0= )
- gif? ( media-libs/giflib )
- gsl? ( sci-libs/gsl:= )
- jpeg? ( virtual/jpeg:0 )
- heif? ( media-libs/libheif:= )
- openexr? (
- media-libs/ilmbase:=
- media-libs/openexr
- )
- pdf? ( app-text/poppler[qt5] )
- qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
- raw? ( media-libs/libraw:= )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
- vc? ( >=dev-libs/vc-1.1.0 )
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-tests-optional.patch
- "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- ecm_pkg_setup
-}
-
-src_prepare() {
- ecm_src_prepare
- sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
-}
-
-src_configure() {
- # Prevent sandbox violation from FindPyQt5.py module
- # See Gentoo-bug 655918
- addpredict /dev/dri
-
- local mycmakeargs=(
- $(cmake_use_find_package color-management OCIO)
- $(cmake_use_find_package fftw FFTW3)
- $(cmake_use_find_package gif GIF)
- $(cmake_use_find_package gsl GSL)
- $(cmake_use_find_package heif HEIF)
- $(cmake_use_find_package jpeg JPEG)
- $(cmake_use_find_package openexr OpenEXR)
- $(cmake_use_find_package pdf Poppler)
- $(cmake_use_find_package qtmedia Qt5Multimedia)
- $(cmake_use_find_package raw LibRaw)
- $(cmake_use_find_package tiff TIFF)
- $(cmake_use_find_package vc Vc)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2021-06-20 8:33 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2021-06-20 8:33 UTC (permalink / raw
To: gentoo-commits
commit: 75651b0d83a785d1cb8411d36317b0452cb1144b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 20:36:00 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 08:32:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75651b0d
media-gfx/krita: 4.4.5 version bump
Introduce dev-python/sip slot op
Restrict to =media-libs/opencolorio-1*
Bug: https://bugs.gentoo.org/793887
Bug: https://bugs.gentoo.org/795786
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 +
.../files/krita-4.4.5-pykrita-crash-on-exit.patch | 55 +++++++++
media-gfx/krita/krita-4.4.5.ebuild | 129 +++++++++++++++++++++
3 files changed, 185 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 50f9dd6da41..33c5f73c48e 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
DIST krita-4.4.3.tar.gz 254855083 BLAKE2B 5ffc5d7c887d409c2669a2c75f2dae3d6b1c6e83f30d330c37c6e8eb96e590c4abb7b26aea82a18f13b01ed2f053d2a4ddca780cab2995c10c9c0c07d67ee689 SHA512 44052f5bc02c31b8e5eb7990192c1b1d6a4ca9d91117b0b8e9ddf794df83cfdde233754064ad6692516bc8d756871bf4b34190653f04956cb851333b8d15645f
+DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc SHA512 9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4
diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
new file mode 100644
index 00000000000..1939c962815
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
@@ -0,0 +1,55 @@
+From a0c29913114164ff3f2ba4e255ccee1c52cb3e86 Mon Sep 17 00:00:00 2001
+From: Alvin Wong <alvin@alvinhc.com>
+Date: Sat, 19 Jun 2021 16:29:45 +0800
+Subject: [PATCH] Fix PyKrita cleanup using qApp::aboutToQuit to prevent crash
+
+Suspecting that we can't have Python clean up its QObject's inside
+QCoreApplication's destructor, but must be done before it.
+
+BUG: 417465
+
+* asturm 2021-06-20: mangled w/ a6296beb25c98d9a4b5a136e0088959bf51d550a
+---
+ plugins/extensions/pykrita/plugin/plugin.cpp | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp b/plugins/extensions/pykrita/plugin/plugin.cpp
+index ef0e27eb65..66f552b007 100644
+--- a/plugins/extensions/pykrita/plugin/plugin.cpp
++++ b/plugins/extensions/pykrita/plugin/plugin.cpp
+@@ -13,6 +13,8 @@
+ #include <kis_preference_set_registry.h>
+ #include "pyqtpluginsettings.h"
+
++#include <QCoreApplication>
++
+ #include <Krita.h>
+
+ K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", registerPlugin<KritaPyQtPlugin>();)
+@@ -74,15 +76,18 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
+ Q_FOREACH (Extension *extension, Krita::instance()->extensions()) {
+ extension->setup();
+ }
++
++ // This ensures that QObject's owned by Python are destructed before
++ // the destructor of QCoreApplication is called, in order to prevent
++ // a crash on exit.
++ // See https://bugs.kde.org/show_bug.cgi?id=417465
++ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, []() { PyKrita::finalize(); });
+ }
+
+ KritaPyQtPlugin::~KritaPyQtPlugin()
+ {
+- // XXX: With Qt 5.14, this crashes Krita on exit. See https://bugs.kde.org/show_bug.cgi?id=417465
+- // So, for now, we just don't call finalize...
+-#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
+- PyKrita::finalize();
+-#endif
++ // Don't call PyKrita::finalize here, because that can result in a crash
++ // deep inside Qt.
+ }
+
+ #include "plugin.moc"
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-4.4.5.ebuild b/media-gfx/krita/krita-4.4.5.ebuild
new file mode 100644
index 00000000000..9b1b2c73a5e
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.5.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_{8,9,10} )
+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/stable/${PN}/${PV}/${P}.tar.gz
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://apps.kde.org/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"
+
+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-1* )
+ 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 )
+"
+BDEPEND="
+ dev-cpp/eigen:3
+ dev-lang/perl
+ sys-devel/gettext
+"
+
+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
+ "${FILESDIR}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465
+)
+
+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] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2021-08-10 18:14 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2021-08-10 18:14 UTC (permalink / raw
To: gentoo-commits
commit: ba2af85078920c0523791faca18cb299626799af
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 10 17:56:49 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 10 18:14:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba2af850
media-gfx/krita: 4.4.7 version bump
See also: https://krita.org/en/item/krita-4-4-7-released/
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 +
.../files/krita-4.4.5-pykrita-crash-on-exit.patch | 49 ++++++----------------
...tch => krita-4.4.7-pykrita-crash-on-exit.patch} | 16 +------
media-gfx/krita/krita-4.4.5-r1.ebuild | 1 +
.../{krita-4.4.5-r1.ebuild => krita-4.4.7.ebuild} | 4 +-
5 files changed, 18 insertions(+), 53 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 25e38181019..15f1fd23ee2 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc SHA512 9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4
+DIST krita-4.4.7.tar.gz 254871508 BLAKE2B c7e964ddec3fdf16db0644f6d61daa278b0fed2969bbcad99ca476240196ff4da3371af718049482ffe09e314bc96d40f28929fccb8cf0d3a9c98d7f20658695 SHA512 b1fbab9f69e700a1e9e562adfa1776c2de481a5dd92cee2a0ea533a0233a7277b512823023736784c41b387210a35c07cc23b3e2b3a89ed9cb60d440cc5906d5
diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
index 1939c962815..12ebb2fa95a 100644
--- a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
+++ b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
@@ -1,42 +1,18 @@
-From a0c29913114164ff3f2ba4e255ccee1c52cb3e86 Mon Sep 17 00:00:00 2001
-From: Alvin Wong <alvin@alvinhc.com>
-Date: Sat, 19 Jun 2021 16:29:45 +0800
-Subject: [PATCH] Fix PyKrita cleanup using qApp::aboutToQuit to prevent crash
+From 86a38621fbbf96edf489a0efd2b9c24c123e2051 Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov <dimula73@gmail.com>
+Date: Tue, 3 Aug 2021 11:57:33 +0300
+Subject: [PATCH] Disable finalizing of the PyQt to prevent crash on exit
-Suspecting that we can't have Python clean up its QObject's inside
-QCoreApplication's destructor, but must be done before it.
-
-BUG: 417465
-
-* asturm 2021-06-20: mangled w/ a6296beb25c98d9a4b5a136e0088959bf51d550a
+CCBUG:417465
---
- plugins/extensions/pykrita/plugin/plugin.cpp | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
+ plugins/extensions/pykrita/plugin/plugin.cpp | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp b/plugins/extensions/pykrita/plugin/plugin.cpp
-index ef0e27eb65..66f552b007 100644
+index 028798e2f4..cc06c07fbe 100644
--- a/plugins/extensions/pykrita/plugin/plugin.cpp
+++ b/plugins/extensions/pykrita/plugin/plugin.cpp
-@@ -13,6 +13,8 @@
- #include <kis_preference_set_registry.h>
- #include "pyqtpluginsettings.h"
-
-+#include <QCoreApplication>
-+
- #include <Krita.h>
-
- K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", registerPlugin<KritaPyQtPlugin>();)
-@@ -74,15 +76,18 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
- Q_FOREACH (Extension *extension, Krita::instance()->extensions()) {
- extension->setup();
- }
-+
-+ // This ensures that QObject's owned by Python are destructed before
-+ // the destructor of QCoreApplication is called, in order to prevent
-+ // a crash on exit.
-+ // See https://bugs.kde.org/show_bug.cgi?id=417465
-+ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, []() { PyKrita::finalize(); });
- }
+@@ -89,11 +89,10 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
KritaPyQtPlugin::~KritaPyQtPlugin()
{
@@ -45,11 +21,12 @@ index ef0e27eb65..66f552b007 100644
-#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
- PyKrita::finalize();
-#endif
-+ // Don't call PyKrita::finalize here, because that can result in a crash
-+ // deep inside Qt.
++ /// XXX: Don't call PyKrita::finalize here, because that can result in a crash
++ /// deep inside Qt. See https://bugs.kde.org/show_bug.cgi?id=417465
++
++ // PyKrita::finalize();
}
#include "plugin.moc"
--
GitLab
-
diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
similarity index 73%
copy from media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
copy to media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
index 1939c962815..f896a3920ef 100644
--- a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
+++ b/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
@@ -7,8 +7,6 @@ Suspecting that we can't have Python clean up its QObject's inside
QCoreApplication's destructor, but must be done before it.
BUG: 417465
-
-* asturm 2021-06-20: mangled w/ a6296beb25c98d9a4b5a136e0088959bf51d550a
---
plugins/extensions/pykrita/plugin/plugin.cpp | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
@@ -26,7 +24,7 @@ index ef0e27eb65..66f552b007 100644
#include <Krita.h>
K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", registerPlugin<KritaPyQtPlugin>();)
-@@ -74,15 +76,18 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
+@@ -74,6 +76,12 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
Q_FOREACH (Extension *extension, Krita::instance()->extensions()) {
extension->setup();
}
@@ -39,17 +37,5 @@ index ef0e27eb65..66f552b007 100644
}
KritaPyQtPlugin::~KritaPyQtPlugin()
- {
-- // XXX: With Qt 5.14, this crashes Krita on exit. See https://bugs.kde.org/show_bug.cgi?id=417465
-- // So, for now, we just don't call finalize...
--#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
-- PyKrita::finalize();
--#endif
-+ // Don't call PyKrita::finalize here, because that can result in a crash
-+ // deep inside Qt.
- }
-
- #include "plugin.moc"
--
GitLab
-
diff --git a/media-gfx/krita/krita-4.4.5-r1.ebuild b/media-gfx/krita/krita-4.4.5-r1.ebuild
index fe539d73926..5c4bd6209e5 100644
--- a/media-gfx/krita/krita-4.4.5-r1.ebuild
+++ b/media-gfx/krita/krita-4.4.5-r1.ebuild
@@ -92,6 +92,7 @@ PATCHES=(
"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
"${FILESDIR}"/${PN}-4.4.2-quazip1.patch
"${FILESDIR}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465
+ "${FILESDIR}"/${PN}-4.4.7-pykrita-crash-on-exit.patch # git master
)
pkg_setup() {
diff --git a/media-gfx/krita/krita-4.4.5-r1.ebuild b/media-gfx/krita/krita-4.4.7.ebuild
similarity index 98%
copy from media-gfx/krita/krita-4.4.5-r1.ebuild
copy to media-gfx/krita/krita-4.4.7.ebuild
index fe539d73926..c80ed32f998 100644
--- a/media-gfx/krita/krita-4.4.5-r1.ebuild
+++ b/media-gfx/krita/krita-4.4.7.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz
https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
- KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
@@ -91,7 +91,7 @@ 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
- "${FILESDIR}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465
+ "${FILESDIR}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465, git master
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2021-11-15 13:37 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2021-11-15 13:37 UTC (permalink / raw
To: gentoo-commits
commit: 62306e5005656ea05a0ef00b2ffb57ebba8d7e24
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 13:28:37 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 13:37:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62306e50
media-gfx/krita: Fix build with >=PyQt5-5.15.6
See also:
ttps://www.riverbankcomputing.com/pipermail/pyqt/2021-November/044346.html
Closes: https://bugs.gentoo.org/822843
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../krita-4.4.8-prefer-newer-sip-to-build.patch | 56 ++++++++++++++++++++++
media-gfx/krita/krita-4.4.8-r1.ebuild | 1 +
2 files changed, 57 insertions(+)
diff --git a/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch b/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch
new file mode 100644
index 000000000000..c60b53ffc64b
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch
@@ -0,0 +1,56 @@
+From d2f29d77db58b54a8bcabfb68df66e4dd44f0c27 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+Date: Fri, 12 Nov 2021 12:27:07 +0100
+Subject: [PATCH] Try (and thus prefer) sip >=5 first
+
+If one has sip 4.x and sip 6.x installed sip 4 is picked up
+("Found SIP version: 4.19.24") just because it is searched first.
+
+This matters not only because it is nice to use the "latest and
+greatest", but also because software using the latest PyQt5 (including
+krita) can't be built with sip 4 at the moment and the maintainer is
+apparently in no hurry to fix it [1].
+
+[1] https://www.riverbankcomputing.com/pipermail/pyqt/2021-November/044345.html
+---
+ cmake/modules/FindSIP.py | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/cmake/modules/FindSIP.py b/cmake/modules/FindSIP.py
+index 7b92abd36e..600805c329 100644
+--- a/cmake/modules/FindSIP.py
++++ b/cmake/modules/FindSIP.py
+@@ -15,6 +15,16 @@ def osAwareSuffix():
+ return os.path.join("lib", "python3.8", "site-packages","sipconfig.py") if os.name != 'nt' else os.path.join("lib","krita-python-libs","sipconfig.py")
+
+ try:
++ import sipbuild
++
++ print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION)
++ print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
++
++ import shutil
++
++ # sip v5 and higher need to invoke sip-build
++ print("sip_bin:%s" % shutil.which("sip-build"))
++except ImportError: # Code for SIP <5
+ import sipconfig
+
+ sipcfg = sipconfig.Configuration()
+@@ -41,13 +51,4 @@ try:
+ print("sip_bin:%s" % sip_bin)
+ print("default_sip_dir:%s" % default_sip_dir)
+ print("sip_inc_dir:%s" % sip_inc_dir)
+-except ImportError: # Code for SIP v5+
+- import sipbuild
+-
+- print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION)
+- print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
+
+- import shutil
+-
+- # sip v5 and higher need to invoke sip-build
+- print("sip_bin:%s" % shutil.which("sip-build"))
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-4.4.8-r1.ebuild b/media-gfx/krita/krita-4.4.8-r1.ebuild
index 614c5a0ad5d4..dedc461115e7 100644
--- a/media-gfx/krita/krita-4.4.8-r1.ebuild
+++ b/media-gfx/krita/krita-4.4.8-r1.ebuild
@@ -92,6 +92,7 @@ PATCHES=(
"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
"${FILESDIR}"/${PN}-4.4.2-quazip1.patch
"${FILESDIR}"/${PN}-4.4.7-pykrita-crash-on-exit.patch # KDE-Bug #417465, git master
+ "${FILESDIR}"/${P}-prefer-newer-sip-to-build.patch # bug 822843
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2021-12-29 16:34 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2021-12-29 16:34 UTC (permalink / raw
To: gentoo-commits
commit: 9b4dbc2b6eab22ae41faf217a6b261898de346ba
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 29 11:52:52 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 16:33:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b4dbc2b
media-gfx/krita: Fix desktop file QA warning
Reported-by: Marco Scardovi <marco <AT> scardovi.com>
Closes: https://bugs.gentoo.org/829987
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/krita-5.0.0-krita_jp2.desktop.patch | 24 ++++++++++++++++++++++
media-gfx/krita/krita-5.0.0-r1.ebuild | 1 +
2 files changed, 25 insertions(+)
diff --git a/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch b/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch
new file mode 100644
index 000000000000..c678a9f05492
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch
@@ -0,0 +1,24 @@
+From e1b2760966b738f1d467013272035433f1666406 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 27 Dec 2021 15:25:25 +0100
+Subject: [PATCH] Fix duplicate "Type" key
+
+Introduced by 542dcd306e236ec776a81e389d0a601387739e48
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ plugins/impex/jp2/krita_jp2.desktop | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plugins/impex/jp2/krita_jp2.desktop b/plugins/impex/jp2/krita_jp2.desktop
+index 26c448f48b..7de190b247 100644
+--- a/plugins/impex/jp2/krita_jp2.desktop
++++ b/plugins/impex/jp2/krita_jp2.desktop
+@@ -120,4 +120,3 @@ Icon=krita
+ StartupNotify=true
+ NoDisplay=true
+ Terminal=false
+-Type=Application
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-5.0.0-r1.ebuild b/media-gfx/krita/krita-5.0.0-r1.ebuild
index 757396adc400..d2782068ebcc 100644
--- a/media-gfx/krita/krita-5.0.0-r1.ebuild
+++ b/media-gfx/krita/krita-5.0.0-r1.ebuild
@@ -89,6 +89,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
"${FILESDIR}"/${P}-clang.patch # bug 830225
+ "${FILESDIR}"/${P}-krita_jp2.desktop.patch # bug 829987
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2022-06-15 17:18 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2022-06-15 17:18 UTC (permalink / raw
To: gentoo-commits
commit: 1f2b04f517bfa021c6539b88eba36b8a82b3f201
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 17:18:27 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 17:18:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2b04f5
media-gfx/krita: Drop 5.0.2
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 -
media-gfx/krita/files/krita-5.0.0-clang.patch | 50 -----------
media-gfx/krita/krita-5.0.2.ebuild | 124 --------------------------
3 files changed, 175 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index f4dfa19da4cd..5991619dfdc1 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-DIST krita-5.0.2.tar.xz 179049488 BLAKE2B a58ee0e7d654f18509f970d32a680a9a993c7172a3818517ddf0a41f500c2d1f9102a432b728b9d9254f39f1be0c926602e3b1806ae19b6efc49f99becdffcdd SHA512 5dd2d6961feabf20dbcef49f3499281e34b409e96d379b0247eec70449f82c05ed3cf3ca09014535adb7ce66659d58e988f1f054364637c9851181fa8ee926a5
DIST krita-5.0.8.tar.xz 179344256 BLAKE2B f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682 SHA512 652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777
diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch b/media-gfx/krita/files/krita-5.0.0-clang.patch
deleted file mode 100644
index 6c9c71d4fca2..000000000000
--- a/media-gfx/krita/files/krita-5.0.0-clang.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
-From: Sharaf Zaman <shzam@sdf.org>
-Date: Wed, 27 Oct 2021 22:19:07 +0000
-Subject: [PATCH] Fix build on linux clang targets
-
-In CheckAtomic.cmake we include is_lock_free because these routines
-don't seem to be included in the compiler's "simple atomics". This
-triggers a failure in clang toolchain, forcing it to link libatomic.
-
-Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
-
-CCBUG:444247
-CCBUG:444547
----
- cmake/modules/CheckAtomic.cmake | 1 +
- libs/image/CMakeLists.txt | 6 ++----
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
-index b061e2d65b..df6b70504c 100644
---- a/cmake/modules/CheckAtomic.cmake
-+++ b/cmake/modules/CheckAtomic.cmake
-@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
- std::atomic<uint64_t> x (0);
- int main() {
- uint64_t i = x.load(std::memory_order_relaxed);
-+ x.is_lock_free();
- return 0;
- }
- " ${varname})
-diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
-index e883c7f1c8..43c945fad3 100644
---- a/libs/image/CMakeLists.txt
-+++ b/libs/image/CMakeLists.txt
-@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
-
- target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
-
--if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
-- if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-- target_link_libraries(kritaimage PUBLIC atomic)
-- endif()
-+if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
-+ target_link_libraries(kritaimage PUBLIC atomic)
- endif()
-
- if(OpenEXR_FOUND)
---
-GitLab
-
diff --git a/media-gfx/krita/krita-5.0.2.ebuild b/media-gfx/krita/krita-5.0.2.ebuild
deleted file mode 100644
index 0c5864b918f4..000000000000
--- a/media-gfx/krita/krita-5.0.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{8..10} )
-KFMIN=5.82.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/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg +mypaint-brush-engine openexr pdf qtmedia +raw vc webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/boost:=
- dev-libs/quazip:0=
- $(python_gen_cond_dep '
- dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
- dev-python/sip:=[${PYTHON_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/qtsql-${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=
- media-libs/tiff:0
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXi
- color-management? ( >=media-libs/opencolorio-2.0.0 )
- fftw? ( sci-libs/fftw:3.0= )
- gif? ( media-libs/giflib )
- gsl? ( sci-libs/gsl:= )
- jpeg? ( virtual/jpeg:0 )
- heif? ( >=media-libs/libheif-1.11:= )
- 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:= )
- webp? ( >=media-libs/libwebp-1.2.0:= )
-"
-DEPEND="${RDEPEND}
- vc? ( >=dev-libs/vc-1.1.0 )
-"
-BDEPEND="
- dev-cpp/eigen:3
- dev-lang/perl
- sys-devel/gettext
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
- "${FILESDIR}"/${PN}-5.0.0-clang.patch # bug 830225
-)
-
-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=(
- -DENABLE_UPDATERS=OFF
- -DFETCH_TRANSLATIONS=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=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 jpeg JPEG)
- $(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 vc Vc)
- $(cmake_use_find_package webp WebP)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2022-12-20 19:00 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2022-12-20 19:00 UTC (permalink / raw
To: gentoo-commits
commit: 436675c61eaefced99e20f8edc9e01355a2b2e70
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 18:45:59 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 18:59:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=436675c6
media-gfx/krita: Fix build against >=media-libs/libraw-0.21.0
Closes: https://bugs.gentoo.org/887473
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../krita/files/krita-5.1.4-libraw-0.21.patch | 28 ++++++++++++++++++++++
media-gfx/krita/krita-5.1.4-r1.ebuild | 5 +++-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch b/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
new file mode 100644
index 000000000000..9cdd0a9f8161
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
@@ -0,0 +1,28 @@
+From e753d2453d1614b65b288e49fa5d5371764feaa8 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sun, 18 Dec 2022 16:28:38 +0100
+Subject: [PATCH] Fix build with libraw 0.21
+
+---
+ plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+index dcaecc6fa7..71425f909c 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+@@ -383,7 +383,11 @@ bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawI
+ d->setProgress(0.3);
+
+ raw.imgdata.params.output_bps = 16;
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++ raw.imgdata.rawparams.shot_select = shotSelect;
++#else
+ raw.imgdata.params.shot_select = shotSelect;
++#endif
+ ret = raw.unpack();
+
+ if (ret != LIBRAW_SUCCESS)
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-5.1.4-r1.ebuild b/media-gfx/krita/krita-5.1.4-r1.ebuild
index abf1cf77bf49..86ce7588ec21 100644
--- a/media-gfx/krita/krita-5.1.4-r1.ebuild
+++ b/media-gfx/krita/krita-5.1.4-r1.ebuild
@@ -85,7 +85,10 @@ BDEPEND="
sys-devel/gettext
"
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+ "${FILESDIR}"/${P}-libraw-0.21.patch # bug 887473
+)
pkg_setup() {
python-single-r1_pkg_setup
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2023-12-26 8:59 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2023-12-26 8:59 UTC (permalink / raw
To: gentoo-commits
commit: 039e05313098a299f93038ea55934ebfd5b6bb9a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 08:58:54 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 08:59:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=039e0531
media-gfx/krita: Fix build w/ >=dev-python/sip-6.8.0
Closes: https://bugs.gentoo.org/919139
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/files/krita-5.1.5-sip-6.8.patch | 26 +++++++++++++++++++++++++
media-gfx/krita/krita-5.1.5.ebuild | 1 +
2 files changed, 27 insertions(+)
diff --git a/media-gfx/krita/files/krita-5.1.5-sip-6.8.patch b/media-gfx/krita/files/krita-5.1.5-sip-6.8.patch
new file mode 100644
index 000000000000..d9bcd937a3d2
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.5-sip-6.8.patch
@@ -0,0 +1,26 @@
+From 2d71c47661d43a4e3c1ab0c27803de980bdf2bb2 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Mon, 11 Dec 2023 20:26:13 +0100
+Subject: [PATCH] Bump SIP ABI version to 12.8
+
+Fixes build with SIP 6.8
+---
+ cmake/modules/pyproject.toml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/pyproject.toml.in b/cmake/modules/pyproject.toml.in
+index 090b2d4b0cb..085ddf41799 100644
+--- a/cmake/modules/pyproject.toml.in
++++ b/cmake/modules/pyproject.toml.in
+@@ -9,7 +9,7 @@ name = "@module_name_toml@"
+ sip-module = "@sip_name@"
+ sip-include-dirs = @sip_include_dirs@
+ sip-files-dir = "@module_srcs@"
+-abi-version = "12"
++abi-version = "12.8"
+
+ [tool.sip.bindings.@module_name_toml@]
+ tags = @module_tags@
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-5.1.5.ebuild b/media-gfx/krita/krita-5.1.5.ebuild
index f313dc477e04..ab68ac1db844 100644
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -90,6 +90,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.3.1-tests-optional.patch"
"${WORKDIR}/${P}-exiv2-0.28.patch" # bug 906472
"${FILESDIR}/${P}-ocio-2.3.0.patch" # bug 915107
+ "${FILESDIR}/${P}-sip-6.8.patch" # bug 919139
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2024-02-05 20:26 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2024-02-05 20:26 UTC (permalink / raw
To: gentoo-commits
commit: 89c10a643b2a5c5de926b94dddbd124d69b492b8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 5 20:25:32 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 5 20:26:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c10a64
media-gfx/krita: Fix build w/ LTO
Closes: https://bugs.gentoo.org/922520
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/files/krita-5.1.5-lto.patch | 58 +++++++++++++++++++++++++++++
media-gfx/krita/krita-5.1.5.ebuild | 1 +
2 files changed, 59 insertions(+)
diff --git a/media-gfx/krita/files/krita-5.1.5-lto.patch b/media-gfx/krita/files/krita-5.1.5-lto.patch
new file mode 100644
index 000000000000..0cccee5be00e
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.5-lto.patch
@@ -0,0 +1,58 @@
+From 2c4dd042df1518d67c117ced08c5a2f3729c3193 Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov <dimula73@gmail.com>
+Date: Tue, 30 Jan 2024 15:30:53 +0100
+Subject: [PATCH] Possibly fix ODR violation in the transform tool strategies
+
+BUG:480520
+
+
+(cherry picked from commit e33c7d7d533d5289c3a37007f8cf574af5bc7102)
+---
+ plugins/tools/tool_transform2/kis_free_transform_strategy.cpp | 2 ++
+ .../tool_transform2/kis_perspective_transform_strategy.cpp | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
+index 49486b6bd7c..8a63bce74e3 100644
+--- a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
++++ b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
+@@ -23,6 +23,7 @@
+ #include "kis_algebra_2d.h"
+
+
++namespace {
+ enum StrokeFunction {
+ ROTATE = 0,
+ MOVE,
+@@ -41,6 +42,7 @@ enum StrokeFunction {
+ MOVECENTER,
+ PERSPECTIVE
+ };
++}
+
+ struct KisFreeTransformStrategy::Private
+ {
+diff --git a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
+index ad1d9ffe4d3..bca5b51e13f 100644
+--- a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
++++ b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
+@@ -23,7 +23,7 @@
+ #include "kis_transform_utils.h"
+ #include "kis_free_transform_strategy_gsl_helpers.h"
+
+-
++namespace {
+ enum StrokeFunction {
+ DRAG_HANDLE = 0,
+ DRAG_X_VANISHING_POINT,
+@@ -43,6 +43,7 @@ enum HandleIndexes {
+ HANDLE_MIDDLE_RIGHT,
+ HANDLE_COUNT,
+ };
++}
+
+ struct KisPerspectiveTransformStrategy::Private
+ {
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-5.1.5.ebuild b/media-gfx/krita/krita-5.1.5.ebuild
index 283b2c2e7a76..3c49122dc318 100644
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -92,6 +92,7 @@ PATCHES=(
"${FILESDIR}/${P}-ocio-2.3.0.patch" # bug 915107
"${FILESDIR}/${P}-sip-6.8.patch" # bug 919139
"${FILESDIR}/${P}-libjxl-0.9.patch" # bug 922524
+ "${FILESDIR}/${P}-lto.patch" # bug 922520
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2024-07-13 18:02 Sam James
0 siblings, 0 replies; 23+ messages in thread
From: Sam James @ 2024-07-13 18:02 UTC (permalink / raw
To: gentoo-commits
commit: 65dbdb0f311291c3440fe315daf1a23e308af288
Author: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail <DOT> com>
AuthorDate: Tue Apr 23 11:07:58 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 17:34:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65dbdb0f
media-gfx/krita-5.2.2: fix the libjxl patch
The libjxl patch for version 5.1.5 is truncated,
so it doesn't fix the compatibility for 5.2.2.
The full version of the patch should be used.
Patch source:
- https://invent.kde.org/graphics/krita/-/commit/ace7edcc
Co-authored-by: Timo Gurr <timo.gurr <AT> gmail.com>
Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34736
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/krita/files/krita-5.2.2-libjxl-0.9.patch | 93 ++++++++++++++++++++++
media-gfx/krita/krita-5.2.2.ebuild | 6 +-
2 files changed, 96 insertions(+), 3 deletions(-)
diff --git a/media-gfx/krita/files/krita-5.2.2-libjxl-0.9.patch b/media-gfx/krita/files/krita-5.2.2-libjxl-0.9.patch
new file mode 100644
index 000000000000..83caf604bf70
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.2-libjxl-0.9.patch
@@ -0,0 +1,93 @@
+From ace7edcca6ad322581ab39620f21ccf3ffbd3b5a Mon Sep 17 00:00:00 2001
+From: Timo Gurr <timo.gurr@gmail.com>
+Date: Fri, 5 Jan 2024 14:04:50 +0000
+Subject: [PATCH] Fix build with libjxl 0.9.0
+
+Fix build with libjxl 0.9.0
+
+BUG:478987
+
+Test Plan
+---------
+
+* Upgrade to libjxl 0.9.0
+* Apply patch from MR and build krita (5.2.2)
+* Open/Display a sample image e.g. https://jpegxl.info/test-page/red-room.jxl
+
+Formalities Checklist
+---------------------
+
+- [x] I confirmed this builds.
+- [x] I confirmed Krita ran and the relevant functions work (Could successfully open/display a sample image https://jpegxl.info/test-page/red-room.jxl).
+- [ ] I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
+- [x] I made sure my commits build individually and have good descriptions as per [KDE guidelines](https://community.kde.org/Policies/Commit_Policy).
+- [x] I made sure my code conforms to the standards set in the HACKING file.
+- [x] I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per [KDE Licensing Policy](https://community.kde.org/Policies/Licensing_Policy).
+
+_**Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build.**_
+_**If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.**_
+---
+ plugins/impex/jxl/JPEGXLImport.cpp | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/impex/jxl/JPEGXLImport.cpp b/plugins/impex/jxl/JPEGXLImport.cpp
+index 573bae41247..f5b989b3b70 100644
+--- a/plugins/impex/jxl/JPEGXLImport.cpp
++++ b/plugins/impex/jxl/JPEGXLImport.cpp
+@@ -511,7 +511,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
+ JxlColorEncoding colorEncoding{};
+ if (JXL_DEC_SUCCESS
+ == JxlDecoderGetColorAsEncodedProfile(dec.get(),
++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
+ nullptr,
++#endif
+ JXL_COLOR_PROFILE_TARGET_DATA,
+ &colorEncoding)) {
+ const TransferCharacteristics transferFunction = [&]() {
+@@ -635,7 +637,12 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
+ size_t iccSize = 0;
+ QByteArray iccProfile;
+ if (JXL_DEC_SUCCESS
+- != JxlDecoderGetICCProfileSize(dec.get(), nullptr, JXL_COLOR_PROFILE_TARGET_DATA, &iccSize)) {
++ != JxlDecoderGetICCProfileSize(dec.get(),
++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
++ nullptr,
++#endif
++ JXL_COLOR_PROFILE_TARGET_DATA,
++ &iccSize)) {
+ errFile << "ICC profile size retrieval failed";
+ document->setErrorMessage(i18nc("JPEG-XL errors", "Unable to read the image profile."));
+ return ImportExportCodes::ErrorWhileReading;
+@@ -643,7 +650,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
+ iccProfile.resize(static_cast<int>(iccSize));
+ if (JXL_DEC_SUCCESS
+ != JxlDecoderGetColorAsICCProfile(dec.get(),
++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
+ nullptr,
++#endif
+ JXL_COLOR_PROFILE_TARGET_DATA,
+ reinterpret_cast<uint8_t *>(iccProfile.data()),
+ static_cast<size_t>(iccProfile.size()))) {
+@@ -657,7 +666,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
+ if (!d.m_info.uses_original_profile) {
+ if (JXL_DEC_SUCCESS
+ != JxlDecoderGetICCProfileSize(dec.get(),
++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
+ nullptr,
++#endif
+ JXL_COLOR_PROFILE_TARGET_ORIGINAL,
+ &iccTargetSize)) {
+ errFile << "ICC profile size retrieval failed";
+@@ -667,7 +678,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
+ iccTargetProfile.resize(static_cast<int>(iccTargetSize));
+ if (JXL_DEC_SUCCESS
+ != JxlDecoderGetColorAsICCProfile(dec.get(),
++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
+ nullptr,
++#endif
+ JXL_COLOR_PROFILE_TARGET_ORIGINAL,
+ reinterpret_cast<uint8_t *>(iccTargetProfile.data()),
+ static_cast<size_t>(iccTargetProfile.size()))) {
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-5.2.2.ebuild b/media-gfx/krita/krita-5.2.2.ebuild
index c5dabbfab439..c74e64e7e7ad 100644
--- a/media-gfx/krita/krita-5.2.2.ebuild
+++ b/media-gfx/krita/krita-5.2.2.ebuild
@@ -95,9 +95,9 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-4.3.1-tests-optional.patch"
"${FILESDIR}/${PN}-5.1.5-sip-6.8.patch" # bug 919139
- "${FILESDIR}/${PN}-5.1.5-libjxl-0.9.patch" # bug 922524
- "${FILESDIR}/${PN}-5.2.2-fftw.patch"
- "${FILESDIR}/${PN}-5.2.2-openjpeg.patch"
+ "${FILESDIR}/${P}-libjxl-0.9.patch" # bug 922524
+ "${FILESDIR}/${P}-fftw.patch"
+ "${FILESDIR}/${P}-openjpeg.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2024-07-13 19:59 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2024-07-13 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 07feba52ea302f7ea9205d3a3aaadf88ca764541
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 19:31:19 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 19:58:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07feba52
media-gfx/krita: add 5.2.3
Bug: https://bugs.gentoo.org/921972
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 +
.../krita/files/krita-5.2.3-tests-optional.patch | 90 ++++++++++++++
media-gfx/krita/krita-5.2.3.ebuild | 134 +++++++++++++++++++++
3 files changed, 225 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 48438ab65058..04a9cb5b8e5f 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,4 @@
DIST krita-5.1.5-exiv2-0.28.patch.xz 4664 BLAKE2B e364325be3d8e40e293a7d268136be3737ce5d2b9b5607f140b30ba3e687dc8d86545f4463348587711150f1652b521f87efc859a1bf2bc3b5ed704cf3236781 SHA512 130ba9cce7d6c0138f7ef6dab1445816c2e29752aa16643c32a7d9c00d7a156ac88f01afdb782ab03fc1e0822660a070f74c02e7cde4dfbcec30baaf3c3dba7f
DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716 SHA512 b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1
DIST krita-5.2.2.tar.xz 189146788 BLAKE2B 1cfb9f404258467f2cc616bc0320a463f7291d2fe75c76b873982c3741d1f21a338aabed60bc216628e54ae01f7ba52d3b713c3a00d920b03645cba23927d207 SHA512 d2e55d9a6c7be79f5b6661a1bd605cdf1ce20ec78cdaab1ba19a4acca5397afa0c0e8bc1cbf60120993b156aef65ed35fde2de756841342d18221c82ea81a1eb
+DIST krita-5.2.3.tar.xz 186685456 BLAKE2B 42943e7ebffdb46b9da085b2069701895e37ad9c457273b9217a095f1dfdf15c715cde0b88d440abb2d73dee656730da38844f11f27022885f87bb9cc9adab26 SHA512 69a0477e3119765dd53e0502fe5a64fcdc921dfcba3ddc5dec5c1bc4342a77b172b38276f134cc56f79741e6c47b51ef51786aadf0d178ce3955e24a9fd27b74
diff --git a/media-gfx/krita/files/krita-5.2.3-tests-optional.patch b/media-gfx/krita/files/krita-5.2.3-tests-optional.patch
new file mode 100644
index 000000000000..48d9e314a295
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.3-tests-optional.patch
@@ -0,0 +1,90 @@
+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()
+--- 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-5.2.3.ebuild b/media-gfx/krita/krita-5.2.3.ebuild
new file mode 100644
index 000000000000..266fe59b4453
--- /dev/null
+++ b/media-gfx/krita/krita-5.2.3.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+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"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+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
+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}]
+ dev-python/sip:=[${PYTHON_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/qtsql-${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/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/tiff:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXi
+ color-management? ( >=media-libs/opencolorio-2.0.0 )
+ 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] )
+ raw? ( kde-apps/libkdcraw:= )
+ webp? ( >=media-libs/libwebp-1.2.0:= )
+ xsimd? ( dev-cpp/xsimd )
+
+"
+DEPEND="${RDEPEND}
+ dev-libs/immer
+ dev-libs/lager
+ dev-libs/zug
+"
+BDEPEND="
+ dev-cpp/eigen:3
+ dev-lang/perl
+ sys-devel/gettext
+"
+
+PATCHES=(
+ # downstream
+ "${FILESDIR}"/${P}-tests-optional.patch
+ "${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
+ # git master
+ "${FILESDIR}"/${PN}-5.1.5-sip-6.8.patch # bug 919139
+)
+
+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=(
+ -DENABLE_UPDATERS=OFF
+ -DKRITA_ENABLE_PCH=OFF # big mess.
+ -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=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 raw KF5KDcraw)
+ $(cmake_use_find_package webp WebP)
+ $(cmake_use_find_package xsimd xsimd)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
@ 2024-08-26 23:37 Sam James
0 siblings, 0 replies; 23+ messages in thread
From: Sam James @ 2024-08-26 23:37 UTC (permalink / raw
To: gentoo-commits
commit: 895559126b0565a22a085dccf087fa3b4bb2ad61
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 26 23:36:27 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 26 23:36:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89555912
media-gfx/krita: fix build w/ -march=znver4 & USE=xsimd
Closes: https://bugs.gentoo.org/936296
Thanks-to: Dmitry Kazakov <dimula73 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../krita/files/krita-5.2.3-znver4-xsimd.patch | 38 ++++++++++++++++++++++
media-gfx/krita/krita-5.2.3.ebuild | 1 +
2 files changed, 39 insertions(+)
diff --git a/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch b/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch
new file mode 100644
index 000000000000..df5fffb41d47
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/936296
+https://invent.kde.org/graphics/krita/-/commit/cf2c74220b7edfae53a0715346cb4e2c7dfc38ae
+
+From cf2c74220b7edfae53a0715346cb4e2c7dfc38ae Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov <dimula73@gmail.com>
+Date: Mon, 26 Aug 2024 14:38:03 +0200
+Subject: [PATCH] Don't use xsimd::default_arch in the pixel scaler code
+
+Gentoo seems to build Krita with a global -march=znver4 flag,
+which causes "scalar" version of the code to be compiled with
+AVX512. Even though it is not how the system is supposed to work
+(and this avx512-optimization will never be used in real runtime),
+we shouldn't fail compilation.
+
+https://bugs.gentoo.org/936296
+https://github.com/xtensor-stack/xsimd/issues/1044
+--- a/libs/pigment/KoOptimizedPixelDataScalerU8ToU16.h
++++ b/libs/pigment/KoOptimizedPixelDataScalerU8ToU16.h
+@@ -28,7 +28,7 @@ public:
+ const int numColorChannels = m_channelsPerPixel * numColumns;
+
+ #if defined(HAVE_XSIMD) && XSIMD_WITH_AVX2
+- using uint16_avx_v = xsimd::batch<uint16_t, xsimd::default_arch>;
++ using uint16_avx_v = xsimd::batch<uint16_t, xsimd::avx2>;
+ using uint16_v = xsimd::batch<uint16_t, xsimd::sse4_1>;
+ using uint8_v = xsimd::batch<uint8_t, xsimd::sse4_1>;
+
+@@ -129,7 +129,7 @@ public:
+ const int numColorChannels = m_channelsPerPixel * numColumns;
+
+ #if defined(HAVE_XSIMD) && XSIMD_WITH_AVX2
+- using uint16_avx_v = xsimd::batch<uint16_t, xsimd::default_arch>;
++ using uint16_avx_v = xsimd::batch<uint16_t, xsimd::avx2>;
+ using uint16_v = xsimd::batch<uint16_t, xsimd::sse4_1>;
+
+ const int channelsPerAvx2Block = 32;
+--
+GitLab
diff --git a/media-gfx/krita/krita-5.2.3.ebuild b/media-gfx/krita/krita-5.2.3.ebuild
index c95734e0ad9a..e6485a056c75 100644
--- a/media-gfx/krita/krita-5.2.3.ebuild
+++ b/media-gfx/krita/krita-5.2.3.ebuild
@@ -98,6 +98,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
# git master
"${FILESDIR}"/${PN}-5.1.5-sip-6.8.patch # bug 919139
+ "${FILESDIR}"/${PN}-5.2.3-znver4-xsimd.patch # bug 936296
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2024-08-26 23:37 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-15 17:18 [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-08-26 23:37 Sam James
2024-07-13 19:59 Andreas Sturmlechner
2024-07-13 18:02 Sam James
2024-02-05 20:26 Andreas Sturmlechner
2023-12-26 8:59 Andreas Sturmlechner
2022-12-20 19:00 Andreas Sturmlechner
2021-12-29 16:34 Andreas Sturmlechner
2021-11-15 13:37 Andreas Sturmlechner
2021-08-10 18:14 Andreas Sturmlechner
2021-06-20 8:33 Andreas Sturmlechner
2020-12-17 10:23 Andreas Sturmlechner
2020-06-18 23:03 Andreas Sturmlechner
2020-04-03 14:57 Andreas Sturmlechner
2019-07-31 9:45 Andreas Sturmlechner
2019-01-14 16:04 Andreas Sturmlechner
2018-12-28 17:48 Andreas Sturmlechner
2018-11-09 18:54 Andreas Sturmlechner
2018-09-01 19:31 Andreas Sturmlechner
2018-08-29 16:48 Andreas Sturmlechner
2018-08-29 16:48 Andreas Sturmlechner
2017-09-08 21:00 Johannes Huber
2017-07-01 13:41 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox