* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2016-09-22 11:40 Michael Palimaka
0 siblings, 0 replies; 28+ messages in thread
From: Michael Palimaka @ 2016-09-22 11:40 UTC (permalink / raw
To: gentoo-commits
commit: 692d0c2c43277aa789d73082b521b0794ac2ddc9
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 11:40:12 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 11:40:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=692d0c2c
media-gfx/krita: version bump
Gentoo-bug: 594594
Package-Manager: portage-2.3.1
media-gfx/krita/Manifest | 1 +
.../files/krita-3.0.1-breeze-collisions.patch | 16 ++++
.../krita/files/krita-3.0.1-vc-cxxflags.patch | 17 ++++
media-gfx/krita/krita-3.0.1.ebuild | 93 ++++++++++++++++++++++
4 files changed, 127 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index cbccb55..dc71f7e 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1 +1,2 @@
+DIST krita-3.0.1.tar.gz 206137161 SHA256 3c820ec30c3f4c93a33e2982571017eac8f8af2a734a6a1474ef11e1db26d006 SHA512 4d3446b90f7d5e9049ce77e9ac0dff2868dfe8ee1c707eec5d4c9d8e2168867447499079bae63ba45cc4f887ff00f0c91221e9a95c2185c0b023a1be02f09305 WHIRLPOOL 4e7165fa508616f2c36bd22b5a1a4d5c8147a0340ad6dcf1b183a85306aa9d052eea4bf7e068d1e358a1272baaa16ca316fac8fbc1515c1c1bcfae72138c8951
DIST krita-3.0.tgz 193020370 SHA256 4cea85623b709d6d32084c98a0fd76b97ad96d11be9808fca9fcaad2839a9c5a SHA512 a32507b010b5b785a40d830beb49272155d502c4c27ba874f1c9e75cbf49c7f1f730b3ecef06f24fc1ee9d3e9505c940bc20cb275f97c65e090cc5a59529486b WHIRLPOOL fe3b7b308aa754b597375aad49ef5f07d4e0e346f0109aec3b731d6dc1aea320380b01a2166a305c8cc578cad44cc19a1b4ba7fdabf9f7a841e3d5e0bae3e7fa
diff --git a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
new file mode 100644
index 00000000..890f825
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
@@ -0,0 +1,16 @@
+Avoid installing files that collide with kde-plasma/breeze.
+
+Gentoo-bug: 594594
+KDE-bug: 368093
+
+--- a/krita/data/themes/CMakeLists.txt
++++ b/krita/data/themes/CMakeLists.txt
+@@ -1,8 +1,6 @@
+ ########### install files ###############
+
+ install(FILES
+-BreezeDark.colors
+-BreezeHighContrast.colors
+ BreezeLight.colors
+ KritaNeutral.colors
+ KritaBlender.colors
diff --git a/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch b/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
new file mode 100644
index 00000000..11c1105
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
@@ -0,0 +1,17 @@
+Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
+
+Gentoo-bug: 584118
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -525,10 +525,6 @@
+ endif()
+ endmacro()
+
+- if (NOT PACKAGERS_BUILD)
+- # Optimize everything for the current architecture
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
+- endif ()
+ endif()
+ set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
+
diff --git a/media-gfx/krita/krita-3.0.1.ebuild b/media-gfx/krita/krita-3.0.1.ebuild
new file mode 100644
index 00000000..78ef868
--- /dev/null
+++ b/media-gfx/krita/krita-3.0.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="color-management fftw +gsl +jpeg openexr pdf +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:=
+ net-misc/curl
+ 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] )
+ 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]
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-breeze-collisions.patch"
+ "${FILESDIR}/${P}-vc-cxxflags.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_FFTW3=$(usex fftw)
+ -DWITH_GSL=$(usex gsl)
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_LibRaw=$(usex raw)
+ -DWITH_OCIO=$(usex color-management)
+ -DWITH_OpenEXR=$(usex openexr)
+ -DWITH_Poppler=$(usex pdf)
+ -DWITH_TIFF=$(usex tiff)
+ -DWITH_Vc=$(usex vc)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2016-12-17 17:51 Johannes Huber
0 siblings, 0 replies; 28+ messages in thread
From: Johannes Huber @ 2016-12-17 17:51 UTC (permalink / raw
To: gentoo-commits
commit: b2478712877abde73f2910ecdedc5342219a847f
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 17:50:43 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 17:50:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2478712
media-gfx/krita: Remove 3.0.1
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-gfx/krita/Manifest | 1 -
.../files/krita-3.0.1-breeze-collisions.patch | 16 ----
.../krita/files/krita-3.0.1-vc-cxxflags.patch | 17 ----
media-gfx/krita/krita-3.0.1.ebuild | 94 ----------------------
4 files changed, 128 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 83a924d..815e3e9 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-DIST krita-3.0.1.tar.gz 206137161 SHA256 3c820ec30c3f4c93a33e2982571017eac8f8af2a734a6a1474ef11e1db26d006 SHA512 4d3446b90f7d5e9049ce77e9ac0dff2868dfe8ee1c707eec5d4c9d8e2168867447499079bae63ba45cc4f887ff00f0c91221e9a95c2185c0b023a1be02f09305 WHIRLPOOL 4e7165fa508616f2c36bd22b5a1a4d5c8147a0340ad6dcf1b183a85306aa9d052eea4bf7e068d1e358a1272baaa16ca316fac8fbc1515c1c1bcfae72138c8951
DIST krita-3.1.1.tar.gz 209529508 SHA256 62ef2c4b9b19563c1e2e6dc0643dd0880e04469dd5798373401d8dd666720e8f SHA512 7de24ee9fe36fd832d8c98b14a585ce7c56b4444ab7acd34001cb99009d02059de9e4c0aaf690cd9e48aa5a3db32e94a820e80c78dbeaf22495bf1bd1a8da9f1 WHIRLPOOL 15b0999997752b3d656b206933c4fd885baeedef01724fbcc7e141bb124a97448168c61cc88885df1891d728ccd86e6fadb039b6c9c1c03105f19e97abdb6ab8
diff --git a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
deleted file mode 100644
index 890f825..00000000
--- a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid installing files that collide with kde-plasma/breeze.
-
-Gentoo-bug: 594594
-KDE-bug: 368093
-
---- a/krita/data/themes/CMakeLists.txt
-+++ b/krita/data/themes/CMakeLists.txt
-@@ -1,8 +1,6 @@
- ########### install files ###############
-
- install(FILES
--BreezeDark.colors
--BreezeHighContrast.colors
- BreezeLight.colors
- KritaNeutral.colors
- KritaBlender.colors
diff --git a/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch b/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
deleted file mode 100644
index 11c1105..00000000
--- a/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
-
-Gentoo-bug: 584118
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -525,10 +525,6 @@
- endif()
- endmacro()
-
-- if (NOT PACKAGERS_BUILD)
-- # Optimize everything for the current architecture
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
-- endif ()
- endif()
- set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
-
diff --git a/media-gfx/krita/krita-3.0.1.ebuild b/media-gfx/krita/krita-3.0.1.ebuild
deleted file mode 100644
index 7e00db7..00000000
--- a/media-gfx/krita/krita-3.0.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="color-management fftw +gsl +jpeg openexr pdf +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:=
- net-misc/curl
- 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] )
- 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}-breeze-collisions.patch"
- "${FILESDIR}/${P}-vc-cxxflags.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_FFTW3=$(usex fftw)
- -DWITH_GSL=$(usex gsl)
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_LibRaw=$(usex raw)
- -DWITH_OCIO=$(usex color-management)
- -DWITH_OpenEXR=$(usex openexr)
- -DWITH_Poppler=$(usex pdf)
- -DWITH_TIFF=$(usex tiff)
- -DWITH_Vc=$(usex vc)
- )
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2017-02-15 16:40 Guilherme Amadio
0 siblings, 0 replies; 28+ messages in thread
From: Guilherme Amadio @ 2017-02-15 16:40 UTC (permalink / raw
To: gentoo-commits
commit: 8c3ad9a5535e0c3d5c90c5bfd31511d33a2fffb1
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 16:38:20 2017 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 16:40:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3ad9a5
media-gfx/krita: Use right ABI when using GCC4.x, bug 596740
Gentoo-Bug: https://bugs.gentoo.org/596740
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch | 14 ++++
media-gfx/krita/krita-3.1.2-r2.ebuild | 95 ++++++++++++++++++++++
2 files changed, 109 insertions(+)
diff --git a/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch b/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch
new file mode 100644
index 0000000000..0f0b9674dd
--- /dev/null
+++ b/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt 2017-02-13 11:12:47.866321035 -0200
++++ b/CMakeLists.txt 2017-02-13 11:18:55.769657370 -0200
+@@ -533,9 +533,9 @@
+ include (VcMacros)
+
+ if(Vc_COMPILER_IS_CLANG)
+- set(ADDITIONAL_VC_FLAGS "-Wabi -ffp-contract=fast -fPIC")
++ add_compile_options(-Wabi -ffp-contract=fast -fPIC)
+ elseif (NOT MSVC)
+- set(ADDITIONAL_VC_FLAGS "-Wabi -fabi-version=0 -ffp-contract=fast -fPIC")
++ add_compile_options(-Wabi -fabi-version=0 -ffp-contract=fast -fPIC)
+ endif()
+
+ #Handle Vc master
diff --git a/media-gfx/krita/krita-3.1.2-r2.ebuild b/media-gfx/krita/krita-3.1.2-r2.ebuild
new file mode 100644
index 0000000000..87e9facb8b
--- /dev/null
+++ b/media-gfx/krita/krita-3.1.2-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}.1.tar.gz"
+
+LICENSE="GPL-2+"
+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=
+ net-misc/curl
+ 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(+)]
+"
+
+S="${WORKDIR}/${P}.1"
+
+PATCHES=( "${FILESDIR}"/${PN}-vc-fix-gcc49-abi.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] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2017-08-19 22:57 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2017-08-19 22:57 UTC (permalink / raw
To: gentoo-commits
commit: 3c9eced271b5ac28a569db8e648e24726f3f433e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 21:37:55 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 22:57:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9eced2
media-gfx/krita: 3.2.0 version bump
Package-Manager: Portage-2.3.8, Repoman-2.3.3
media-gfx/krita/Manifest | 1 +
.../krita/files/krita-3.2.0-tests-optional.patch | 282 +++++++++++++++++++++
media-gfx/krita/files/krita-3.2.0-unused-dep.patch | 69 +++++
media-gfx/krita/krita-3.2.0.ebuild | 94 +++++++
4 files changed, 446 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index d7276d4cc54..776b275f1dd 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1 +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
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
new file mode 100644
index 00000000000..0f143ff1cc5
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.2.0-tests-optional.patch
@@ -0,0 +1,282 @@
+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/files/krita-3.2.0-unused-dep.patch b/media-gfx/krita/files/krita-3.2.0-unused-dep.patch
new file mode 100644
index 00000000000..34031b51bac
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.2.0-unused-dep.patch
@@ -0,0 +1,69 @@
+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
new file mode 100644
index 00000000000..fb7757c8404
--- /dev/null
+++ b/media-gfx/krita/krita-3.2.0.ebuild
@@ -0,0 +1,94 @@
+# 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] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2017-10-15 20:47 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2017-10-15 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 3621c5441adf6c1bf587c759d3d621b289f4901b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 15 20:29:39 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 20:46:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3621c544
media-gfx/krita: Fix build with >=media-gfx/exiv2-0.26_p20171013
Package-Manager: Portage-2.3.11, Repoman-2.3.3
media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch | 11 +++++++++++
media-gfx/krita/krita-3.2.1.ebuild | 7 +++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch b/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
new file mode 100644
index 00000000000..22c3858f4c6
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
@@ -0,0 +1,11 @@
+--- a/libs/ui/kisexiv2/kis_xmp_io.cpp 2017-10-15 22:09:56.908903726 +0200
++++ b/libs/ui/kisexiv2/kis_xmp_io.cpp 2017-10-15 22:10:23.956192118 +0200
+@@ -17,7 +17,7 @@
+ #include "kis_xmp_io.h"
+
+ #include <string>
+-#include <exiv2/xmp.hpp>
++#include <exiv2/xmp_exiv2.hpp>
+
+ #include "kis_exiv2.h"
+
diff --git a/media-gfx/krita/krita-3.2.1.ebuild b/media-gfx/krita/krita-3.2.1.ebuild
index 7c6ab717aba..12b520bc5c5 100644
--- a/media-gfx/krita/krita-3.2.1.ebuild
+++ b/media-gfx/krita/krita-3.2.1.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
$(add_qt_dep qtx11extras)
$(add_qt_dep qtxml)
dev-libs/boost:=
- media-gfx/exiv2:=
+ >=media-gfx/exiv2-0.26_p20170713:=
media-libs/lcms
media-libs/libpng:0=
sys-libs/zlib
@@ -72,7 +72,10 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra-l10n:4[calligra_features_krita(+)]
"
-PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch
+ "${FILESDIR}"/${P}-exiv2-0.26.1.patch
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2017-10-18 0:35 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2017-10-18 0:35 UTC (permalink / raw
To: gentoo-commits
commit: 7cdde17ffb6a2cc1a89fa37d19ba124f7a1cbc18
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 00:32:58 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 00:32:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cdde17f
media-gfx/krita: Drop workaround for media-gfx/exiv2-0.27
This reverts commit 3621c5441adf6c1bf587c759d3d621b289f4901b.
media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch | 11 -----------
media-gfx/krita/krita-3.2.1.ebuild | 7 ++-----
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch b/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
deleted file mode 100644
index 22c3858f4c6..00000000000
--- a/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libs/ui/kisexiv2/kis_xmp_io.cpp 2017-10-15 22:09:56.908903726 +0200
-+++ b/libs/ui/kisexiv2/kis_xmp_io.cpp 2017-10-15 22:10:23.956192118 +0200
-@@ -17,7 +17,7 @@
- #include "kis_xmp_io.h"
-
- #include <string>
--#include <exiv2/xmp.hpp>
-+#include <exiv2/xmp_exiv2.hpp>
-
- #include "kis_exiv2.h"
-
diff --git a/media-gfx/krita/krita-3.2.1.ebuild b/media-gfx/krita/krita-3.2.1.ebuild
index 12b520bc5c5..7c6ab717aba 100644
--- a/media-gfx/krita/krita-3.2.1.ebuild
+++ b/media-gfx/krita/krita-3.2.1.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
$(add_qt_dep qtx11extras)
$(add_qt_dep qtxml)
dev-libs/boost:=
- >=media-gfx/exiv2-0.26_p20170713:=
+ media-gfx/exiv2:=
media-libs/lcms
media-libs/libpng:0=
sys-libs/zlib
@@ -72,10 +72,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra-l10n:4[calligra_features_krita(+)]
"
-PATCHES=(
- "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch
- "${FILESDIR}"/${P}-exiv2-0.26.1.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2018-10-15 16:46 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2018-10-15 16:46 UTC (permalink / raw
To: gentoo-commits
commit: 9b0400d507d3a77c3da411981f827c2e421c645e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 16:45:41 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 16:46:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b0400d5
media-gfx/krita: QA: Fix .desktop file to pass validation
Closes: https://bugs.gentoo.org/668702
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
.../krita/files/krita-4.1.5-desktopfile.patch | 39 ++++++++++++++++++++++
media-gfx/krita/krita-4.1.5.ebuild | 5 ++-
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-4.1.5-desktopfile.patch b/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
new file mode 100644
index 00000000000..8721ab8a8a9
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
@@ -0,0 +1,39 @@
+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
index 1e3252cbd58..24e0eeb67a3 100644
--- a/media-gfx/krita/krita-4.1.5.ebuild
+++ b/media-gfx/krita/krita-4.1.5.ebuild
@@ -84,7 +84,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}-desktopfile.patch"
+)
pkg_setup() {
python-single-r1_pkg_setup
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2019-01-05 21:08 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2019-01-05 21:08 UTC (permalink / raw
To: gentoo-commits
commit: d157b06e5dbc8542c9f59b3575beb6f1ae6268a1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 5 20:07:16 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 5 21:08:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d157b06e
media-gfx/krita: Drop 4.1.7 (r0)
Package-Manager: Portage-2.3.54, 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 | 122 -------
2 files changed, 476 deletions(-)
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
deleted file mode 100644
index 41b290852eb..00000000000
--- a/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-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
deleted file mode 100644
index efe9923bc33..00000000000
--- a/media-gfx/krita/krita-4.1.7.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.11.3"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.101.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}"
-
-# FIXME: Drop subslot operator when QTBUG is fixed:
-# https://bugreports.qt.io/browse/QTBUG-72488
-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')
- $(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}-exiv2-0.27.patch"
-)
-
-S="${S}.101"
-
-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] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2019-04-03 18:59 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2019-04-03 18:59 UTC (permalink / raw
To: gentoo-commits
commit: 68d2cb566ccf6c5b4cec5d6f021484b2216ad0a8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 3 18:54:58 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 3 18:58:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d2cb56
media-gfx/krita: Add upstream tablet support and crash fix
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../krita-4.1.8-fix-pre-5.12-tablet-support.patch | 49 ++++++++
...-qt-5.12-fix-unsupported-composition-mode.patch | 38 +++++++
media-gfx/krita/krita-4.1.8-r1.ebuild | 123 +++++++++++++++++++++
3 files changed, 210 insertions(+)
diff --git a/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch b/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
new file mode 100644
index 00000000000..2928247e57a
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
@@ -0,0 +1,49 @@
+From 0218025b1725aa810f108d08802b590ce62f1044 Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov <dimula73@gmail.com>
+Date: Mon, 25 Mar 2019 21:16:41 +0300
+Subject: Add a workaround for Qt 5.9...5.11.X to fix tablet support
+
+Basically, the patch mimics this Qt's patch that has been
+added in Qt 5.12.0 only:
+https://codereview.qt-project.org/#/c/239918/
+
+BUG:399696
+---
+ libs/ui/input/kis_input_manager_p.cpp | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/libs/ui/input/kis_input_manager_p.cpp b/libs/ui/input/kis_input_manager_p.cpp
+index 4f5a58f..0a26655 100644
+--- a/libs/ui/input/kis_input_manager_p.cpp
++++ b/libs/ui/input/kis_input_manager_p.cpp
+@@ -333,6 +333,28 @@ KisInputManager::Private::ProximityNotifier::ProximityNotifier(KisInputManager::
+
+ bool KisInputManager::Private::ProximityNotifier::eventFilter(QObject* object, QEvent* event )
+ {
++ /**
++ * All Qt builds in range 5.7.0...5.11.X on X11 had a problem that made all
++ * the tablet events be accepted by default. It meant that no mouse
++ * events were synthesized, and, therefore, no Enter/Leave were generated.
++ *
++ * The fix for this bug has been added only in Qt 5.12.0:
++ * https://codereview.qt-project.org/#/c/239918/
++ *
++ * To avoid this problem we should explicitly ignore all the tablet events.
++ */
++#if defined Q_OS_LINUX && \
++ QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) && \
++ QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
++
++ if (event->type() == QEvent::TabletMove ||
++ event->type() == QEvent::TabletPress ||
++ event->type() == QEvent::TabletRelease) {
++
++ event->ignore();
++ }
++#endif
++
+ switch (event->type()) {
+ case QEvent::TabletEnterProximity:
+ d->debugEvent<QEvent, false>(event);
+--
+cgit v1.1
diff --git a/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch b/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
new file mode 100644
index 00000000000..dc65b1c49d2
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
@@ -0,0 +1,38 @@
+From 9347112a77b3b628af8c0b8d4d7cbc0929eede9e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolthera=20van=20H=C3=B6vell=20tot=20Westerflier?=
+ <griffinvalley@gmail.com>
+Date: Sat, 30 Mar 2019 21:47:37 +0100
+Subject: BUG:406032 Fix crash caused by unsupported composition mode in QT
+ 5.12
+
+Qt 5.12 doesn't support QPainter::RasterOp_SourceXorDestination anymore.
+
+Trying to paint with a painter that uses this while opengl is enabled
+will lead to a crash. The only relevant place this enum value is still used
+is in kis_tool.cc, where it is only painted on the regular non-accelerated canvas.
+
+Anyhow, told the smartpatch to use this function instead of doing something itself.
+
+The whole thing is a little bizar.
+---
+ plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
+index 656ba38..32577a3 100644
+--- a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
++++ b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
+@@ -245,9 +245,8 @@ void KisToolSmartPatch::paint(QPainter &painter, const KoViewConverter &converte
+ Q_UNUSED(converter);
+
+ painter.save();
+- painter.setCompositionMode(QPainter::RasterOp_SourceXorDestination);
+- painter.setPen(QColor(128, 255, 128));
+- painter.drawPath(pixelToView(m_d->brushOutline));
++ QPainterPath path = pixelToView(m_d->brushOutline);
++ paintToolOutline(&painter, path);
+ painter.restore();
+
+ painter.save();
+--
+cgit v1.1
diff --git a/media-gfx/krita/krita-4.1.8-r1.ebuild b/media-gfx/krita/krita-4.1.8-r1.ebuild
new file mode 100644
index 00000000000..46926f21e6a
--- /dev/null
+++ b/media-gfx/krita/krita-4.1.8-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.11.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://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}"
+
+# FIXME: drop qtgui subslot operator when QTBUG is fixed or QT_MINIMAL >= 5.12.0:
+# https://bugreports.qt.io/browse/QTBUG-72488
+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-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.0.3-tests-optional.patch"
+ "${FILESDIR}/${P}-qt-5.12-fix-unsupported-composition-mode.patch"
+ "${FILESDIR}/${P}-fix-pre-5.12-tablet-support.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] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2019-06-01 14:26 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2019-06-01 14:26 UTC (permalink / raw
To: gentoo-commits
commit: fec52e6f9767385205ce4037fbb88597f5ad73f7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 29 15:41:31 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 1 14:26:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec52e6f
media-gfx/krita: 4.2.0 version bump
dev-qt/qtgui slot operator is necessary for QPA usage.
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 +
.../krita/files/krita-4.2.0-tests-optional.patch | 324 +++++++++++++++++++++
media-gfx/krita/krita-4.2.0.ebuild | 118 ++++++++
3 files changed, 443 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 471a7accb4d..00caf204e91 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1 +1,2 @@
DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
+DIST krita-4.2.0.tar.gz 240015177 BLAKE2B 09992b50dfa4e244c809dd576c3b7c0d1cb09b19fde0985c3d72b57543e5a06aa863b9011d655432a089fb6869e2e7fdb23939877b0c4ee6aaf44a1c88e7084c SHA512 a6f373839e47c4e97f5680d266d1ea9f438db6636d3f8749f7fbf6d93b5329e1d46f7233af901dd224722c08100c4fc3b162a163c721299ebfa2d4939032ae44
diff --git a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
new file mode 100644
index 00000000000..b605e922aba
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
@@ -0,0 +1,324 @@
+--- a/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.442258240 +0200
++++ b/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.452257980 +0200
+@@ -1,6 +1,8 @@
+ project( lcmsengine )
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${LCMS2_INCLUDE_DIR}
+--- a/plugins/extensions/qmic/CMakeLists.txt 2019-06-01 15:10:43.469257540 +0200
++++ b/plugins/extensions/qmic/CMakeLists.txt 2019-06-01 15:10:43.477257332 +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 2019-06-01 15:10:43.488257047 +0200
++++ b/plugins/filters/CMakeLists.txt 2019-06-01 15:10:43.497256813 +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-01 15:10:43.508256528 +0200
++++ b/plugins/filters/unsharp/CMakeLists.txt 2019-06-01 15:10:43.516256320 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ set(kritaunsharpfilter_SOURCES
+ unsharp.cpp
+--- a/plugins/dockers/lut/CMakeLists.txt 2019-06-01 15:10:43.527256035 +0200
++++ b/plugins/dockers/lut/CMakeLists.txt 2019-06-01 15:10:43.535255828 +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-01 15:10:43.546255542 +0200
++++ b/plugins/dockers/animation/CMakeLists.txt 2019-06-01 15:10:43.555255309 +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/tools/tool_transform2/CMakeLists.txt 2019-06-01 15:10:43.566255024 +0200
++++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-01 15:10:43.574254816 +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/tools/basictools/CMakeLists.txt 2019-06-01 15:10:43.584254557 +0200
++++ b/plugins/tools/basictools/CMakeLists.txt 2019-06-01 15:10:43.592254349 +0200
+@@ -1,5 +1,7 @@
+ if (NOT APPLE)
+- add_subdirectory(tests)
++ if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif ()
+
+ set(kritadefaulttools_SOURCES
+--- a/plugins/impex/tiff/CMakeLists.txt 2019-06-01 15:10:43.602254090 +0200
++++ b/plugins/impex/tiff/CMakeLists.txt 2019-06-01 15:10:43.609253908 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(libkritatiffconverter_LIB_SRCS
+ kis_tiff_converter.cc
+--- a/plugins/impex/libkra/CMakeLists.txt 2019-06-01 15:10:43.620253623 +0200
++++ b/plugins/impex/libkra/CMakeLists.txt 2019-06-01 15:10:43.627253441 +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-01 15:10:43.638253156 +0200
++++ b/plugins/impex/jpeg/CMakeLists.txt 2019-06-01 15:10:43.646252949 +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 2019-06-01 15:10:43.662252534 +0200
++++ b/plugins/impex/psd/CMakeLists.txt 2019-06-01 15:10:43.671252300 +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/xcf/CMakeLists.txt 2019-06-01 15:10:43.685251937 +0200
++++ b/plugins/impex/xcf/CMakeLists.txt 2019-06-01 15:10:43.694251704 +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/heightmap/CMakeLists.txt 2019-06-01 15:10:43.705251418 +0200
++++ b/plugins/impex/heightmap/CMakeLists.txt 2019-06-01 15:10:43.714251185 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+
+--- a/plugins/impex/csv/CMakeLists.txt 2019-06-01 15:10:43.725250900 +0200
++++ b/plugins/impex/csv/CMakeLists.txt 2019-06-01 15:10:43.734250666 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ # import
+
+--- a/plugins/impex/exr/CMakeLists.txt 2019-06-01 15:10:43.745250381 +0200
++++ b/plugins/impex/exr/CMakeLists.txt 2019-06-01 15:10:43.754250148 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
+
+--- a/plugins/impex/ppm/CMakeLists.txt 2019-06-01 15:10:43.765249862 +0200
++++ b/plugins/impex/ppm/CMakeLists.txt 2019-06-01 15:10:43.773249655 +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-01 15:10:43.784249370 +0200
++++ b/plugins/impex/svg/CMakeLists.txt 2019-06-01 15:10:43.792249162 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritasvgimport_SOURCES
+ kis_svg_import.cc
+--- a/plugins/impex/png/CMakeLists.txt 2019-06-01 15:10:43.803248877 +0200
++++ b/plugins/impex/png/CMakeLists.txt 2019-06-01 15:10:43.811248669 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritapngimport_SOURCES
+ kis_png_import.cc
+--- a/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-01 15:10:43.823248358 +0200
++++ b/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-01 15:10:43.831248150 +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 2019-06-01 15:10:43.842247865 +0200
++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-01 15:10:43.850247658 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+
+ include_directories(brush
+ duplicate
+--- a/libs/metadata/CMakeLists.txt 2019-06-01 15:10:43.862247346 +0200
++++ b/libs/metadata/CMakeLists.txt 2019-06-01 15:10:43.870247139 +0200
+@@ -29,4 +29,6 @@
+
+ install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS})
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/global/CMakeLists.txt 2019-06-01 15:10:43.881246854 +0200
++++ b/libs/global/CMakeLists.txt 2019-06-01 15:10:43.890246620 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ include(CheckFunctionExists)
+ check_function_exists(backtrace HAVE_BACKTRACE)
+--- a/libs/ui/CMakeLists.txt 2019-06-01 15:10:43.901246335 +0200
++++ b/libs/ui/CMakeLists.txt 2019-06-01 15:10:43.911246076 +0200
+@@ -7,7 +7,9 @@
+ ${OCIO_INCLUDE_DIR}
+ )
+
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ if (APPLE)
+ find_library(FOUNDATION_LIBRARY Foundation)
+--- a/libs/flake/CMakeLists.txt 2019-06-01 15:10:43.922245790 +0200
++++ b/libs/flake/CMakeLists.txt 2019-06-01 15:10:43.931245557 +0200
+@@ -9,7 +9,9 @@
+ )
+
+ add_subdirectory(styles)
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritaflake_SRCS
+ KoGradientHelper.cpp
+--- a/libs/brush/CMakeLists.txt 2019-06-01 15:10:43.943245246 +0200
++++ b/libs/brush/CMakeLists.txt 2019-06-01 15:10:43.952245012 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ include_directories(SYSTEM
+ ${EIGEN3_INCLUDE_DIR}
+--- a/libs/widgetutils/CMakeLists.txt 2019-06-01 15:10:43.963244727 +0200
++++ b/libs/widgetutils/CMakeLists.txt 2019-06-01 15:10:43.972244494 +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/store/CMakeLists.txt 2019-06-01 15:10:43.984244182 +0200
++++ b/libs/store/CMakeLists.txt 2019-06-01 15:10:43.992243975 +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/pigment/CMakeLists.txt 2019-06-01 15:10:44.002243716 +0200
++++ b/libs/pigment/CMakeLists.txt 2019-06-01 15:10:44.010243508 +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/libkis/CMakeLists.txt 2019-06-01 15:10:44.021243223 +0200
++++ b/libs/libkis/CMakeLists.txt 2019-06-01 15:10:44.028243041 +0200
+@@ -47,4 +47,6 @@
+ install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/image/CMakeLists.txt 2019-06-01 15:10:44.039242756 +0200
++++ b/libs/image/CMakeLists.txt 2019-06-01 15:10:44.047242548 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ add_subdirectory( tiles3 )
+
+--- a/libs/image/tiles3/CMakeLists.txt 2019-06-01 15:10:44.057242289 +0200
++++ b/libs/image/tiles3/CMakeLists.txt 2019-06-01 15:10:44.065242082 +0200
+@@ -1 +1,3 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/odf/CMakeLists.txt 2019-06-01 15:10:44.076241796 +0200
++++ b/libs/odf/CMakeLists.txt 2019-06-01 15:10:44.084241589 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ set(kritaodf_LIB_SRCS
+ KoOdf.cpp
+--- a/libs/widgets/CMakeLists.txt 2019-06-01 15:10:44.094241329 +0200
++++ b/libs/widgets/CMakeLists.txt 2019-06-01 15:10:44.102241122 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
diff --git a/media-gfx/krita/krita-4.2.0.ebuild b/media-gfx/krita/krita-4.2.0.ebuild
new file mode 100644
index 00000000000..3153c3eba36
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.12.3"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/"
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+ dev-cpp/eigen:3
+ dev-lang/perl
+ sys-devel/gettext
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui '-gles2' '' '5=')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ dev-libs/boost:=
+ dev-libs/quazip
+ dev-python/PyQt5[${PYTHON_USEDEP}]
+ dev-python/sip[${PYTHON_USEDEP}]
+ media-gfx/exiv2:=
+ media-libs/lcms
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXi
+ color-management? ( media-libs/opencolorio )
+ fftw? ( sci-libs/fftw:3.0= )
+ gif? ( media-libs/giflib )
+ gsl? ( sci-libs/gsl:= )
+ jpeg? ( virtual/jpeg:0 )
+ heif? ( media-libs/libheif:= )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr
+ )
+ pdf? ( app-text/poppler[qt5] )
+ qtmedia? ( $(add_qt_dep qtmultimedia) )
+ raw? ( media-libs/libraw:= )
+ tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+ vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/calligra:4[calligra_features_krita]
+ !app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+
+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] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2019-06-27 17:21 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2019-06-27 17:21 UTC (permalink / raw
To: gentoo-commits
commit: 01d6d2e44e75a77477ec077e76abfa078c1886c8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 16:53:35 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 17:18:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01d6d2e4
media-gfx/krita: Drop 4.2.1
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 -
.../krita/files/krita-4.2.0-tests-optional.patch | 324 ---------------------
media-gfx/krita/krita-4.2.1.ebuild | 118 --------
3 files changed, 443 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2e2c22bf373..e5583f50a1c 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.1.tar.gz 245929278 BLAKE2B 06544424bae7965be2fbf7a0e9d4fc260de80f16e6f8beba600432139e20f4c9bde24244d5b8ce5573fbc354ee0461c6930255f47798618998b895828a682390 SHA512 879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1
DIST krita-4.2.2.tar.gz 246075662 BLAKE2B 0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e SHA512 7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096
diff --git a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
deleted file mode 100644
index b605e922aba..00000000000
--- a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
+++ /dev/null
@@ -1,324 +0,0 @@
---- a/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.442258240 +0200
-+++ b/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.452257980 +0200
-@@ -1,6 +1,8 @@
- project( lcmsengine )
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM
- ${LCMS2_INCLUDE_DIR}
---- a/plugins/extensions/qmic/CMakeLists.txt 2019-06-01 15:10:43.469257540 +0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt 2019-06-01 15:10:43.477257332 +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 2019-06-01 15:10:43.488257047 +0200
-+++ b/plugins/filters/CMakeLists.txt 2019-06-01 15:10:43.497256813 +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-01 15:10:43.508256528 +0200
-+++ b/plugins/filters/unsharp/CMakeLists.txt 2019-06-01 15:10:43.516256320 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- set(kritaunsharpfilter_SOURCES
- unsharp.cpp
---- a/plugins/dockers/lut/CMakeLists.txt 2019-06-01 15:10:43.527256035 +0200
-+++ b/plugins/dockers/lut/CMakeLists.txt 2019-06-01 15:10:43.535255828 +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-01 15:10:43.546255542 +0200
-+++ b/plugins/dockers/animation/CMakeLists.txt 2019-06-01 15:10:43.555255309 +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/tools/tool_transform2/CMakeLists.txt 2019-06-01 15:10:43.566255024 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-01 15:10:43.574254816 +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/tools/basictools/CMakeLists.txt 2019-06-01 15:10:43.584254557 +0200
-+++ b/plugins/tools/basictools/CMakeLists.txt 2019-06-01 15:10:43.592254349 +0200
-@@ -1,5 +1,7 @@
- if (NOT APPLE)
-- add_subdirectory(tests)
-+ if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif ()
-
- set(kritadefaulttools_SOURCES
---- a/plugins/impex/tiff/CMakeLists.txt 2019-06-01 15:10:43.602254090 +0200
-+++ b/plugins/impex/tiff/CMakeLists.txt 2019-06-01 15:10:43.609253908 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(libkritatiffconverter_LIB_SRCS
- kis_tiff_converter.cc
---- a/plugins/impex/libkra/CMakeLists.txt 2019-06-01 15:10:43.620253623 +0200
-+++ b/plugins/impex/libkra/CMakeLists.txt 2019-06-01 15:10:43.627253441 +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-01 15:10:43.638253156 +0200
-+++ b/plugins/impex/jpeg/CMakeLists.txt 2019-06-01 15:10:43.646252949 +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 2019-06-01 15:10:43.662252534 +0200
-+++ b/plugins/impex/psd/CMakeLists.txt 2019-06-01 15:10:43.671252300 +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/xcf/CMakeLists.txt 2019-06-01 15:10:43.685251937 +0200
-+++ b/plugins/impex/xcf/CMakeLists.txt 2019-06-01 15:10:43.694251704 +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/heightmap/CMakeLists.txt 2019-06-01 15:10:43.705251418 +0200
-+++ b/plugins/impex/heightmap/CMakeLists.txt 2019-06-01 15:10:43.714251185 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
-
---- a/plugins/impex/csv/CMakeLists.txt 2019-06-01 15:10:43.725250900 +0200
-+++ b/plugins/impex/csv/CMakeLists.txt 2019-06-01 15:10:43.734250666 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- # import
-
---- a/plugins/impex/exr/CMakeLists.txt 2019-06-01 15:10:43.745250381 +0200
-+++ b/plugins/impex/exr/CMakeLists.txt 2019-06-01 15:10:43.754250148 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
-
---- a/plugins/impex/ppm/CMakeLists.txt 2019-06-01 15:10:43.765249862 +0200
-+++ b/plugins/impex/ppm/CMakeLists.txt 2019-06-01 15:10:43.773249655 +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-01 15:10:43.784249370 +0200
-+++ b/plugins/impex/svg/CMakeLists.txt 2019-06-01 15:10:43.792249162 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritasvgimport_SOURCES
- kis_svg_import.cc
---- a/plugins/impex/png/CMakeLists.txt 2019-06-01 15:10:43.803248877 +0200
-+++ b/plugins/impex/png/CMakeLists.txt 2019-06-01 15:10:43.811248669 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritapngimport_SOURCES
- kis_png_import.cc
---- a/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-01 15:10:43.823248358 +0200
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-01 15:10:43.831248150 +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 2019-06-01 15:10:43.842247865 +0200
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-01 15:10:43.850247658 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(brush/tests)
-+endif()
-
- include_directories(brush
- duplicate
---- a/libs/metadata/CMakeLists.txt 2019-06-01 15:10:43.862247346 +0200
-+++ b/libs/metadata/CMakeLists.txt 2019-06-01 15:10:43.870247139 +0200
-@@ -29,4 +29,6 @@
-
- install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/global/CMakeLists.txt 2019-06-01 15:10:43.881246854 +0200
-+++ b/libs/global/CMakeLists.txt 2019-06-01 15:10:43.890246620 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- include(CheckFunctionExists)
- check_function_exists(backtrace HAVE_BACKTRACE)
---- a/libs/ui/CMakeLists.txt 2019-06-01 15:10:43.901246335 +0200
-+++ b/libs/ui/CMakeLists.txt 2019-06-01 15:10:43.911246076 +0200
-@@ -7,7 +7,9 @@
- ${OCIO_INCLUDE_DIR}
- )
-
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- if (APPLE)
- find_library(FOUNDATION_LIBRARY Foundation)
---- a/libs/flake/CMakeLists.txt 2019-06-01 15:10:43.922245790 +0200
-+++ b/libs/flake/CMakeLists.txt 2019-06-01 15:10:43.931245557 +0200
-@@ -9,7 +9,9 @@
- )
-
- add_subdirectory(styles)
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritaflake_SRCS
- KoGradientHelper.cpp
---- a/libs/brush/CMakeLists.txt 2019-06-01 15:10:43.943245246 +0200
-+++ b/libs/brush/CMakeLists.txt 2019-06-01 15:10:43.952245012 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- include_directories(SYSTEM
- ${EIGEN3_INCLUDE_DIR}
---- a/libs/widgetutils/CMakeLists.txt 2019-06-01 15:10:43.963244727 +0200
-+++ b/libs/widgetutils/CMakeLists.txt 2019-06-01 15:10:43.972244494 +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/store/CMakeLists.txt 2019-06-01 15:10:43.984244182 +0200
-+++ b/libs/store/CMakeLists.txt 2019-06-01 15:10:43.992243975 +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/pigment/CMakeLists.txt 2019-06-01 15:10:44.002243716 +0200
-+++ b/libs/pigment/CMakeLists.txt 2019-06-01 15:10:44.010243508 +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/libkis/CMakeLists.txt 2019-06-01 15:10:44.021243223 +0200
-+++ b/libs/libkis/CMakeLists.txt 2019-06-01 15:10:44.028243041 +0200
-@@ -47,4 +47,6 @@
- install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/image/CMakeLists.txt 2019-06-01 15:10:44.039242756 +0200
-+++ b/libs/image/CMakeLists.txt 2019-06-01 15:10:44.047242548 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- add_subdirectory( tiles3 )
-
---- a/libs/image/tiles3/CMakeLists.txt 2019-06-01 15:10:44.057242289 +0200
-+++ b/libs/image/tiles3/CMakeLists.txt 2019-06-01 15:10:44.065242082 +0200
-@@ -1 +1,3 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/odf/CMakeLists.txt 2019-06-01 15:10:44.076241796 +0200
-+++ b/libs/odf/CMakeLists.txt 2019-06-01 15:10:44.084241589 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- set(kritaodf_LIB_SRCS
- KoOdf.cpp
---- a/libs/widgets/CMakeLists.txt 2019-06-01 15:10:44.094241329 +0200
-+++ b/libs/widgets/CMakeLists.txt 2019-06-01 15:10:44.102241122 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
diff --git a/media-gfx/krita/krita-4.2.1.ebuild b/media-gfx/krita/krita-4.2.1.ebuild
deleted file mode 100644
index f9b39e3a7af..00000000000
--- a/media-gfx/krita/krita-4.2.1.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.0-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] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2019-06-27 17:21 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2019-06-27 17:21 UTC (permalink / raw
To: gentoo-commits
commit: a9b8decf11a9e648fc3e5cc175018b22a834f8d9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 16:08:05 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 17:18:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b8decf
media-gfx/krita: 4.2.2 version bump
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 +
media-gfx/krita/files/krita-4.2.2-fixuifiles.patch | 25 ++
.../krita/files/krita-4.2.2-tests-optional.patch | 405 +++++++++++++++++++++
media-gfx/krita/krita-4.2.2.ebuild | 121 ++++++
4 files changed, 552 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 41abb11141a..2e2c22bf373 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
DIST krita-4.2.1.tar.gz 245929278 BLAKE2B 06544424bae7965be2fbf7a0e9d4fc260de80f16e6f8beba600432139e20f4c9bde24244d5b8ce5573fbc354ee0461c6930255f47798618998b895828a682390 SHA512 879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1
+DIST krita-4.2.2.tar.gz 246075662 BLAKE2B 0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e SHA512 7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096
diff --git a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
new file mode 100644
index 00000000000..1703386a3c7
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
@@ -0,0 +1,25 @@
+From e46ad1f917705d84dc5562c2f261a06eb70a57b9 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Tue, 25 Jun 2019 06:57:40 +0200
+Subject: fixuifiles
+
+---
+ libs/widgetutils/tests/dialogsavertestwidget.ui | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/libs/widgetutils/tests/dialogsavertestwidget.ui b/libs/widgetutils/tests/dialogsavertestwidget.ui
+index 66e70b3..ba0f54f 100644
+--- a/libs/widgetutils/tests/dialogsavertestwidget.ui
++++ b/libs/widgetutils/tests/dialogsavertestwidget.ui
+@@ -10,9 +10,6 @@
+ <height>300</height>
+ </rect>
+ </property>
+- <property name="windowTitle">
+- <string>Form</string>
+- </property>
+ <widget class="QPushButton" name="pushButton">
+ <property name="geometry">
+ <rect>
+--
+cgit v1.1
diff --git a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
new file mode 100644
index 00000000000..2df715be04f
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
@@ -0,0 +1,405 @@
+--- a/plugins/filters/CMakeLists.txt 2019-06-27 18:48:55.049823682 +0200
++++ b/plugins/filters/CMakeLists.txt 2019-06-27 18:48:55.056823729 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+--- a/plugins/filters/unsharp/CMakeLists.txt 2019-06-27 18:48:55.063823776 +0200
++++ b/plugins/filters/unsharp/CMakeLists.txt 2019-06-27 18:48:55.069823817 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ set(kritaunsharpfilter_SOURCES
+ unsharp.cpp
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-27 18:48:55.077823871 +0200
++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-27 18:48:55.084823918 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+
+ include_directories(brush
+ duplicate
+--- a/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-27 18:48:55.092823972 +0200
++++ b/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-27 18:48:55.098824013 +0200
+@@ -104,4 +104,6 @@
+ install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/dockers/lut/CMakeLists.txt 2019-06-27 18:48:55.105824060 +0200
++++ b/plugins/dockers/lut/CMakeLists.txt 2019-06-27 18:48:55.112824107 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${OCIO_INCLUDE_DIR}
+--- a/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.120824161 +0200
++++ b/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.124824188 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+- add_subdirectory(tests)
++ if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+
+ set(KRITA_ANIMATIONDOCKER_SOURCES
+--- a/plugins/extensions/qmic/CMakeLists.txt 2019-06-27 18:48:55.132824242 +0200
++++ b/plugins/extensions/qmic/CMakeLists.txt 2019-06-27 18:48:55.136824270 +0200
+@@ -20,4 +20,6 @@
+ target_link_libraries(kritaqmic kritaui)
+ install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/tools/basictools/CMakeLists.txt 2019-06-27 18:48:55.141824303 +0200
++++ b/plugins/tools/basictools/CMakeLists.txt 2019-06-27 18:48:55.146824337 +0200
+@@ -1,5 +1,7 @@
+ if (NOT APPLE)
+- add_subdirectory(tests)
++ if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif ()
+
+ set(kritadefaulttools_SOURCES
+--- a/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 18:48:55.151824371 +0200
++++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 18:48:55.155824398 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+- add_subdirectory(tests)
++ if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+
+ set(kritatooltransform_SOURCES
+--- a/plugins/impex/ppm/CMakeLists.txt 2019-06-27 18:48:55.163824452 +0200
++++ b/plugins/impex/ppm/CMakeLists.txt 2019-06-27 18:48:55.169824492 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+
+--- a/plugins/impex/svg/CMakeLists.txt 2019-06-27 18:48:55.175824533 +0200
++++ b/plugins/impex/svg/CMakeLists.txt 2019-06-27 18:48:55.180824567 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritasvgimport_SOURCES
+ kis_svg_import.cc
+--- a/plugins/impex/brush/CMakeLists.txt 2019-06-27 18:48:55.186824607 +0200
++++ b/plugins/impex/brush/CMakeLists.txt 2019-06-27 18:48:55.190824634 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritabrushexport_PART_SRCS
+ kis_brush_export.cpp
+--- a/plugins/impex/psd/CMakeLists.txt 2019-06-27 18:48:55.195824668 +0200
++++ b/plugins/impex/psd/CMakeLists.txt 2019-06-27 18:48:55.199824695 +0200
+@@ -1,5 +1,7 @@
+ if (NOT MSVC AND NOT APPLE)
+- add_subdirectory(tests)
++ if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+
+ configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
+--- a/plugins/impex/tga/CMakeLists.txt 2019-06-27 18:48:55.206824742 +0200
++++ b/plugins/impex/tga/CMakeLists.txt 2019-06-27 18:48:55.210824769 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritatgaexport_SOURCES
+ kis_tga_export.cpp
+--- a/plugins/impex/libkra/CMakeLists.txt 2019-06-27 18:48:55.216824810 +0200
++++ b/plugins/impex/libkra/CMakeLists.txt 2019-06-27 18:48:55.221824844 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritalibkra_LIB_SRCS
+ kis_colorize_dom_utils.cpp
+--- a/plugins/impex/jpeg/CMakeLists.txt 2019-06-27 18:48:55.228824891 +0200
++++ b/plugins/impex/jpeg/CMakeLists.txt 2019-06-27 18:48:55.233824924 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
+
+--- a/plugins/impex/gif/CMakeLists.txt 2019-06-27 18:48:55.239824965 +0200
++++ b/plugins/impex/gif/CMakeLists.txt 2019-06-27 18:48:55.243824992 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritagifexport_SOURCES
+ kis_gif_export.cpp
+--- a/plugins/impex/exr/CMakeLists.txt 2019-06-27 18:48:55.248825026 +0200
++++ b/plugins/impex/exr/CMakeLists.txt 2019-06-27 18:48:55.253825060 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
+
+--- a/plugins/impex/xcf/CMakeLists.txt 2019-06-27 18:48:55.260825107 +0200
++++ b/plugins/impex/xcf/CMakeLists.txt 2019-06-27 18:48:55.268825160 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
+
+--- a/plugins/impex/tiff/CMakeLists.txt 2019-06-27 18:48:55.277825221 +0200
++++ b/plugins/impex/tiff/CMakeLists.txt 2019-06-27 18:48:55.283825262 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(libkritatiffconverter_LIB_SRCS
+ kis_tiff_converter.cc
+--- a/plugins/impex/ora/CMakeLists.txt 2019-06-27 18:48:55.290825310 +0200
++++ b/plugins/impex/ora/CMakeLists.txt 2019-06-27 18:48:55.295825343 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(libkritaconverter_LIB_SRCS
+ ora_converter.cpp
+--- a/plugins/impex/heif/CMakeLists.txt 2019-06-27 18:48:55.302825391 +0200
++++ b/plugins/impex/heif/CMakeLists.txt 2019-06-27 18:48:55.309825438 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}")
+--- a/plugins/impex/pdf/CMakeLists.txt 2019-06-27 18:48:55.317825492 +0200
++++ b/plugins/impex/pdf/CMakeLists.txt 2019-06-27 18:48:55.322825526 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp )
+
+--- a/plugins/impex/csv/CMakeLists.txt 2019-06-27 18:48:55.332825593 +0200
++++ b/plugins/impex/csv/CMakeLists.txt 2019-06-27 18:48:55.339825640 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ # import
+
+--- a/plugins/impex/heightmap/CMakeLists.txt 2019-06-27 18:48:55.347825694 +0200
++++ b/plugins/impex/heightmap/CMakeLists.txt 2019-06-27 18:48:55.352825728 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+
+--- a/plugins/impex/raw/CMakeLists.txt 2019-06-27 18:48:55.359825775 +0200
++++ b/plugins/impex/raw/CMakeLists.txt 2019-06-27 18:48:55.365825816 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ if(OPENEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+--- a/plugins/impex/qimageio/CMakeLists.txt 2019-06-27 18:48:55.371825857 +0200
++++ b/plugins/impex/qimageio/CMakeLists.txt 2019-06-27 18:48:55.376825890 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritaqimageioexport_SOURCES
+ kis_qimageio_export.cpp
+--- a/plugins/impex/qml/CMakeLists.txt 2019-06-27 18:48:55.383825938 +0200
++++ b/plugins/impex/qml/CMakeLists.txt 2019-06-27 18:48:55.389825978 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritaqmlexport_SOURCES
+ qml_converter.cc
+--- a/plugins/impex/png/CMakeLists.txt 2019-06-27 18:48:55.396826025 +0200
++++ b/plugins/impex/png/CMakeLists.txt 2019-06-27 18:48:55.401826059 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritapngimport_SOURCES
+ kis_png_import.cc
+--- a/plugins/color/lcms2engine/CMakeLists.txt 2019-06-27 18:48:55.408826106 +0200
++++ b/plugins/color/lcms2engine/CMakeLists.txt 2019-06-27 18:48:55.412826133 +0200
+@@ -1,6 +1,8 @@
+ project( lcmsengine )
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${LCMS2_INCLUDE_DIR}
+--- a/libs/brush/CMakeLists.txt 2019-06-27 18:48:55.417826167 +0200
++++ b/libs/brush/CMakeLists.txt 2019-06-27 18:48:55.421826194 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ include_directories(SYSTEM
+ ${EIGEN3_INCLUDE_DIR}
+--- a/libs/global/CMakeLists.txt 2019-06-27 18:48:55.426826228 +0200
++++ b/libs/global/CMakeLists.txt 2019-06-27 18:48:55.430826255 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ include(CheckFunctionExists)
+ check_function_exists(backtrace HAVE_BACKTRACE)
+--- a/libs/image/CMakeLists.txt 2019-06-27 18:48:55.435826289 +0200
++++ b/libs/image/CMakeLists.txt 2019-06-27 18:48:55.438826309 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ add_subdirectory( tiles3 )
+
+--- a/libs/image/tiles3/CMakeLists.txt 2019-06-27 18:48:55.444826350 +0200
++++ b/libs/image/tiles3/CMakeLists.txt 2019-06-27 18:48:55.447826370 +0200
+@@ -1 +1,3 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/odf/CMakeLists.txt 2019-06-27 18:48:55.452826404 +0200
++++ b/libs/odf/CMakeLists.txt 2019-06-27 18:48:55.456826430 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ set(kritaodf_LIB_SRCS
+ KoOdf.cpp
+--- a/libs/metadata/CMakeLists.txt 2019-06-27 18:48:55.461826464 +0200
++++ b/libs/metadata/CMakeLists.txt 2019-06-27 18:48:55.465826491 +0200
+@@ -29,4 +29,6 @@
+
+ install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS})
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/store/CMakeLists.txt 2019-06-27 18:48:55.470826525 +0200
++++ b/libs/store/CMakeLists.txt 2019-06-27 18:48:55.473826545 +0200
+@@ -1,6 +1,8 @@
+ include_directories(${QUAZIP_INCLUDE_DIRS})
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritastore_LIB_SRCS
+ KoDirectoryStore.cpp
+--- a/libs/libkis/CMakeLists.txt 2019-06-27 18:48:55.478826579 +0200
++++ b/libs/libkis/CMakeLists.txt 2019-06-27 18:48:55.482826605 +0200
+@@ -47,4 +47,6 @@
+ install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/widgetutils/CMakeLists.txt 2019-06-27 18:48:55.487826640 +0200
++++ b/libs/widgetutils/CMakeLists.txt 2019-06-27 18:48:55.491826667 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
+
+--- a/libs/widgets/CMakeLists.txt 2019-06-27 18:48:55.496826701 +0200
++++ b/libs/widgets/CMakeLists.txt 2019-06-27 18:48:55.500826727 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+--- a/libs/flake/CMakeLists.txt 2019-06-27 18:48:55.505826761 +0200
++++ b/libs/flake/CMakeLists.txt 2019-06-27 18:48:55.510826795 +0200
+@@ -9,7 +9,9 @@
+ )
+
+ add_subdirectory(styles)
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritaflake_SRCS
+ KoGradientHelper.cpp
+--- a/libs/ui/CMakeLists.txt 2019-06-27 18:48:55.516826836 +0200
++++ b/libs/ui/CMakeLists.txt 2019-06-27 18:48:55.520826863 +0200
+@@ -7,7 +7,9 @@
+ ${OCIO_INCLUDE_DIR}
+ )
+
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ if (APPLE)
+ find_library(FOUNDATION_LIBRARY Foundation)
+--- a/libs/pigment/CMakeLists.txt 2019-06-27 18:48:55.526826903 +0200
++++ b/libs/pigment/CMakeLists.txt 2019-06-27 18:48:55.530826930 +0200
+@@ -31,7 +31,9 @@
+ message("${__per_arch_factory_objs}")
+ endif()
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ add_subdirectory(benchmarks)
+
+ set(kritapigment_SRCS
diff --git a/media-gfx/krita/krita-4.2.2.ebuild b/media-gfx/krita/krita-4.2.2.ebuild
new file mode 100644
index 00000000000..5a7e08cbf68
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.12.3"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/"
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+ dev-cpp/eigen:3
+ dev-lang/perl
+ sys-devel/gettext
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui '-gles2' '' '5=')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ dev-libs/boost:=
+ dev-libs/quazip
+ dev-python/PyQt5[${PYTHON_USEDEP}]
+ dev-python/sip[${PYTHON_USEDEP}]
+ media-gfx/exiv2:=
+ media-libs/lcms
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXi
+ color-management? ( media-libs/opencolorio )
+ fftw? ( sci-libs/fftw:3.0= )
+ gif? ( media-libs/giflib )
+ gsl? ( sci-libs/gsl:= )
+ jpeg? ( virtual/jpeg:0 )
+ heif? ( media-libs/libheif:= )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr
+ )
+ pdf? ( app-text/poppler[qt5] )
+ qtmedia? ( $(add_qt_dep qtmultimedia) )
+ raw? ( media-libs/libraw:= )
+ tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+ vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/calligra:4[calligra_features_krita]
+ !app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-tests-optional.patch
+ "${FILESDIR}"/${P}-fixuifiles.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ kde5_pkg_setup
+}
+
+src_configure() {
+ # Prevent sandbox violation from FindPyQt5.py module
+ # See Gentoo-bug 655918
+ addpredict /dev/dri
+
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package color-management OCIO)
+ $(cmake-utils_use_find_package fftw FFTW3)
+ $(cmake-utils_use_find_package gif GIF)
+ $(cmake-utils_use_find_package gsl GSL)
+ $(cmake-utils_use_find_package heif HEIF)
+ $(cmake-utils_use_find_package jpeg JPEG)
+ $(cmake-utils_use_find_package openexr OpenEXR)
+ $(cmake-utils_use_find_package pdf Poppler)
+ $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
+ $(cmake-utils_use_find_package raw LibRaw)
+ $(cmake-utils_use_find_package tiff TIFF)
+ $(cmake-utils_use_find_package vc Vc)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2019-07-16 11:00 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2019-07-16 11:00 UTC (permalink / raw
To: gentoo-commits
commit: 6d0bd1936c064b5f2a4a215a6872ad9952d42cf6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 10:28:47 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 11:00:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0bd193
media-gfx/krita: Drop 4.2.2
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 -
media-gfx/krita/files/krita-4.2.2-fixuifiles.patch | 25 -----
media-gfx/krita/krita-4.2.2.ebuild | 121 ---------------------
3 files changed, 147 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 349c094aea4..2f9aa5dd8df 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.2.tar.gz 246075662 BLAKE2B 0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e SHA512 7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096
DIST krita-4.2.3.tar.gz 246136588 BLAKE2B 1d7a371f7aeb8cf3747adcd4ab681b0ecf849e64ace16b456e9c2b8ed5fd958be895fd64c623931e47ae81bdf35b3e54161ecb204501f48c97b35ac2dcb8ac59 SHA512 6493740183b360a939d85cc7bc646cb173dc923a3dc63966d0f178bf308675ffead01d3bfefeeffb376f5efd7d90ee7f271b3ff412787123113dd125cc022ab5
diff --git a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
deleted file mode 100644
index 1703386a3c7..00000000000
--- a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e46ad1f917705d84dc5562c2f261a06eb70a57b9 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Tue, 25 Jun 2019 06:57:40 +0200
-Subject: fixuifiles
-
----
- libs/widgetutils/tests/dialogsavertestwidget.ui | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/libs/widgetutils/tests/dialogsavertestwidget.ui b/libs/widgetutils/tests/dialogsavertestwidget.ui
-index 66e70b3..ba0f54f 100644
---- a/libs/widgetutils/tests/dialogsavertestwidget.ui
-+++ b/libs/widgetutils/tests/dialogsavertestwidget.ui
-@@ -10,9 +10,6 @@
- <height>300</height>
- </rect>
- </property>
-- <property name="windowTitle">
-- <string>Form</string>
-- </property>
- <widget class="QPushButton" name="pushButton">
- <property name="geometry">
- <rect>
---
-cgit v1.1
diff --git a/media-gfx/krita/krita-4.2.2.ebuild b/media-gfx/krita/krita-4.2.2.ebuild
deleted file mode 100644
index 5a7e08cbf68..00000000000
--- a/media-gfx/krita/krita-4.2.2.ebuild
+++ /dev/null
@@ -1,121 +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}"/${P}-tests-optional.patch
- "${FILESDIR}"/${P}-fixuifiles.patch
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- kde5_pkg_setup
-}
-
-src_configure() {
- # Prevent sandbox violation from FindPyQt5.py module
- # See Gentoo-bug 655918
- addpredict /dev/dri
-
- local mycmakeargs=(
- $(cmake-utils_use_find_package color-management OCIO)
- $(cmake-utils_use_find_package fftw FFTW3)
- $(cmake-utils_use_find_package gif GIF)
- $(cmake-utils_use_find_package gsl GSL)
- $(cmake-utils_use_find_package heif HEIF)
- $(cmake-utils_use_find_package jpeg JPEG)
- $(cmake-utils_use_find_package openexr OpenEXR)
- $(cmake-utils_use_find_package pdf Poppler)
- $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
- $(cmake-utils_use_find_package raw LibRaw)
- $(cmake-utils_use_find_package tiff TIFF)
- $(cmake-utils_use_find_package vc Vc)
- )
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2019-07-31 9:45 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2019-07-31 9:45 UTC (permalink / raw
To: gentoo-commits
commit: f3086ea525167697941c8a3edc8f0c0480679e6c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 09:06:12 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=f3086ea5
media-gfx/krita: 4.2.4 version bump
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.4-tests-optional.patch | 399 +++++++++++++++++++++
media-gfx/krita/krita-4.2.4.ebuild | 117 ++++++
3 files changed, 517 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2f9aa5dd8df..8865613c448 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
DIST krita-4.2.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.4-tests-optional.patch b/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
new file mode 100644
index 00000000000..2f13c999b67
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
@@ -0,0 +1,399 @@
+--- a/plugins/filters/CMakeLists.txt 2019-07-31 11:22:19.572862843 +0200
++++ b/plugins/filters/CMakeLists.txt 2019-07-31 11:22:19.576862870 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+--- a/plugins/filters/unsharp/CMakeLists.txt 2019-07-31 11:22:19.582862912 +0200
++++ b/plugins/filters/unsharp/CMakeLists.txt 2019-07-31 11:22:19.587862947 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ set(kritaunsharpfilter_SOURCES
+ unsharp.cpp
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-07-31 11:22:19.592862983 +0200
++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-07-31 11:22:19.595863003 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+
+ include_directories(brush
+ duplicate
+--- a/plugins/paintops/libpaintop/CMakeLists.txt 2019-07-31 11:22:19.600863038 +0200
++++ b/plugins/paintops/libpaintop/CMakeLists.txt 2019-07-31 11:22:19.603863060 +0200
+@@ -104,4 +104,6 @@
+ install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/dockers/lut/CMakeLists.txt 2019-07-31 11:22:19.608863094 +0200
++++ b/plugins/dockers/lut/CMakeLists.txt 2019-07-31 11:22:19.613863129 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${OCIO_INCLUDE_DIR}
+--- a/plugins/dockers/animation/CMakeLists.txt 2019-07-31 11:22:19.619863171 +0200
++++ b/plugins/dockers/animation/CMakeLists.txt 2019-07-31 11:22:19.624863206 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+- add_subdirectory(tests)
++ if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+
+ set(KRITA_ANIMATIONDOCKER_SOURCES
+--- a/plugins/extensions/qmic/CMakeLists.txt 2019-07-31 11:22:19.630863248 +0200
++++ b/plugins/extensions/qmic/CMakeLists.txt 2019-07-31 11:22:19.635863283 +0200
+@@ -20,4 +20,6 @@
+ target_link_libraries(kritaqmic kritaui)
+ install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/tools/basictools/CMakeLists.txt 2019-07-31 11:22:19.641863325 +0200
++++ b/plugins/tools/basictools/CMakeLists.txt 2019-07-31 11:22:19.645863353 +0200
+@@ -1,5 +1,7 @@
+ if (NOT APPLE)
+- add_subdirectory(tests)
++ if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif ()
+
+ set(kritadefaulttools_SOURCES
+--- a/plugins/tools/tool_transform2/CMakeLists.txt 2019-07-31 11:22:19.650863388 +0200
++++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-07-31 11:22:19.653863409 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+- add_subdirectory(tests)
++ if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+
+ set(kritatooltransform_SOURCES
+--- a/plugins/impex/svg/CMakeLists.txt 2019-07-31 11:22:19.658863444 +0200
++++ b/plugins/impex/svg/CMakeLists.txt 2019-07-31 11:22:19.662863472 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritasvgimport_SOURCES
+ kis_svg_import.cc
+--- a/plugins/impex/brush/CMakeLists.txt 2019-07-31 11:22:19.668863514 +0200
++++ b/plugins/impex/brush/CMakeLists.txt 2019-07-31 11:22:19.672863542 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritabrushexport_PART_SRCS
+ kis_brush_export.cpp
+--- a/plugins/impex/psd/CMakeLists.txt 2019-07-31 11:22:19.678863584 +0200
++++ b/plugins/impex/psd/CMakeLists.txt 2019-07-31 11:22:19.684863626 +0200
+@@ -1,5 +1,7 @@
+ if (NOT MSVC AND NOT APPLE)
+- add_subdirectory(tests)
++ if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+
+ configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
+--- a/plugins/impex/tga/CMakeLists.txt 2019-07-31 11:22:19.690863668 +0200
++++ b/plugins/impex/tga/CMakeLists.txt 2019-07-31 11:22:19.695863703 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritatgaexport_SOURCES
+ kis_tga_export.cpp
+--- a/plugins/impex/libkra/CMakeLists.txt 2019-07-31 11:22:19.700863738 +0200
++++ b/plugins/impex/libkra/CMakeLists.txt 2019-07-31 11:22:19.704863766 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritalibkra_LIB_SRCS
+ kis_colorize_dom_utils.cpp
+--- a/plugins/impex/jpeg/CMakeLists.txt 2019-07-31 11:22:19.709863801 +0200
++++ b/plugins/impex/jpeg/CMakeLists.txt 2019-07-31 11:22:19.713863829 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
+
+--- a/plugins/impex/gif/CMakeLists.txt 2019-07-31 11:22:19.720863878 +0200
++++ b/plugins/impex/gif/CMakeLists.txt 2019-07-31 11:22:19.726863920 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritagifexport_SOURCES
+ kis_gif_export.cpp
+--- a/plugins/impex/exr/CMakeLists.txt 2019-07-31 11:22:19.732863962 +0200
++++ b/plugins/impex/exr/CMakeLists.txt 2019-07-31 11:22:19.736863990 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
+
+--- a/plugins/impex/xcf/CMakeLists.txt 2019-07-31 11:22:19.740864018 +0200
++++ b/plugins/impex/xcf/CMakeLists.txt 2019-07-31 11:22:19.744864046 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
+
+--- a/plugins/impex/tiff/CMakeLists.txt 2019-07-31 11:22:19.750864088 +0200
++++ b/plugins/impex/tiff/CMakeLists.txt 2019-07-31 11:22:19.755864123 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(libkritatiffconverter_LIB_SRCS
+ kis_tiff_converter.cc
+--- a/plugins/impex/ora/CMakeLists.txt 2019-07-31 11:22:19.762864172 +0200
++++ b/plugins/impex/ora/CMakeLists.txt 2019-07-31 11:22:19.767864207 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(libkritaconverter_LIB_SRCS
+ ora_converter.cpp
+--- a/plugins/impex/heif/CMakeLists.txt 2019-07-31 11:22:19.774864256 +0200
++++ b/plugins/impex/heif/CMakeLists.txt 2019-07-31 11:22:19.778864284 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}")
+--- a/plugins/impex/pdf/CMakeLists.txt 2019-07-31 11:22:19.783864319 +0200
++++ b/plugins/impex/pdf/CMakeLists.txt 2019-07-31 11:22:19.788864354 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp )
+
+--- a/plugins/impex/csv/CMakeLists.txt 2019-07-31 11:22:19.796864410 +0200
++++ b/plugins/impex/csv/CMakeLists.txt 2019-07-31 11:22:19.803864459 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ # import
+
+--- a/plugins/impex/heightmap/CMakeLists.txt 2019-07-31 11:22:19.810864508 +0200
++++ b/plugins/impex/heightmap/CMakeLists.txt 2019-07-31 11:22:19.819864571 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+
+--- a/plugins/impex/raw/CMakeLists.txt 2019-07-31 11:22:19.826864620 +0200
++++ b/plugins/impex/raw/CMakeLists.txt 2019-07-31 11:22:19.830864648 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ if(OPENEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+--- a/plugins/impex/qimageio/CMakeLists.txt 2019-07-31 11:22:19.837864697 +0200
++++ b/plugins/impex/qimageio/CMakeLists.txt 2019-07-31 11:22:19.844864746 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritaqimageioexport_SOURCES
+ kis_qimageio_export.cpp
+--- a/plugins/impex/qml/CMakeLists.txt 2019-07-31 11:22:19.851864795 +0200
++++ b/plugins/impex/qml/CMakeLists.txt 2019-07-31 11:22:19.856864830 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritaqmlexport_SOURCES
+ qml_converter.cc
+--- a/plugins/impex/png/CMakeLists.txt 2019-07-31 11:22:19.862864872 +0200
++++ b/plugins/impex/png/CMakeLists.txt 2019-07-31 11:22:19.867864907 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritapngimport_SOURCES
+ kis_png_import.cc
+--- a/plugins/color/lcms2engine/CMakeLists.txt 2019-07-31 11:22:19.872864942 +0200
++++ b/plugins/color/lcms2engine/CMakeLists.txt 2019-07-31 11:22:19.876864969 +0200
+@@ -1,6 +1,8 @@
+ project( lcmsengine )
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${LCMS2_INCLUDE_DIR}
+--- a/libs/brush/CMakeLists.txt 2019-07-31 11:22:19.881865005 +0200
++++ b/libs/brush/CMakeLists.txt 2019-07-31 11:22:19.885865033 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ include_directories(SYSTEM
+ ${EIGEN3_INCLUDE_DIR}
+--- a/libs/global/CMakeLists.txt 2019-07-31 11:22:19.890865068 +0200
++++ b/libs/global/CMakeLists.txt 2019-07-31 11:22:19.896865110 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ include(CheckFunctionExists)
+ check_function_exists(backtrace HAVE_BACKTRACE)
+--- a/libs/image/CMakeLists.txt 2019-07-31 11:22:19.902865151 +0200
++++ b/libs/image/CMakeLists.txt 2019-07-31 11:22:19.908865194 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ add_subdirectory( tiles3 )
+
+--- a/libs/image/tiles3/CMakeLists.txt 2019-07-31 11:22:19.913865228 +0200
++++ b/libs/image/tiles3/CMakeLists.txt 2019-07-31 11:22:19.917865256 +0200
+@@ -1 +1,3 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/odf/CMakeLists.txt 2019-07-31 11:22:19.922865291 +0200
++++ b/libs/odf/CMakeLists.txt 2019-07-31 11:22:19.926865319 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ set(kritaodf_LIB_SRCS
+ KoOdf.cpp
+--- a/libs/metadata/CMakeLists.txt 2019-07-31 11:22:19.930865347 +0200
++++ b/libs/metadata/CMakeLists.txt 2019-07-31 11:22:19.934865376 +0200
+@@ -29,4 +29,6 @@
+
+ install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS})
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/store/CMakeLists.txt 2019-07-31 11:22:19.940865418 +0200
++++ b/libs/store/CMakeLists.txt 2019-07-31 11:22:19.944865445 +0200
+@@ -1,6 +1,8 @@
+ include_directories(${QUAZIP_INCLUDE_DIRS})
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritastore_LIB_SRCS
+ KoDirectoryStore.cpp
+--- a/libs/libkis/CMakeLists.txt 2019-07-31 11:22:19.951865495 +0200
++++ b/libs/libkis/CMakeLists.txt 2019-07-31 11:22:19.958865544 +0200
+@@ -47,4 +47,6 @@
+ install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/widgetutils/CMakeLists.txt 2019-07-31 11:22:19.968865614 +0200
++++ b/libs/widgetutils/CMakeLists.txt 2019-07-31 11:22:19.981865705 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
+
+--- a/libs/widgets/CMakeLists.txt 2019-07-31 11:22:19.992865782 +0200
++++ b/libs/widgets/CMakeLists.txt 2019-07-31 11:22:20.000865837 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+--- a/libs/flake/CMakeLists.txt 2019-07-31 11:22:20.010865908 +0200
++++ b/libs/flake/CMakeLists.txt 2019-07-31 11:22:20.017865956 +0200
+@@ -9,8 +9,12 @@
+ )
+
+ add_subdirectory(styles)
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
++if(BUILD_TESTING)
+ add_subdirectory(resources/tests)
++endif()
+
+ set(kritaflake_SRCS
+ KoGradientHelper.cpp
+--- a/libs/ui/CMakeLists.txt 2019-07-31 11:22:20.029866040 +0200
++++ b/libs/ui/CMakeLists.txt 2019-07-31 11:22:20.039866111 +0200
+@@ -7,7 +7,9 @@
+ ${OCIO_INCLUDE_DIR}
+ )
+
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ if (APPLE)
+ find_library(FOUNDATION_LIBRARY Foundation)
+--- a/libs/pigment/CMakeLists.txt 2019-07-31 11:22:20.050866188 +0200
++++ b/libs/pigment/CMakeLists.txt 2019-07-31 11:22:20.057866236 +0200
+@@ -31,7 +31,9 @@
+ message("${__per_arch_factory_objs}")
+ endif()
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ add_subdirectory(benchmarks)
+
+ set(kritapigment_SRCS
diff --git a/media-gfx/krita/krita-4.2.4.ebuild b/media-gfx/krita/krita-4.2.4.ebuild
new file mode 100644
index 00000000000..62966b4d812
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/"
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+ dev-cpp/eigen:3
+ dev-lang/perl
+ sys-devel/gettext
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui '-gles2' '' '5=')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ dev-libs/boost:=
+ dev-libs/quazip
+ dev-python/PyQt5[${PYTHON_USEDEP}]
+ dev-python/sip[${PYTHON_USEDEP}]
+ media-gfx/exiv2:=
+ media-libs/lcms
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXi
+ color-management? ( media-libs/opencolorio )
+ fftw? ( sci-libs/fftw:3.0= )
+ gif? ( media-libs/giflib )
+ gsl? ( sci-libs/gsl:= )
+ jpeg? ( virtual/jpeg:0 )
+ heif? ( media-libs/libheif:= )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr
+ )
+ pdf? ( app-text/poppler[qt5] )
+ qtmedia? ( $(add_qt_dep qtmultimedia) )
+ raw? ( media-libs/libraw:= )
+ tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+ vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/calligra:4[calligra_features_krita]
+ !app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${P}-tests-optional.patch )
+
+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] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2019-11-15 17:37 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2019-11-15 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 952ce9a0b17778e2341199167661a106eb073665
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 14:25:57 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 17:37:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952ce9a0
media-gfx/krita: Drop 4.1.8-r1
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 -
.../krita/files/krita-4.0.3-tests-optional.patch | 324 ---------------------
.../krita-4.1.8-fix-pre-5.12-tablet-support.patch | 49 ----
...-qt-5.12-fix-unsupported-composition-mode.patch | 38 ---
media-gfx/krita/krita-4.1.8-r1.ebuild | 123 --------
5 files changed, 535 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 6fff880799d..e27248b96e5 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48 SHA512 28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35
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
deleted file mode 100644
index c9e3ddc2aea..00000000000
--- a/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
+++ /dev/null
@@ -1,324 +0,0 @@
-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/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch b/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
deleted file mode 100644
index 2928247e57a..00000000000
--- a/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0218025b1725aa810f108d08802b590ce62f1044 Mon Sep 17 00:00:00 2001
-From: Dmitry Kazakov <dimula73@gmail.com>
-Date: Mon, 25 Mar 2019 21:16:41 +0300
-Subject: Add a workaround for Qt 5.9...5.11.X to fix tablet support
-
-Basically, the patch mimics this Qt's patch that has been
-added in Qt 5.12.0 only:
-https://codereview.qt-project.org/#/c/239918/
-
-BUG:399696
----
- libs/ui/input/kis_input_manager_p.cpp | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/libs/ui/input/kis_input_manager_p.cpp b/libs/ui/input/kis_input_manager_p.cpp
-index 4f5a58f..0a26655 100644
---- a/libs/ui/input/kis_input_manager_p.cpp
-+++ b/libs/ui/input/kis_input_manager_p.cpp
-@@ -333,6 +333,28 @@ KisInputManager::Private::ProximityNotifier::ProximityNotifier(KisInputManager::
-
- bool KisInputManager::Private::ProximityNotifier::eventFilter(QObject* object, QEvent* event )
- {
-+ /**
-+ * All Qt builds in range 5.7.0...5.11.X on X11 had a problem that made all
-+ * the tablet events be accepted by default. It meant that no mouse
-+ * events were synthesized, and, therefore, no Enter/Leave were generated.
-+ *
-+ * The fix for this bug has been added only in Qt 5.12.0:
-+ * https://codereview.qt-project.org/#/c/239918/
-+ *
-+ * To avoid this problem we should explicitly ignore all the tablet events.
-+ */
-+#if defined Q_OS_LINUX && \
-+ QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) && \
-+ QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
-+
-+ if (event->type() == QEvent::TabletMove ||
-+ event->type() == QEvent::TabletPress ||
-+ event->type() == QEvent::TabletRelease) {
-+
-+ event->ignore();
-+ }
-+#endif
-+
- switch (event->type()) {
- case QEvent::TabletEnterProximity:
- d->debugEvent<QEvent, false>(event);
---
-cgit v1.1
diff --git a/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch b/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
deleted file mode 100644
index dc65b1c49d2..00000000000
--- a/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9347112a77b3b628af8c0b8d4d7cbc0929eede9e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Wolthera=20van=20H=C3=B6vell=20tot=20Westerflier?=
- <griffinvalley@gmail.com>
-Date: Sat, 30 Mar 2019 21:47:37 +0100
-Subject: BUG:406032 Fix crash caused by unsupported composition mode in QT
- 5.12
-
-Qt 5.12 doesn't support QPainter::RasterOp_SourceXorDestination anymore.
-
-Trying to paint with a painter that uses this while opengl is enabled
-will lead to a crash. The only relevant place this enum value is still used
-is in kis_tool.cc, where it is only painted on the regular non-accelerated canvas.
-
-Anyhow, told the smartpatch to use this function instead of doing something itself.
-
-The whole thing is a little bizar.
----
- plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
-index 656ba38..32577a3 100644
---- a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
-+++ b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
-@@ -245,9 +245,8 @@ void KisToolSmartPatch::paint(QPainter &painter, const KoViewConverter &converte
- Q_UNUSED(converter);
-
- painter.save();
-- painter.setCompositionMode(QPainter::RasterOp_SourceXorDestination);
-- painter.setPen(QColor(128, 255, 128));
-- painter.drawPath(pixelToView(m_d->brushOutline));
-+ QPainterPath path = pixelToView(m_d->brushOutline);
-+ paintToolOutline(&painter, path);
- painter.restore();
-
- painter.save();
---
-cgit v1.1
diff --git a/media-gfx/krita/krita-4.1.8-r1.ebuild b/media-gfx/krita/krita-4.1.8-r1.ebuild
deleted file mode 100644
index dae8437cd87..00000000000
--- a/media-gfx/krita/krita-4.1.8-r1.ebuild
+++ /dev/null
@@ -1,123 +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.11.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://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}"
-
-# FIXME: drop qtgui subslot operator when QTBUG is fixed or QT_MINIMAL >= 5.12.0:
-# https://bugreports.qt.io/browse/QTBUG-72488
-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-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.0.3-tests-optional.patch"
- "${FILESDIR}/${P}-qt-5.12-fix-unsupported-composition-mode.patch"
- "${FILESDIR}/${P}-fix-pre-5.12-tablet-support.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] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2020-04-18 19:33 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2020-04-18 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 4adb681e309103d6306caa0cb1f31e8a3b1037bc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 19:15:43 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 19:32:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4adb681e
media-gfx/krita: Fix build with Qt 5.15
Package-Manager: Portage-2.3.99, 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 | 5 +-
3 files changed, 4 insertions(+), 354 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2bab9ddbf4a..bf42126de16 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,4 @@
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-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
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
deleted file mode 100644
index 0a7c7ca6984..00000000000
--- a/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-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
index 91a902cc805..e3e6c38ca03 100644
--- a/media-gfx/krita/krita-4.2.9.ebuild
+++ b/media-gfx/krita/krita-4.2.9.ebuild
@@ -11,7 +11,8 @@ 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"
+ SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz
+ https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
KEYWORDS="~amd64 ~ppc64 ~x86"
fi
@@ -89,7 +90,7 @@ RESTRICT+=" test"
PATCHES=(
"${FILESDIR}"/${PN}-4.2.4-tests-optional.patch
- "${FILESDIR}"/${P}-ecm-findopenexr.patch
+ "${WORKDIR}"/${P}-patchset
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2020-10-31 9:23 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2020-10-31 9:23 UTC (permalink / raw
To: gentoo-commits
commit: 675e8e6afc49ade90e2bf49ec12166dce0670cae
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 15:28:22 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 09:20:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675e8e6a
media-gfx/krita: 4.4.1 version bump
See also: https://krita.org/en/item/krita-4-4-1-released/
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 +
.../krita/files/krita-4.3.1-tests-optional.patch | 80 +++++++++++++
media-gfx/krita/krita-4.4.1.ebuild | 127 +++++++++++++++++++++
3 files changed, 208 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index bb2ae2c5f9f..2d039017079 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.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.1-tests-optional.patch b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
new file mode 100644
index 00000000000..37f2ac50ffd
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
@@ -0,0 +1,80 @@
+From 2e9369281d44a2701ac7364568d381cca0d92ec5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 12 Jul 2020 18:55:31 +0200
+Subject: [PATCH] KritaAddBrokenUnitTest.cmake, MacroKritaAddBenchmark.cmake:
+ Skip ecm_add_test early if Qt5::Test is not available
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ cmake/modules/KritaAddBrokenUnitTest.cmake | 4 ++++
+ cmake/modules/MacroKritaAddBenchmark.cmake | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/cmake/modules/KritaAddBrokenUnitTest.cmake b/cmake/modules/KritaAddBrokenUnitTest.cmake
+index b7d0e8d852..901a0a1f99 100644
+--- a/cmake/modules/KritaAddBrokenUnitTest.cmake
++++ b/cmake/modules/KritaAddBrokenUnitTest.cmake
+@@ -23,6 +23,10 @@ function(KRITA_ADD_BROKEN_UNIT_TEST)
+ message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"")
+ endif()
+
++ if(NOT TARGET Qt5::Test)
++ return()
++ endif()
++
+ set(_testname ${ARG_NAME_PREFIX}${_targetname})
+
+ # add test to the global list of disabled tests
+diff --git a/cmake/modules/MacroKritaAddBenchmark.cmake b/cmake/modules/MacroKritaAddBenchmark.cmake
+index c748d8e319..f804d9b8f4 100644
+--- a/cmake/modules/MacroKritaAddBenchmark.cmake
++++ b/cmake/modules/MacroKritaAddBenchmark.cmake
+@@ -23,6 +23,10 @@ macro (KRITA_ADD_BENCHMARK _test_NAME)
+ set(_nogui "NOGUI")
+ endif()
+
++ if(NOT TARGET Qt5::Test)
++ return()
++ endif()
++
+ add_executable( ${_test_NAME} ${_srcList} )
+ ecm_mark_as_test(${_test_NAME})
+
+--
+2.27.0
+
+From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 17 Jun 2020 20:18:28 +0200
+Subject: [PATCH] Don't build tests when testing not requested
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+
+diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
+index cbdac265d2..1a50c1620a 100644
+--- a/libs/flake/CMakeLists.txt
++++ b/libs/flake/CMakeLists.txt
+@@ -9,8 +9,10 @@ include_directories(
+ )
+
+ add_subdirectory(styles)
+-add_subdirectory(tests)
+-add_subdirectory(resources/tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++ add_subdirectory(resources/tests)
++endif()
+
+ set(kritaflake_SRCS
+ KoGradientHelper.cpp
+diff --git a/libs/image/tiles3/CMakeLists.txt b/libs/image/tiles3/CMakeLists.txt
+index 88c0516360..01f2383ddb 100644
+--- a/libs/image/tiles3/CMakeLists.txt
++++ b/libs/image/tiles3/CMakeLists.txt
+@@ -1 +1,3 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+--
+2.27.0
diff --git a/media-gfx/krita/krita-4.4.1.ebuild b/media-gfx/krita/krita-4.4.1.ebuild
new file mode 100644
index 00000000000..1b8485696af
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.1.ebuild
@@ -0,0 +1,127 @@
+# 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.74.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${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/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.3.1-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=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_SeExpr2=ON # not packaged
+ $(cmake_use_find_package color-management OCIO)
+ $(cmake_use_find_package fftw FFTW3)
+ $(cmake_use_find_package gif GIF)
+ $(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] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2021-02-23 19:53 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2021-02-23 19:53 UTC (permalink / raw
To: gentoo-commits
commit: 1176cc65055bad4ebaf56465578afa995da6e5a7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 16:31:29 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 19:52:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1176cc65
media-gfx/krita: Support build with >=dev-libs/quazip-1.0
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/files/krita-4.4.2-quazip1.patch | 36 +++++++++++++++++++++++++
media-gfx/krita/krita-4.4.2.ebuild | 3 ++-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-4.4.2-quazip1.patch b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
new file mode 100644
index 00000000000..6a49bd3ba2e
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
@@ -0,0 +1,36 @@
+From 3eaf480ae5d615e8e26153cca98115ff0f23135f Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Mon, 5 Oct 2020 20:11:26 +0200
+Subject: [PATCH] Support quazip 1.0
+
+Update FindQuaZip to find the QuaZip 1.0 library names and include dirs. Once support for quazip<1 is dropped this should be ported to use quazip's own QuaZipConfig
+---
+ cmake/modules/FindQuaZip.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/FindQuaZip.cmake b/cmake/modules/FindQuaZip.cmake
+index 7e628fcd4b..345c7909ab 100644
+--- a/cmake/modules/FindQuaZip.cmake
++++ b/cmake/modules/FindQuaZip.cmake
+@@ -25,15 +25,15 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+ ELSE(WIN32)
+ FIND_PACKAGE(PkgConfig)
+ # pkg_check_modules(PC_QCA2 QUIET qca2)
+- pkg_check_modules(PC_QUAZIP quazip)
++ pkg_check_modules(PC_QUAZIP quazip quazip1-qt5)
+ FIND_LIBRARY(QUAZIP_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+- NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
++ NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} quazip1-qt5
+ HINTS /usr/lib /usr/lib64
+ )
+ FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
+ HINTS /usr/include /usr/local/include
+- PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
++ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} QuaZip-Qt5-1.0/quazip
+ )
+ FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
+ ENDIF (WIN32)
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-4.4.2.ebuild b/media-gfx/krita/krita-4.4.2.ebuild
index 3a09834e46d..62d25fd3463 100644
--- a/media-gfx/krita/krita-4.4.2.ebuild
+++ b/media-gfx/krita/krita-4.4.2.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
"
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=
- dev-libs/quazip
+ dev-libs/quazip:0=
$(python_gen_cond_dep '
dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
dev-python/sip[${PYTHON_MULTI_USEDEP}]
@@ -90,6 +90,7 @@ RESTRICT+=" test"
PATCHES=(
"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+ "${FILESDIR}"/${P}-quazip1.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2021-12-29 16:34 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2021-12-29 16:34 UTC (permalink / raw
To: gentoo-commits
commit: 8e8f74afb6662f813be78b857d6a88a852548e17
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 29 11:50:41 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 15:41:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e8f74af
media-gfx/krita: Fix build with clang
Reported-by: Michael Egger <egger.m <AT> protonmail.com>
Closes: https://bugs.gentoo.org/830225
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/files/krita-5.0.0-clang.patch | 50 ++++++++++++++++++++++
.../{krita-5.0.0.ebuild => krita-5.0.0-r1.ebuild} | 5 ++-
2 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch b/media-gfx/krita/files/krita-5.0.0-clang.patch
new file mode 100644
index 000000000000..6c9c71d4fca2
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.0.0-clang.patch
@@ -0,0 +1,50 @@
+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.0.ebuild b/media-gfx/krita/krita-5.0.0-r1.ebuild
similarity index 96%
rename from media-gfx/krita/krita-5.0.0.ebuild
rename to media-gfx/krita/krita-5.0.0-r1.ebuild
index 80d88c6840a7..757396adc400 100644
--- a/media-gfx/krita/krita-5.0.0.ebuild
+++ b/media-gfx/krita/krita-5.0.0-r1.ebuild
@@ -86,7 +86,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}-clang.patch # bug 830225
+)
pkg_setup() {
python-single-r1_pkg_setup
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2022-02-19 16:27 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2022-02-19 16:27 UTC (permalink / raw
To: gentoo-commits
commit: 36938034e92b826ba1436f01b4af7ae762d72d4a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 29 11:50:41 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 16:26:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36938034
media-gfx/krita: Fix build with clang
Reported-by: Michael Egger <egger.m <AT> protonmail.com>
Closes: https://bugs.gentoo.org/830225
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/files/krita-5.0.0-clang.patch | 50 +++++++++++++++++++++++++++
media-gfx/krita/krita-5.0.2.ebuild | 5 ++-
2 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch b/media-gfx/krita/files/krita-5.0.0-clang.patch
new file mode 100644
index 000000000000..6c9c71d4fca2
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.0.0-clang.patch
@@ -0,0 +1,50 @@
+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
index e880d07ce0b2..685904486932 100644
--- a/media-gfx/krita/krita-5.0.2.ebuild
+++ b/media-gfx/krita/krita-5.0.2.ebuild
@@ -86,7 +86,10 @@ BDEPEND="
sys-devel/gettext
"
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2022-06-06 1:27 Sam James
0 siblings, 0 replies; 28+ messages in thread
From: Sam James @ 2022-06-06 1:27 UTC (permalink / raw
To: gentoo-commits
commit: abe6cccfc75fac99646ed066c8a8162c152d67ee
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 01:26:49 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 01:26:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe6cccf
media-gfx/krita: drop 4.4.8-r1, 5.0.6-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/krita/Manifest | 3 -
media-gfx/krita/files/krita-4.4.2-quazip1.patch | 36 ------
.../files/krita-4.4.7-pykrita-crash-on-exit.patch | 41 -------
.../krita-4.4.8-prefer-newer-sip-to-build.patch | 56 ---------
media-gfx/krita/krita-4.4.8-r1.ebuild | 130 ---------------------
media-gfx/krita/krita-5.0.6-r1.ebuild | 123 -------------------
6 files changed, 389 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 62dc7f3bd25f..f4dfa19da4cd 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,5 +1,2 @@
-DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
-DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
DIST krita-5.0.2.tar.xz 179049488 BLAKE2B a58ee0e7d654f18509f970d32a680a9a993c7172a3818517ddf0a41f500c2d1f9102a432b728b9d9254f39f1be0c926602e3b1806ae19b6efc49f99becdffcdd SHA512 5dd2d6961feabf20dbcef49f3499281e34b409e96d379b0247eec70449f82c05ed3cf3ca09014535adb7ce66659d58e988f1f054364637c9851181fa8ee926a5
-DIST krita-5.0.6.tar.xz 179335700 BLAKE2B dc164fec0ed39d8c9fc8b3624d0ceaeeb25bb55b32cabf56f655116448cea94451421e67069de1d1fbaed1e949b88c982f3e01cf66de40518d1b4e2b9b079bdb SHA512 7ad92b750a1c54bf79b279730ad84119030ff532f5a8a77f2040776304dbb768a67dfa1bf67ac72c0c984b7e508e59476640f1b41ea38d3f525d52c7eb6cde9f
DIST krita-5.0.8.tar.xz 179344256 BLAKE2B f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682 SHA512 652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777
diff --git a/media-gfx/krita/files/krita-4.4.2-quazip1.patch b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
deleted file mode 100644
index 6a49bd3ba2e7..000000000000
--- a/media-gfx/krita/files/krita-4.4.2-quazip1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3eaf480ae5d615e8e26153cca98115ff0f23135f Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Mon, 5 Oct 2020 20:11:26 +0200
-Subject: [PATCH] Support quazip 1.0
-
-Update FindQuaZip to find the QuaZip 1.0 library names and include dirs. Once support for quazip<1 is dropped this should be ported to use quazip's own QuaZipConfig
----
- cmake/modules/FindQuaZip.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/FindQuaZip.cmake b/cmake/modules/FindQuaZip.cmake
-index 7e628fcd4b..345c7909ab 100644
---- a/cmake/modules/FindQuaZip.cmake
-+++ b/cmake/modules/FindQuaZip.cmake
-@@ -25,15 +25,15 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
- ELSE(WIN32)
- FIND_PACKAGE(PkgConfig)
- # pkg_check_modules(PC_QCA2 QUIET qca2)
-- pkg_check_modules(PC_QUAZIP quazip)
-+ pkg_check_modules(PC_QUAZIP quazip quazip1-qt5)
- FIND_LIBRARY(QUAZIP_LIBRARIES
- WIN32_DEBUG_POSTFIX d
-- NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
-+ NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} quazip1-qt5
- HINTS /usr/lib /usr/lib64
- )
- FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
- HINTS /usr/include /usr/local/include
-- PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
-+ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} QuaZip-Qt5-1.0/quazip
- )
- FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
- ENDIF (WIN32)
---
-GitLab
-
diff --git a/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
deleted file mode 100644
index f896a3920efc..000000000000
--- a/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
----
- 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,6 +76,12 @@ 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()
---
-GitLab
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
deleted file mode 100644
index c60b53ffc64b..000000000000
--- a/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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
deleted file mode 100644
index dedc461115e7..000000000000
--- a/media-gfx/krita/krita-4.4.8-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 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.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[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/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-3.0.0:0=
- )
- 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}"/${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() {
- 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
-}
diff --git a/media-gfx/krita/krita-5.0.6-r1.ebuild b/media-gfx/krita/krita-5.0.6-r1.ebuild
deleted file mode 100644
index dd01742d3d40..000000000000
--- a/media-gfx/krita/krita-5.0.6-r1.ebuild
+++ /dev/null
@@ -1,123 +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? ( media-libs/libjpeg-turbo:= )
- 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
-)
-
-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] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2023-01-24 16:12 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2023-01-24 16:12 UTC (permalink / raw
To: gentoo-commits
commit: 6df2216bbbd544adfed8929a91ca46760d50242e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 14:24:28 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 16:11:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df2216b
media-gfx/krita: drop 5.1.3-r3, 5.1.4-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 2 -
.../krita/files/krita-5.1.4-libraw-0.21.patch | 28 -----
media-gfx/krita/krita-5.1.3-r3.ebuild | 121 --------------------
media-gfx/krita/krita-5.1.4-r1.ebuild | 123 ---------------------
4 files changed, 274 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index bd1d190ff922..5bc573c625ab 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1 @@
-DIST krita-5.1.3.tar.xz 185166464 BLAKE2B 2fa93e06cd4b5b68016bc1af83464c3e44e1ece0e786734def030bf8e333086ed9d36b23d56dc8b742ceef85273b9d88d754286e85d2d1384ffc92a3592693fd SHA512 4025033cbbe48f2e0d52961320c08920691a3c5b48029c67560c3c28e699cec6a02432bc1ec706204b1f5f3199c7fc66e10c01607ce06b113211cae0194f5d88
-DIST krita-5.1.4.tar.xz 184969232 BLAKE2B 3452504c1ce973d0670508b143ee45d2a75fe72d87f1a3fdddd94a56c4b36f4a179e2a651a0663a04aab8e75484065a78140b3c8c51fda1215c14924a4895be5 SHA512 316b9333f416a4d8739a7201910069211d1da1b0f2eebfc48de08f6cf4736f3e7b8fa242bc97eebe8536e483c214cb584d459f26f8ce7bd10e36da467eb67446
DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716 SHA512 b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1
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
deleted file mode 100644
index 9cdd0a9f8161..000000000000
--- a/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.3-r3.ebuild b/media-gfx/krita/krita-5.1.3-r3.ebuild
deleted file mode 100644
index 310b28bf65bc..000000000000
--- a/media-gfx/krita/krita-5.1.3-r3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{9..11} )
-KFMIN=5.82.0
-QTMIN=5.15.5
-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 jpegxl +mypaint-brush-engine openexr pdf qtmedia +raw webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/boost:=
- 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:= )
- jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825 )
- heif? ( >=media-libs/libheif-1.11:=[x265] )
- 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}"
-BDEPEND="
- dev-cpp/eigen:3
- dev-lang/perl
- sys-devel/gettext
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.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=(
- -DENABLE_UPDATERS=OFF
- -DFETCH_TRANSLATIONS=OFF
- -DKRITA_ENABLE_PCH=OFF # big mess.
- -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
- -DCMAKE_DISABLE_FIND_PACKAGE_xsimd=ON # not packaged
- $(cmake_use_find_package color-management OpenColorIO)
- $(cmake_use_find_package fftw FFTW3)
- $(cmake_use_find_package gif GIF)
- $(cmake_use_find_package gsl GSL)
- $(cmake_use_find_package heif HEIF)
- $(cmake_use_find_package jpegxl JPEGXL)
- $(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 webp WebP)
- )
-
- ecm_src_configure
-}
diff --git a/media-gfx/krita/krita-5.1.4-r1.ebuild b/media-gfx/krita/krita-5.1.4-r1.ebuild
deleted file mode 100644
index ead766c348bd..000000000000
--- a/media-gfx/krita/krita-5.1.4-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{9..11} )
-KFMIN=5.82.0
-QTMIN=5.15.5
-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 jpegxl +mypaint-brush-engine openexr pdf qtmedia +raw webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/boost:=
- 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:= )
- jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825 )
- heif? ( >=media-libs/libheif-1.11:=[x265] )
- 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}"
-BDEPEND="
- dev-cpp/eigen:3
- dev-lang/perl
- sys-devel/gettext
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
- "${FILESDIR}"/${P}-libraw-0.21.patch # bug 887473
-)
-
-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
- -DCMAKE_DISABLE_FIND_PACKAGE_xsimd=ON # not packaged
- $(cmake_use_find_package color-management OpenColorIO)
- $(cmake_use_find_package fftw FFTW3)
- $(cmake_use_find_package gif GIF)
- $(cmake_use_find_package gsl GSL)
- $(cmake_use_find_package heif HEIF)
- $(cmake_use_find_package jpegxl JPEGXL)
- $(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 webp WebP)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2023-10-03 19:21 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2023-10-03 19:21 UTC (permalink / raw
To: gentoo-commits
commit: 55f75efa4e03aa1e1dc18bf1374de7d75212aca1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 3 18:57:00 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 3 19:20:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55f75efa
media-gfx/krita: Fix build with >=media-libs/opencolorio-2.3.0
Picked from https://invent.kde.org/graphics/krita/-/merge_requests/1942
after sanitising unrelated changes.
Closes: https://bugs.gentoo.org/915107
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch | 37 ++++++++++++++++++++++
media-gfx/krita/krita-5.1.5.ebuild | 1 +
2 files changed, 38 insertions(+)
diff --git a/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch b/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch
new file mode 100644
index 000000000000..534e24469e8a
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch
@@ -0,0 +1,37 @@
+From 48edd05f32241c537cedf2831efc5eb91a112291 Mon Sep 17 00:00:00 2001
+From: killy |0veufOrever <80536642@qq.com>
+Date: Tue, 19 Sep 2023 02:18:54 +0000
+Subject: [PATCH] Update OCIO to version 2.3.0
+
+---
+ 3rdparty/ext_ocio/CMakeLists.txt | 4 ++--
+ plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+From 21d384fe9fafde2f45f7339a2234f4022c53152f Mon Sep 17 00:00:00 2001
+From: killy |0veufOrever <80536642@qq.com>
+Date: Tue, 19 Sep 2023 03:17:17 +0000
+Subject: [PATCH] Dimensions are not required when the OCIO version is less
+ than 2.3.0
+
+---
+ plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
+--- a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
++++ b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
+@@ -507,7 +507,13 @@
+ unsigned height = 0;
+ OCIO::GpuShaderDesc::TextureType channel = OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL;
+ OCIO::Interpolation interpolation = OCIO::INTERP_LINEAR;
++
++#if OCIO_VERSION_HEX >= 0x2030000
++ OCIO::GpuShaderCreator::TextureDimensions dimensions;
++ shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, dimensions, interpolation);
++#else
+ shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, interpolation);
++#endif
+
+ if (!textureName || !*textureName || !samplerName || !*samplerName || width == 0) {
+ errOpenGL << "The texture data is corrupted";
diff --git a/media-gfx/krita/krita-5.1.5.ebuild b/media-gfx/krita/krita-5.1.5.ebuild
index c8945c944730..f313dc477e04 100644
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -89,6 +89,7 @@ BDEPEND="
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
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2024-01-21 19:15 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2024-01-21 19:15 UTC (permalink / raw
To: gentoo-commits
commit: e4809498c27efa079b477bfcc80b32a403d5e594
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 18:37:51 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 19:14:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4809498
media-gfx/krita: Fix build with >=media-libs/libjxl-0.9
Closes: https://bugs.gentoo.org/922524
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch | 73 ++++++++++++++++++++++
media-gfx/krita/krita-5.1.5.ebuild | 5 +-
2 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch b/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch
new file mode 100644
index 000000000000..a578f22c67f9
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch
@@ -0,0 +1,73 @@
+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()))) {
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-5.1.5.ebuild b/media-gfx/krita/krita-5.1.5.ebuild
index ab68ac1db844..283b2c2e7a76 100644
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -70,7 +70,7 @@ RDEPEND="${PYTHON_DEPS}
fftw? ( sci-libs/fftw:3.0= )
gif? ( media-libs/giflib )
gsl? ( sci-libs/gsl:= )
- jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825 )
+ jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825:= )
heif? ( >=media-libs/libheif-1.11:=[x265] )
mypaint-brush-engine? ( media-libs/libmypaint:= )
openexr? ( media-libs/openexr:= )
@@ -91,6 +91,7 @@ PATCHES=(
"${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
+ "${FILESDIR}/${P}-libjxl-0.9.patch" # bug 922524
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2024-07-13 18:02 Sam James
0 siblings, 0 replies; 28+ messages in thread
From: Sam James @ 2024-07-13 18:02 UTC (permalink / raw
To: gentoo-commits
commit: ffd02e2a654e36bfb98be35f57d486a8b7bc9d9f
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Wed Jan 10 15:43:49 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=ffd02e2a
media-gfx/krita: Bump to 5.2.2
Closes: https://bugs.gentoo.org/921972
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/krita/Manifest | 1 +
media-gfx/krita/files/krita-5.2.2-fftw.patch | 18 +++
media-gfx/krita/files/krita-5.2.2-openjpeg.patch | 14 +++
media-gfx/krita/krita-5.2.2.ebuild | 134 +++++++++++++++++++++++
media-gfx/krita/metadata.xml | 2 +
5 files changed, 169 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index a0de04766714..48438ab65058 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/media-gfx/krita/files/krita-5.2.2-fftw.patch b/media-gfx/krita/files/krita-5.2.2-fftw.patch
new file mode 100644
index 000000000000..b805be6a21c6
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.2-fftw.patch
@@ -0,0 +1,18 @@
+Disable the cmake find_package method. It will instead fallback to use pkgconfig.
+Without this, it will fail to find fftw3 and error out.
+
+--- a/cmake/modules/FindFFTW3.cmake 2023-11-24 19:59:45.904059240 +0100
++++ b/cmake/modules/FindFFTW3.cmake 2023-11-24 20:00:17.029563107 +0100
+@@ -74,9 +74,9 @@
+ endforeach()
+ mark_as_advanced(PKG_FFTW_CONFIG_DIR)
+
+-find_package(FFTW3 QUIET NO_MODULE
+- HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3 /usr/local/lib/cmake/fftw3
+-)
++#find_package(FFTW3 QUIET NO_MODULE
++# HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3 /usr/local/lib/cmake/fftw3
++#)
+ mark_as_advanced(FFTW3_DIR)
+
+ # if we found the FFTW3 CMake package then we can start
diff --git a/media-gfx/krita/files/krita-5.2.2-openjpeg.patch b/media-gfx/krita/files/krita-5.2.2-openjpeg.patch
new file mode 100644
index 000000000000..e21ed33a26b3
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.2-openjpeg.patch
@@ -0,0 +1,14 @@
+Disable the cmake find_package method. It will instead fallback to use pkgconfig.
+Without this, it will fail to find openjpeg and error out.
+
+--- a/cmake/modules/FindOpenJPEG.cmake 2023-11-24 19:58:50.650715138 +0100
++++ b/cmake/modules/FindOpenJPEG.cmake 2023-11-24 19:58:57.217399495 +0100
+@@ -45,7 +45,7 @@
+
+ # No hints in this case because the library versions semantically
+ # the module folder, and it's also capitalized, so let CMake handle it.
+-find_package(OPENJPEG QUIET NO_MODULE NAMES OpenJPEG)
++#find_package(OPENJPEG QUIET NO_MODULE NAMES OpenJPEG)
+ mark_as_advanced(OPENJPEG_DIR)
+
+ if(OPENJPEG_FOUND)
diff --git a/media-gfx/krita/krita-5.2.2.ebuild b/media-gfx/krita/krita-5.2.2.ebuild
new file mode 100644
index 000000000000..c5dabbfab439
--- /dev/null
+++ b/media-gfx/krita/krita-5.2.2.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.82.0
+QTMIN=5.15.5
+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"
+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/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] )
+ mypaint-brush-engine? ( media-libs/libmypaint:= )
+ openexr? ( media-libs/openexr:= )
+ pdf? ( app-text/poppler[qt5] )
+ media? ( media-libs/mlt:= )
+ raw? ( kde-apps/libkdcraw:= )
+ xsimd? ( dev-cpp/xsimd )
+ webp? ( >=media-libs/libwebp-1.2.0:= )
+
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-cpp/eigen:3
+ dev-lang/perl
+ sys-devel/gettext
+ dev-libs/immer
+ dev-libs/lager
+ dev-libs/zug
+ dev-libs/libunibreak
+"
+
+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"
+)
+
+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 mypaint-brush-engine LibMyPaint)
+ $(cmake_use_find_package openexr OpenEXR)
+ $(cmake_use_find_package pdf Poppler)
+ $(cmake_use_find_package media Mlt7)
+ $(cmake_use_find_package raw KF5KDcraw)
+ $(cmake_use_find_package xsimd xsimd)
+ $(cmake_use_find_package webp WebP)
+ )
+
+ ecm_src_configure
+}
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index ff6c095b3acd..c586507e3736 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -10,7 +10,9 @@
</upstream>
<use>
<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
+ <flag name="media">Enable sound support for animations via <pkg>media-libs/mlt</pkg></flag>
<flag name="mypaint-brush-engine">Enable MyPaint brush engine support <pkg>media-libs/libmypaint</pkg></flag>
<flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag>
+ <flag name="xsimd">Enable usage of SIMD instructions via <pkg>dev-cpp/xsimd</pkg></flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2024-07-13 19:59 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2024-07-13 19:59 UTC (permalink / raw
To: gentoo-commits
commit: c6d41e333a0698baa4b5c1596ffc5c8fd7e866f2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 19:32:23 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=c6d41e33
media-gfx/krita: drop 5.2.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 1 -
media-gfx/krita/files/krita-5.2.2-openjpeg.patch | 14 ---
media-gfx/krita/krita-5.2.2.ebuild | 137 -----------------------
3 files changed, 152 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 04a9cb5b8e5f..a82d45e70405 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,4 +1,3 @@
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.2-openjpeg.patch b/media-gfx/krita/files/krita-5.2.2-openjpeg.patch
deleted file mode 100644
index e21ed33a26b3..000000000000
--- a/media-gfx/krita/files/krita-5.2.2-openjpeg.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Disable the cmake find_package method. It will instead fallback to use pkgconfig.
-Without this, it will fail to find openjpeg and error out.
-
---- a/cmake/modules/FindOpenJPEG.cmake 2023-11-24 19:58:50.650715138 +0100
-+++ b/cmake/modules/FindOpenJPEG.cmake 2023-11-24 19:58:57.217399495 +0100
-@@ -45,7 +45,7 @@
-
- # No hints in this case because the library versions semantically
- # the module folder, and it's also capitalized, so let CMake handle it.
--find_package(OPENJPEG QUIET NO_MODULE NAMES OpenJPEG)
-+#find_package(OPENJPEG QUIET NO_MODULE NAMES OpenJPEG)
- mark_as_advanced(OPENJPEG_DIR)
-
- if(OPENJPEG_FOUND)
diff --git a/media-gfx/krita/krita-5.2.2.ebuild b/media-gfx/krita/krita-5.2.2.ebuild
deleted file mode 100644
index f9d1afb09ff6..000000000000
--- a/media-gfx/krita/krita-5.2.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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.82.0
-QTMIN=5.15.5
-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"
-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] )
- mypaint-brush-engine? ( media-libs/libmypaint:= )
- openexr? ( media-libs/openexr:= )
- pdf? ( app-text/poppler[qt5] )
- media? ( media-libs/mlt:= )
- raw? ( kde-apps/libkdcraw:= )
- xsimd? ( dev-cpp/xsimd )
- webp? ( >=media-libs/libwebp-1.2.0:= )
-
-"
-DEPEND="
- ${RDEPEND}
- dev-libs/immer
- dev-libs/lager
- dev-libs/zug
-"
-BDEPEND="
- dev-cpp/eigen:3
- dev-lang/perl
- sys-devel/gettext
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.3.1-tests-optional.patch"
- "${FILESDIR}/${PN}-5.1.5-sip-6.8.patch" # bug 919139
- "${FILESDIR}/${P}-libjxl-0.9.patch" # bug 922524
- "${FILESDIR}/${P}-fftw.patch"
- "${FILESDIR}/${P}-openjpeg.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=(
- -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 mypaint-brush-engine LibMyPaint)
- $(cmake_use_find_package openexr OpenEXR)
- $(cmake_use_find_package pdf Poppler)
- $(cmake_use_find_package media Mlt7)
- $(cmake_use_find_package raw KF5KDcraw)
- $(cmake_use_find_package xsimd xsimd)
- $(cmake_use_find_package webp WebP)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2024-11-09 15:21 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2024-11-09 15:21 UTC (permalink / raw
To: gentoo-commits
commit: 8dd5f0f7a9f4843408399974ebb8dc35de768e33
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 15:16:23 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 15:21:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dd5f0f7
media-gfx/krita: enable py3.13
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=488680
See also: https://bugzilla.redhat.com/show_bug.cgi?id=2278646
Closes: https://bugs.gentoo.org/943149
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/files/krita-5.2.6-py3.13.patch | 120 +++++++++++++++++++++++++
media-gfx/krita/krita-5.2.6.ebuild | 4 +-
2 files changed, 123 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-5.2.6-py3.13.patch b/media-gfx/krita/files/krita-5.2.6-py3.13.patch
new file mode 100644
index 000000000000..6714059895d0
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.6-py3.13.patch
@@ -0,0 +1,120 @@
+From 0f43ec3158225092f6a02422eb90c56421326570 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Tue, 18 Jun 2024 22:05:34 +0200
+Subject: [PATCH] Changes to build pykrita with Python 3.13
+
+Python 3.11 deprecated Py_SetPath() in 2022 and Python 3.13 removed it.
+Instead one needs to use the new PyConfig API (PEP 587) added to Python
+3.8.
+
+Fix: #488680
+---
+ .../extensions/pykrita/plugin/utilities.cpp | 61 +++++++++++++++++--
+ plugins/extensions/pykrita/plugin/utilities.h | 4 +-
+ 2 files changed, 57 insertions(+), 8 deletions(-)
+
+diff --git a/plugins/extensions/pykrita/plugin/utilities.cpp b/plugins/extensions/pykrita/plugin/utilities.cpp
+index 4f58183238..1e497b2681 100644
+--- a/plugins/extensions/pykrita/plugin/utilities.cpp
++++ b/plugins/extensions/pykrita/plugin/utilities.cpp
+@@ -19,8 +19,10 @@
+ #include <cmath>
+ #include <Python.h>
+
++#include <QDebug>
+ #include <QDir>
+ #include <QLibrary>
++#include <QProcessEnvironment>
+ #include <QString>
+ #include <QStringList>
+ #include <QVector>
+@@ -412,18 +414,65 @@ bool Python::setPath(const QStringList& scriptPaths)
+ joinedPaths = joinedPaths + pathSeparator + originalPath;
+ }
+ dbgScript << "Setting python paths:" << joinedPaths;
++
+ #ifdef Q_OS_WIN
+- QVector<wchar_t> joinedPathsWChars(joinedPaths.size() + 1, 0);
+- joinedPaths.toWCharArray(joinedPathsWChars.data());
+- Py_SetPath(joinedPathsWChars.data());
++ PyStatus status;
++ PyConfig config;
++ PyConfig_InitPythonConfig(&config);
++
++ for (const QString& path : joinedPaths.split(pathSeparator)) {
++ status = PyWideStringList_Append(&config.module_search_paths, path.toStdWString().c_str());
++ if (PyStatus_Exception(status)) {
++ qDebug() << "Error appending to PyWideStringList:" << status.err_msg;
++ dbgScript << "Error appending to PyWideStringList";
++ return false;
++ }
++ }
++
++ config.module_search_paths_set = true;
++ qDebug() << "Set module_search_paths";
++
++ status = Py_InitializeFromConfig(&config);
++ if (PyStatus_Exception(status)) {
++ qDebug() << "Cannot initialize Py_InitializeFromConfig:" << status.err_msg;
++ Py_ExitStatusException(status);
++ PyConfig_Clear(&config);
++ dbgScript << "Cannot initialize Py_InitializeFromConfig config";
++ return false;
++ }
++
++ PyConfig_Clear(&config);
+ #else
+ if (runningInBundle) {
+- QVector<wchar_t> joinedPathsWChars(joinedPaths.size() + 1, 0);
+- joinedPaths.toWCharArray(joinedPathsWChars.data());
+- Py_SetPath(joinedPathsWChars.data());
++ PyStatus status;
++ PyConfig config;
++ PyConfig_InitPythonConfig(&config);
++
++ for (const QString& path : joinedPaths.split(pathSeparator)) {
++ status = PyWideStringList_Append(&config.module_search_paths, path.toStdWString().c_str());
++ if (PyStatus_Exception(status)) {
++ qDebug() << "Error appending to PyWideStringList:" << status.err_msg;
++ dbgScript << "Error appending to PyWideStringList";
++ return false;
++ }
++ }
++
++ config.module_search_paths_set = true;
++
++ status = Py_InitializeFromConfig(&config);
++ if (PyStatus_Exception(status)) {
++ Py_ExitStatusException(status);
++ qDebug() << "Cannot initialize Py_InitializeFromConfig 2:" << status.err_msg;
++ PyConfig_Clear(&config);
++ dbgScript << "Cannot initialize Py_InitializeFromConfig config";
++ return false;
++ }
++
++ PyConfig_Clear(&config);
+ }
+ else {
+ qputenv("PYTHONPATH", joinedPaths.toLocal8Bit());
++ qDebug() << "Set PYTHONPATH environment variable";
+ }
+ #endif
+ isPythonPathSet = true;
+diff --git a/plugins/extensions/pykrita/plugin/utilities.h b/plugins/extensions/pykrita/plugin/utilities.h
+index fb309bd0b8..aec47da239 100644
+--- a/plugins/extensions/pykrita/plugin/utilities.h
++++ b/plugins/extensions/pykrita/plugin/utilities.h
+@@ -81,8 +81,8 @@ public:
+ static bool libraryLoad();
+
+ /**
+- * Set the Python paths by calling Py_SetPath. This should be called before
+- * initialization to ensure the proper libraries get loaded.
++ * Set the Python paths by calling Py_InitializeFromConfig. This should be
++ * called before initialization to ensure the proper libraries get loaded.
+ */
+ static bool setPath(const QStringList& scriptPaths);
+
+--
+2.45.2
+
diff --git a/media-gfx/krita/krita-5.2.6.ebuild b/media-gfx/krita/krita-5.2.6.ebuild
index 0a1c86338154..dd17eae36561 100644
--- a/media-gfx/krita/krita-5.2.6.ebuild
+++ b/media-gfx/krita/krita-5.2.6.ebuild
@@ -4,7 +4,7 @@
EAPI=8
ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
KFMIN=5.115.0
QTMIN=5.15.12
inherit ecm kde.org python-single-r1
@@ -96,6 +96,8 @@ PATCHES=(
# downstream
"${FILESDIR}"/${PN}-5.2.3-tests-optional.patch
"${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
+ # Fedora, non-upstreamed:
+ "${FILESDIR}"/${P}-py3.13.patch # bug 943149
# git master
"${FILESDIR}"/${PN}-5.1.5-sip-6.8.patch # bug 919139
)
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
@ 2024-11-25 22:39 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2024-11-25 22:39 UTC (permalink / raw
To: gentoo-commits
commit: db2f9caee1f0c9e691cd4d873619d313fb48f7d9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 22:38:39 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 22:39:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db2f9cae
media-gfx/krita: drop 5.1.5
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/krita/Manifest | 2 -
.../krita/files/krita-4.3.1-tests-optional.patch | 80 -------------
media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch | 73 ------------
media-gfx/krita/files/krita-5.1.5-lto.patch | 58 ----------
media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch | 37 ------
media-gfx/krita/krita-5.1.5.ebuild | 128 ---------------------
media-gfx/krita/metadata.xml | 1 -
7 files changed, 379 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 57e97f2ef6ae..6071638e85ad 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,4 +1,2 @@
-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.3.tar.xz 186685456 BLAKE2B 42943e7ebffdb46b9da085b2069701895e37ad9c457273b9217a095f1dfdf15c715cde0b88d440abb2d73dee656730da38844f11f27022885f87bb9cc9adab26 SHA512 69a0477e3119765dd53e0502fe5a64fcdc921dfcba3ddc5dec5c1bc4342a77b172b38276f134cc56f79741e6c47b51ef51786aadf0d178ce3955e24a9fd27b74
DIST krita-5.2.6.tar.xz 186560016 BLAKE2B 788385983b371626214898391b08b1276a74b2ee3c9f01c1b1ae19d8791bfcf1ea1f59f6304643aeb6b16a2559fd2e45464596c721eb5d53546672d0efe17903 SHA512 8502ebef11ae066b298e999aba06df7858605cca14b889cec167b7ee3953b8ed86459b44ed90508d59bd7a9968cc9957309cefaa140a8d20293344f4dcb7fea7
diff --git a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
deleted file mode 100644
index 37f2ac50ffda..000000000000
--- a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2e9369281d44a2701ac7364568d381cca0d92ec5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 12 Jul 2020 18:55:31 +0200
-Subject: [PATCH] KritaAddBrokenUnitTest.cmake, MacroKritaAddBenchmark.cmake:
- Skip ecm_add_test early if Qt5::Test is not available
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- cmake/modules/KritaAddBrokenUnitTest.cmake | 4 ++++
- cmake/modules/MacroKritaAddBenchmark.cmake | 4 ++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/cmake/modules/KritaAddBrokenUnitTest.cmake b/cmake/modules/KritaAddBrokenUnitTest.cmake
-index b7d0e8d852..901a0a1f99 100644
---- a/cmake/modules/KritaAddBrokenUnitTest.cmake
-+++ b/cmake/modules/KritaAddBrokenUnitTest.cmake
-@@ -23,6 +23,10 @@ function(KRITA_ADD_BROKEN_UNIT_TEST)
- message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"")
- endif()
-
-+ if(NOT TARGET Qt5::Test)
-+ return()
-+ endif()
-+
- set(_testname ${ARG_NAME_PREFIX}${_targetname})
-
- # add test to the global list of disabled tests
-diff --git a/cmake/modules/MacroKritaAddBenchmark.cmake b/cmake/modules/MacroKritaAddBenchmark.cmake
-index c748d8e319..f804d9b8f4 100644
---- a/cmake/modules/MacroKritaAddBenchmark.cmake
-+++ b/cmake/modules/MacroKritaAddBenchmark.cmake
-@@ -23,6 +23,10 @@ macro (KRITA_ADD_BENCHMARK _test_NAME)
- set(_nogui "NOGUI")
- endif()
-
-+ if(NOT TARGET Qt5::Test)
-+ return()
-+ endif()
-+
- add_executable( ${_test_NAME} ${_srcList} )
- ecm_mark_as_test(${_test_NAME})
-
---
-2.27.0
-
-From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 17 Jun 2020 20:18:28 +0200
-Subject: [PATCH] Don't build tests when testing not requested
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-
-diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
-index cbdac265d2..1a50c1620a 100644
---- a/libs/flake/CMakeLists.txt
-+++ b/libs/flake/CMakeLists.txt
-@@ -9,8 +9,10 @@ include_directories(
- )
-
- add_subdirectory(styles)
--add_subdirectory(tests)
--add_subdirectory(resources/tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+ add_subdirectory(resources/tests)
-+endif()
-
- set(kritaflake_SRCS
- KoGradientHelper.cpp
-diff --git a/libs/image/tiles3/CMakeLists.txt b/libs/image/tiles3/CMakeLists.txt
-index 88c0516360..01f2383ddb 100644
---- a/libs/image/tiles3/CMakeLists.txt
-+++ b/libs/image/tiles3/CMakeLists.txt
-@@ -1 +1,3 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
---
-2.27.0
diff --git a/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch b/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch
deleted file mode 100644
index a578f22c67f9..000000000000
--- a/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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()))) {
---
-GitLab
-
diff --git a/media-gfx/krita/files/krita-5.1.5-lto.patch b/media-gfx/krita/files/krita-5.1.5-lto.patch
deleted file mode 100644
index 0cccee5be00e..000000000000
--- a/media-gfx/krita/files/krita-5.1.5-lto.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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/files/krita-5.1.5-ocio-2.3.0.patch b/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch
deleted file mode 100644
index 534e24469e8a..000000000000
--- a/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 48edd05f32241c537cedf2831efc5eb91a112291 Mon Sep 17 00:00:00 2001
-From: killy |0veufOrever <80536642@qq.com>
-Date: Tue, 19 Sep 2023 02:18:54 +0000
-Subject: [PATCH] Update OCIO to version 2.3.0
-
----
- 3rdparty/ext_ocio/CMakeLists.txt | 4 ++--
- plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-From 21d384fe9fafde2f45f7339a2234f4022c53152f Mon Sep 17 00:00:00 2001
-From: killy |0veufOrever <80536642@qq.com>
-Date: Tue, 19 Sep 2023 03:17:17 +0000
-Subject: [PATCH] Dimensions are not required when the OCIO version is less
- than 2.3.0
-
----
- plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
---- a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
-+++ b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
-@@ -507,7 +507,13 @@
- unsigned height = 0;
- OCIO::GpuShaderDesc::TextureType channel = OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL;
- OCIO::Interpolation interpolation = OCIO::INTERP_LINEAR;
-+
-+#if OCIO_VERSION_HEX >= 0x2030000
-+ OCIO::GpuShaderCreator::TextureDimensions dimensions;
-+ shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, dimensions, interpolation);
-+#else
- shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, interpolation);
-+#endif
-
- if (!textureName || !*textureName || !samplerName || !*samplerName || width == 0) {
- errOpenGL << "The texture data is corrupted";
diff --git a/media-gfx/krita/krita-5.1.5.ebuild b/media-gfx/krita/krita-5.1.5.ebuild
deleted file mode 100644
index 9c80758f6367..000000000000
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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.82.0
-QTMIN=5.15.5
-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/${P}-exiv2-0.28.patch.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 jpegxl +mypaint-brush-engine openexr pdf qtmedia +raw webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/boost:=
- 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:= )
- jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825:= )
- heif? ( >=media-libs/libheif-1.11:=[x265] )
- 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}"
-BDEPEND="
- dev-cpp/eigen:3
- dev-lang/perl
- sys-devel/gettext
-"
-
-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
- "${FILESDIR}/${P}-libjxl-0.9.patch" # bug 922524
- "${FILESDIR}/${P}-lto.patch" # bug 922520
-)
-
-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
- -DCMAKE_DISABLE_FIND_PACKAGE_xsimd=ON # not packaged
- $(cmake_use_find_package color-management OpenColorIO)
- $(cmake_use_find_package fftw FFTW3)
- $(cmake_use_find_package gif GIF)
- $(cmake_use_find_package gsl GSL)
- $(cmake_use_find_package heif HEIF)
- $(cmake_use_find_package jpegxl JPEGXL)
- $(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 webp WebP)
- )
-
- ecm_src_configure
-}
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index c586507e3736..82ce837b7102 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -12,7 +12,6 @@
<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
<flag name="media">Enable sound support for animations via <pkg>media-libs/mlt</pkg></flag>
<flag name="mypaint-brush-engine">Enable MyPaint brush engine support <pkg>media-libs/libmypaint</pkg></flag>
- <flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag>
<flag name="xsimd">Enable usage of SIMD instructions via <pkg>dev-cpp/xsimd</pkg></flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 28+ messages in thread
end of thread, other threads:[~2024-11-25 22:39 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-01 14:26 [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-11-25 22:39 Andreas Sturmlechner
2024-11-09 15:21 Andreas Sturmlechner
2024-07-13 19:59 Andreas Sturmlechner
2024-07-13 18:02 Sam James
2024-01-21 19:15 Andreas Sturmlechner
2023-10-03 19:21 Andreas Sturmlechner
2023-01-24 16:12 Andreas Sturmlechner
2022-06-06 1:27 Sam James
2022-02-19 16:27 Andreas Sturmlechner
2021-12-29 16:34 Andreas Sturmlechner
2021-02-23 19:53 Andreas Sturmlechner
2020-10-31 9:23 Andreas Sturmlechner
2020-04-18 19:33 Andreas Sturmlechner
2019-11-15 17:37 Andreas Sturmlechner
2019-07-31 9:45 Andreas Sturmlechner
2019-07-16 11:00 Andreas Sturmlechner
2019-06-27 17:21 Andreas Sturmlechner
2019-06-27 17:21 Andreas Sturmlechner
2019-04-03 18:59 Andreas Sturmlechner
2019-01-05 21:08 Andreas Sturmlechner
2018-10-15 16:46 Andreas Sturmlechner
2017-10-18 0:35 Andreas Sturmlechner
2017-10-15 20:47 Andreas Sturmlechner
2017-08-19 22:57 Andreas Sturmlechner
2017-02-15 16:40 Guilherme Amadio
2016-12-17 17:51 Johannes Huber
2016-09-22 11:40 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox