1 |
commit: f5c5e55ccfcf03e27eb30ee9ceeffd7a32a5d84b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 5 19:09:31 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 5 21:08:14 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5c5e55c |
7 |
|
8 |
media-gfx/krita: Fix exiv2-0.27 patch after upstream changes |
9 |
|
10 |
Add some additional fixes for regressions post-4.1.3 and -4.1.7. |
11 |
|
12 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
media-gfx/krita/Manifest | 1 + |
16 |
media-gfx/krita/krita-4.1.7-r1.ebuild | 126 ++++++++++++++++++++++++++++++++++ |
17 |
2 files changed, 127 insertions(+) |
18 |
|
19 |
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest |
20 |
index b0d4d31c5fa..e3b4fa1a135 100644 |
21 |
--- a/media-gfx/krita/Manifest |
22 |
+++ b/media-gfx/krita/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
DIST krita-4.1.5.tar.gz 243929094 BLAKE2B 7288717978e3370b435d73dc1f7005dc339f3d11e0023cb29abf964d16a5751107287d0eca31b053a2068978c4ed40b745358afc5667b71df98e41373171ff82 SHA512 7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499 |
25 |
+DIST krita-4.1.7-patchset.tar.xz 7208 BLAKE2B 0c5ca308d5d11878f63312a3980e66838d82a50ad64f67326a4cf35e36b500b22e5d56441516f65c3c09dd9ec7adf2f3b76ed90e3644c24e86a8ddbc499bf772 SHA512 a4290b7973cbe157c1d21f914130a3d43fcf6afa223795d1c52ca2ef22b552f0eac7714f97766d70cbfee2b88f5367c5da21baeb76febd7490cec5896791f3b4 |
26 |
DIST krita-4.1.7.101.tar.gz 243977488 BLAKE2B 84cfb0f7e6e7b63c3bb9303793c2b74f180982f66ed0756c8878bf8db64b5d9bf9d3cbdb28afba11a952737b02e46759a465d90a2e8822fbb382ae679ba3c3de SHA512 8558501684bc686f431660f3dffeb75575fea3bd23662b6c598c27173cce3145c3ec2caff32b56dd597c50907a69b2faab5259cc6f518f5a0e160cae89004791 |
27 |
|
28 |
diff --git a/media-gfx/krita/krita-4.1.7-r1.ebuild b/media-gfx/krita/krita-4.1.7-r1.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..9a37a3abbdb |
31 |
--- /dev/null |
32 |
+++ b/media-gfx/krita/krita-4.1.7-r1.ebuild |
33 |
@@ -0,0 +1,126 @@ |
34 |
+# Copyright 1999-2019 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=6 |
38 |
+ |
39 |
+KDE_TEST="forceoptional" |
40 |
+QT_MINIMAL="5.11.3" |
41 |
+VIRTUALX_REQUIRED="test" |
42 |
+PYTHON_COMPAT=( python3_{4,5,6,7} ) |
43 |
+inherit kde5 python-single-r1 |
44 |
+ |
45 |
+if [[ ${KDE_BUILD_TYPE} = release ]]; then |
46 |
+ SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.101.tar.gz |
47 |
+ https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz" |
48 |
+ KEYWORDS="~amd64 ~x86" |
49 |
+fi |
50 |
+ |
51 |
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" |
52 |
+HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/" |
53 |
+LICENSE="GPL-3" |
54 |
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc" |
55 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
56 |
+ |
57 |
+# FIXME: Drop subslot operator when QTBUG is fixed: |
58 |
+# https://bugreports.qt.io/browse/QTBUG-72488 |
59 |
+COMMON_DEPEND="${PYTHON_DEPS} |
60 |
+ $(add_frameworks_dep karchive) |
61 |
+ $(add_frameworks_dep kcompletion) |
62 |
+ $(add_frameworks_dep kconfig) |
63 |
+ $(add_frameworks_dep kcoreaddons) |
64 |
+ $(add_frameworks_dep kcrash) |
65 |
+ $(add_frameworks_dep kguiaddons) |
66 |
+ $(add_frameworks_dep ki18n) |
67 |
+ $(add_frameworks_dep kiconthemes) |
68 |
+ $(add_frameworks_dep kitemmodels) |
69 |
+ $(add_frameworks_dep kitemviews) |
70 |
+ $(add_frameworks_dep kwidgetsaddons) |
71 |
+ $(add_frameworks_dep kwindowsystem) |
72 |
+ $(add_frameworks_dep kxmlgui) |
73 |
+ $(add_qt_dep qtconcurrent) |
74 |
+ $(add_qt_dep qtdbus) |
75 |
+ $(add_qt_dep qtdeclarative) |
76 |
+ $(add_qt_dep qtgui '-gles2') |
77 |
+ $(add_qt_dep qtnetwork) |
78 |
+ $(add_qt_dep qtprintsupport) |
79 |
+ $(add_qt_dep qtsvg) |
80 |
+ $(add_qt_dep qtwidgets) |
81 |
+ $(add_qt_dep qtx11extras) |
82 |
+ $(add_qt_dep qtxml) |
83 |
+ dev-libs/boost:= |
84 |
+ dev-python/PyQt5[${PYTHON_USEDEP}] |
85 |
+ dev-python/sip[${PYTHON_USEDEP}] |
86 |
+ media-gfx/exiv2:= |
87 |
+ media-libs/lcms |
88 |
+ media-libs/libpng:0= |
89 |
+ sys-libs/zlib |
90 |
+ virtual/opengl |
91 |
+ x11-libs/libX11 |
92 |
+ x11-libs/libxcb |
93 |
+ x11-libs/libXi |
94 |
+ color-management? ( media-libs/opencolorio ) |
95 |
+ fftw? ( sci-libs/fftw:3.0= ) |
96 |
+ gif? ( media-libs/giflib ) |
97 |
+ gsl? ( sci-libs/gsl:= ) |
98 |
+ jpeg? ( virtual/jpeg:0 ) |
99 |
+ heif? ( media-libs/libheif:= ) |
100 |
+ openexr? ( |
101 |
+ media-libs/ilmbase:= |
102 |
+ media-libs/openexr |
103 |
+ ) |
104 |
+ pdf? ( app-text/poppler[qt5] ) |
105 |
+ qtmedia? ( $(add_qt_dep qtmultimedia) ) |
106 |
+ raw? ( media-libs/libraw:= ) |
107 |
+ tiff? ( media-libs/tiff:0 ) |
108 |
+" |
109 |
+DEPEND="${COMMON_DEPEND} |
110 |
+ dev-cpp/eigen:3 |
111 |
+ dev-lang/perl |
112 |
+ sys-devel/gettext |
113 |
+ vc? ( >=dev-libs/vc-1.1.0 ) |
114 |
+" |
115 |
+RDEPEND="${COMMON_DEPEND} |
116 |
+ !app-office/calligra:4[calligra_features_krita] |
117 |
+ !app-office/calligra-l10n:4[calligra_features_krita(+)] |
118 |
+" |
119 |
+ |
120 |
+# bug 630508 |
121 |
+RESTRICT+=" test" |
122 |
+ |
123 |
+PATCHES=( |
124 |
+ "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" |
125 |
+ "${WORKDIR}/${P}-exiv2-0.27.patch" |
126 |
+ "${WORKDIR}/${P}-resize-hud.patch" |
127 |
+ "${WORKDIR}/${P}-overview-docker.patch" |
128 |
+ "${WORKDIR}/${P}-assert-error.patch" |
129 |
+) |
130 |
+ |
131 |
+S="${S}.101" |
132 |
+ |
133 |
+pkg_setup() { |
134 |
+ python-single-r1_pkg_setup |
135 |
+ kde5_pkg_setup |
136 |
+} |
137 |
+ |
138 |
+src_configure() { |
139 |
+ # Prevent sandbox violation from FindPyQt5.py module |
140 |
+ # See Gentoo-bug 655918 |
141 |
+ addpredict /dev/dri |
142 |
+ |
143 |
+ local mycmakeargs=( |
144 |
+ $(cmake-utils_use_find_package color-management OCIO) |
145 |
+ $(cmake-utils_use_find_package fftw FFTW3) |
146 |
+ $(cmake-utils_use_find_package gif GIF) |
147 |
+ $(cmake-utils_use_find_package gsl GSL) |
148 |
+ $(cmake-utils_use_find_package heif HEIF) |
149 |
+ $(cmake-utils_use_find_package jpeg JPEG) |
150 |
+ $(cmake-utils_use_find_package openexr OpenEXR) |
151 |
+ $(cmake-utils_use_find_package pdf Poppler) |
152 |
+ $(cmake-utils_use_find_package qtmedia Qt5Multimedia) |
153 |
+ $(cmake-utils_use_find_package raw LibRaw) |
154 |
+ $(cmake-utils_use_find_package tiff TIFF) |
155 |
+ $(cmake-utils_use_find_package vc Vc) |
156 |
+ ) |
157 |
+ |
158 |
+ kde5_src_configure |
159 |
+} |