1 |
commit: c10f0b62bc6c5391b2943028fc073ce837d071aa |
2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
3 |
AuthorDate: Sat Nov 16 01:29:29 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 1 03:15:19 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10f0b62 |
7 |
|
8 |
media-gfx/gimp: 2.10.14 version bump |
9 |
|
10 |
The patch from this commit resolves two issues mentioned below. |
11 |
They both could be closed after the 2.10.{10,12} revision bump |
12 |
with addition of "gimp-2.10_fix_test-appdata.patch". |
13 |
|
14 |
Bug: https://bugs.gentoo.org/685210 |
15 |
Bug: https://bugs.gentoo.org/691070 |
16 |
|
17 |
Closes: https://bugs.gentoo.org/699064 |
18 |
|
19 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
20 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
21 |
|
22 |
media-gfx/gimp/Manifest | 1 + |
23 |
.../gimp/files/gimp-2.10_fix_test-appdata.patch | 14 ++ |
24 |
media-gfx/gimp/gimp-2.10.14.ebuild | 224 +++++++++++++++++++++ |
25 |
3 files changed, 239 insertions(+) |
26 |
|
27 |
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest |
28 |
index 66dd90d4dc5..a767a47d51d 100644 |
29 |
--- a/media-gfx/gimp/Manifest |
30 |
+++ b/media-gfx/gimp/Manifest |
31 |
@@ -1,5 +1,6 @@ |
32 |
DIST gimp-2.10.10.tar.bz2 32408724 BLAKE2B 7d4f06d255d7b853f08c2a8bd9695b5cbc27a417f2f78aab56c970675430534b7c6f870168c5555369b873971b4ca3889565085cfc0cb9b2e1bb60c3bfe938bd SHA512 87caab9643a018e741e5e51c61220b7b282a66ed5bb723750cdf4139950f98c9ab246f4d6450420531d0e878c4561150efc4063cda896f08b25669bac4d1d172 |
33 |
DIST gimp-2.10.12.tar.bz2 32614932 BLAKE2B 93e0c6c3ac58335920a9ebcfa81c970f0c657757860ab255e8a584ec2fa0c4d97c639797419eef58d5ef076797f2437eade20c1dea02c18bcbd8bd0fb30a8069 SHA512 dd4af3f0fa6fca815d254b7f42aeff15412c38294f1f5bd491563e2b597fcb868e6adff9001b196a68e01cf49bde61cbb153b662b8da1aa1b4b1f7285879659f |
34 |
+DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b73d838c3ed56abb0a221c0eaec02e5c838f952d492069d55d89e4c3493c59b38aa2af87df8181f8979213e7659b SHA512 acbd095361d9211a5a23474693dd170ed76bf4ea5b1df69791f1d975ef5cdaba1e5fb9f5be9f592a360db5826d71eaaf464005075397cb6630070fe32833c030 |
35 |
DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999 SHA512 b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e |
36 |
DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6 |
37 |
DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02 |
38 |
|
39 |
diff --git a/media-gfx/gimp/files/gimp-2.10_fix_test-appdata.patch b/media-gfx/gimp/files/gimp-2.10_fix_test-appdata.patch |
40 |
new file mode 100644 |
41 |
index 00000000000..77b7b2f3cbd |
42 |
--- /dev/null |
43 |
+++ b/media-gfx/gimp/files/gimp-2.10_fix_test-appdata.patch |
44 |
@@ -0,0 +1,14 @@ |
45 |
+diff -Nur a/desktop/test-appdata.sh.in b/desktop/test-appdata.sh.in |
46 |
+--- a/desktop/test-appdata.sh.in 2019-04-07 14:38:14.000000000 +0300 |
47 |
++++ b/desktop/test-appdata.sh.in 2019-11-06 23:19:32.000000000 +0300 |
48 |
+@@ -2,8 +2,8 @@ |
49 |
+ |
50 |
+ # TODO: use validate-strict when the last errors for a strict validation |
51 |
+ # are fixed. |
52 |
+-appstream-util validate-relax ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml && \ |
53 |
+-appstream-util validate-relax ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/gimp-data-extras.metainfo.xml && \ |
54 |
++appstream-util validate-relax --nonet ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml && \ |
55 |
++appstream-util validate-relax --nonet ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/gimp-data-extras.metainfo.xml && \ |
56 |
+ if [ $(expr @GIMP_MICRO_VERSION@ % 2) = 0 ]; then |
57 |
+ grep TODO ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml |
58 |
+ if [ $? = 0 ]; then |
59 |
|
60 |
diff --git a/media-gfx/gimp/gimp-2.10.14.ebuild b/media-gfx/gimp/gimp-2.10.14.ebuild |
61 |
new file mode 100644 |
62 |
index 00000000000..0217d66c15c |
63 |
--- /dev/null |
64 |
+++ b/media-gfx/gimp/gimp-2.10.14.ebuild |
65 |
@@ -0,0 +1,224 @@ |
66 |
+# Copyright 1999-2019 Gentoo Authors |
67 |
+# Distributed under the terms of the GNU General Public License v2 |
68 |
+ |
69 |
+EAPI=6 |
70 |
+PYTHON_COMPAT=( python2_7 ) |
71 |
+GNOME2_EAUTORECONF=yes |
72 |
+ |
73 |
+inherit autotools gnome2 python-single-r1 virtualx |
74 |
+ |
75 |
+DESCRIPTION="GNU Image Manipulation Program" |
76 |
+HOMEPAGE="https://www.gimp.org/" |
77 |
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2" |
78 |
+LICENSE="GPL-3 LGPL-3" |
79 |
+SLOT="2" |
80 |
+KEYWORDS="~amd64 ~x86" |
81 |
+ |
82 |
+IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse" |
83 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
84 |
+ |
85 |
+RESTRICT="!test? ( test )" |
86 |
+ |
87 |
+COMMON_DEPEND=" |
88 |
+ app-arch/bzip2 |
89 |
+ >=app-arch/xz-utils-5.0.0 |
90 |
+ >=app-text/poppler-0.50[cairo] |
91 |
+ >=app-text/poppler-data-0.4.7 |
92 |
+ >=dev-libs/atk-2.2.0 |
93 |
+ >=dev-libs/glib-2.56.0:2 |
94 |
+ dev-libs/libxml2 |
95 |
+ dev-libs/libxslt |
96 |
+ >=gnome-base/librsvg-2.40.6:2 |
97 |
+ >=media-gfx/mypaint-brushes-1.3.0 |
98 |
+ >=media-libs/babl-0.1.72 |
99 |
+ >=media-libs/fontconfig-2.12.4 |
100 |
+ >=media-libs/freetype-2.1.7 |
101 |
+ >=media-libs/gegl-0.4.18:0.4[cairo] |
102 |
+ >=media-libs/gexiv2-0.10.6 |
103 |
+ >=media-libs/harfbuzz-0.9.19 |
104 |
+ >=media-libs/lcms-2.8:2 |
105 |
+ >=media-libs/libmypaint-1.3.0:= |
106 |
+ >=media-libs/libpng-1.6.25:0= |
107 |
+ >=media-libs/tiff-3.5.7:0 |
108 |
+ net-libs/glib-networking[ssl] |
109 |
+ sys-libs/zlib |
110 |
+ virtual/jpeg:0 |
111 |
+ >=x11-libs/cairo-1.12.2 |
112 |
+ >=x11-libs/gdk-pixbuf-2.31:2 |
113 |
+ >=x11-libs/gtk+-2.24.32:2 |
114 |
+ x11-libs/libXcursor |
115 |
+ >=x11-libs/pango-1.29.4 |
116 |
+ aalib? ( media-libs/aalib ) |
117 |
+ alsa? ( >=media-libs/alsa-lib-1.0.0 ) |
118 |
+ aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) |
119 |
+ heif? ( >=media-libs/libheif-1.3.2:= ) |
120 |
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) |
121 |
+ mng? ( media-libs/libmng:= ) |
122 |
+ openexr? ( >=media-libs/openexr-1.6.1:= ) |
123 |
+ postscript? ( app-text/ghostscript-gpl ) |
124 |
+ python? ( |
125 |
+ ${PYTHON_DEPS} |
126 |
+ >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] |
127 |
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] |
128 |
+ ) |
129 |
+ udev? ( dev-libs/libgudev:= ) |
130 |
+ unwind? ( >=sys-libs/libunwind-1.1.0:= ) |
131 |
+ webp? ( >=media-libs/libwebp-0.6.0:= ) |
132 |
+ wmf? ( >=media-libs/libwmf-0.2.8 ) |
133 |
+ xpm? ( x11-libs/libXpm ) |
134 |
+" |
135 |
+ |
136 |
+RDEPEND=" |
137 |
+ ${COMMON_DEPEND} |
138 |
+ x11-themes/hicolor-icon-theme |
139 |
+ gnome? ( gnome-base/gvfs ) |
140 |
+" |
141 |
+ |
142 |
+DEPEND=" |
143 |
+ ${COMMON_DEPEND} |
144 |
+ >=dev-lang/perl-5.10.0 |
145 |
+ dev-libs/appstream-glib |
146 |
+ dev-util/gtk-update-icon-cache |
147 |
+ >=dev-util/intltool-0.40.1 |
148 |
+ sys-apps/findutils |
149 |
+ >=sys-devel/automake-1.11 |
150 |
+ >=sys-devel/gettext-0.19 |
151 |
+ >=sys-devel/libtool-2.2 |
152 |
+ virtual/pkgconfig |
153 |
+" |
154 |
+ |
155 |
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) |
156 |
+ |
157 |
+# Bugs 685210 (and duplicate 691070) |
158 |
+PATCHES=( |
159 |
+ "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" |
160 |
+) |
161 |
+ |
162 |
+pkg_setup() { |
163 |
+ if use python; then |
164 |
+ python-single-r1_pkg_setup |
165 |
+ fi |
166 |
+} |
167 |
+ |
168 |
+src_prepare() { |
169 |
+ sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 |
170 |
+ sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 |
171 |
+ |
172 |
+ gnome2_src_prepare # calls eautoreconf |
173 |
+ |
174 |
+ sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 |
175 |
+ fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test |
176 |
+} |
177 |
+ |
178 |
+_adjust_sandbox() { |
179 |
+ # Bugs #569738 and #591214 |
180 |
+ local nv |
181 |
+ for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do |
182 |
+ # We do not check for existence as they may show up later |
183 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 |
184 |
+ addwrite "${nv}" |
185 |
+ done |
186 |
+ |
187 |
+ addwrite /dev/dri/ # bugs #574038 and #684886 |
188 |
+ addwrite /dev/ati/ # bug #589198 |
189 |
+ addwrite /proc/mtrr # bug #589198 |
190 |
+} |
191 |
+ |
192 |
+src_configure() { |
193 |
+ _adjust_sandbox |
194 |
+ |
195 |
+ local myconf=( |
196 |
+ GEGL="${EPREFIX}"/usr/bin/gegl-0.4 |
197 |
+ GDBUS_CODEGEN="${EPREFIX}"/bin/false |
198 |
+ |
199 |
+ --enable-default-binary |
200 |
+ |
201 |
+ --enable-mp |
202 |
+ --with-appdata-test |
203 |
+ --with-bug-report-url=https://bugs.gentoo.org/ |
204 |
+ --with-xmc |
205 |
+ --without-libbacktrace |
206 |
+ --without-webkit |
207 |
+ --without-xvfb-run |
208 |
+ $(use_enable altivec) |
209 |
+ $(use_enable cpu_flags_x86_mmx mmx) |
210 |
+ $(use_enable cpu_flags_x86_sse sse) |
211 |
+ $(use_enable python) |
212 |
+ $(use_enable vector-icons) |
213 |
+ $(use_with aalib aa) |
214 |
+ $(use_with alsa) |
215 |
+ $(use_with !aqua x) |
216 |
+ $(use_with heif libheif) |
217 |
+ $(use_with jpeg2k jpeg2000) |
218 |
+ $(use_with mng libmng) |
219 |
+ $(use_with openexr) |
220 |
+ $(use_with postscript gs) |
221 |
+ $(use_with udev gudev) |
222 |
+ $(use_with unwind libunwind) |
223 |
+ $(use_with webp) |
224 |
+ $(use_with wmf) |
225 |
+ $(use_with xpm libxpm) |
226 |
+ ) |
227 |
+ |
228 |
+ gnome2_src_configure "${myconf[@]}" |
229 |
+} |
230 |
+ |
231 |
+src_compile() { |
232 |
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 |
233 |
+ gnome2_src_compile |
234 |
+} |
235 |
+ |
236 |
+# for https://bugs.gentoo.org/664938 |
237 |
+_rename_plugins() { |
238 |
+ einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' |
239 |
+ local prepend=gimp-org- |
240 |
+ ( |
241 |
+ cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1 |
242 |
+ for plugin_slash in $(ls -d1 */); do |
243 |
+ plugin=${plugin_slash%/} |
244 |
+ if [[ -f ${plugin}/${plugin} ]]; then |
245 |
+ # NOTE: Folder and file name need to match for Gimp to load that plug-in |
246 |
+ # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg" |
247 |
+ mv ${plugin}/{,${prepend}}${plugin} || exit 1 |
248 |
+ mv {,${prepend}}${plugin} || exit 1 |
249 |
+ fi |
250 |
+ done |
251 |
+ ) |
252 |
+} |
253 |
+ |
254 |
+src_test() { |
255 |
+ virtx emake check |
256 |
+} |
257 |
+ |
258 |
+src_install() { |
259 |
+ gnome2_src_install |
260 |
+ |
261 |
+ if use python; then |
262 |
+ python_optimize |
263 |
+ fi |
264 |
+ |
265 |
+ # Workaround for bug #321111 to give GIMP the least |
266 |
+ # precedence on PDF documents by default |
267 |
+ mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die |
268 |
+ |
269 |
+ find "${D}" -name '*.la' -type f -delete || die |
270 |
+ |
271 |
+ # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) |
272 |
+ local gimp_app_version=$(get_version_component_range 1-2) |
273 |
+ mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die |
274 |
+ |
275 |
+ # Remove gimp devel-docs html files if user doesn't need it |
276 |
+ if ! use doc; then |
277 |
+ rm -r "${ED%/}"/usr/share/gtk-doc || die |
278 |
+ fi |
279 |
+ |
280 |
+ _rename_plugins || die |
281 |
+} |
282 |
+ |
283 |
+pkg_postinst() { |
284 |
+ gnome2_pkg_postinst |
285 |
+} |
286 |
+ |
287 |
+pkg_postrm() { |
288 |
+ gnome2_pkg_postrm |
289 |
+} |