commit:     f5c5e55ccfcf03e27eb30ee9ceeffd7a32a5d84b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  5 19:09:31 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  5 21:08:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5c5e55c

media-gfx/krita: Fix exiv2-0.27 patch after upstream changes

Add some additional fixes for regressions post-4.1.3 and -4.1.7.

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/krita/Manifest              |   1 +
 media-gfx/krita/krita-4.1.7-r1.ebuild | 126 ++++++++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index b0d4d31c5fa..e3b4fa1a135 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.1.5.tar.gz 243929094 BLAKE2B 
7288717978e3370b435d73dc1f7005dc339f3d11e0023cb29abf964d16a5751107287d0eca31b053a2068978c4ed40b745358afc5667b71df98e41373171ff82
 SHA512 
7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499
+DIST krita-4.1.7-patchset.tar.xz 7208 BLAKE2B 
0c5ca308d5d11878f63312a3980e66838d82a50ad64f67326a4cf35e36b500b22e5d56441516f65c3c09dd9ec7adf2f3b76ed90e3644c24e86a8ddbc499bf772
 SHA512 
a4290b7973cbe157c1d21f914130a3d43fcf6afa223795d1c52ca2ef22b552f0eac7714f97766d70cbfee2b88f5367c5da21baeb76febd7490cec5896791f3b4
 DIST krita-4.1.7.101.tar.gz 243977488 BLAKE2B 
84cfb0f7e6e7b63c3bb9303793c2b74f180982f66ed0756c8878bf8db64b5d9bf9d3cbdb28afba11a952737b02e46759a465d90a2e8822fbb382ae679ba3c3de
 SHA512 
8558501684bc686f431660f3dffeb75575fea3bd23662b6c598c27173cce3145c3ec2caff32b56dd597c50907a69b2faab5259cc6f518f5a0e160cae89004791

diff --git a/media-gfx/krita/krita-4.1.7-r1.ebuild 
b/media-gfx/krita/krita-4.1.7-r1.ebuild
new file mode 100644
index 00000000000..9a37a3abbdb
--- /dev/null
+++ b/media-gfx/krita/krita-4.1.7-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2019 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
+               https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz";
+       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"
+       "${WORKDIR}/${P}-exiv2-0.27.patch"
+       "${WORKDIR}/${P}-resize-hud.patch"
+       "${WORKDIR}/${P}-overview-docker.patch"
+       "${WORKDIR}/${P}-assert-error.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
+}

Reply via email to