1 |
commit: 9a6d6221fad7b0e51264b3deb58896f5e43c75f1 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 26 10:30:39 2017 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 26 10:55:51 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a6d6221 |
7 |
|
8 |
x11-libs/gdk-pixbuf: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
x11-libs/gdk-pixbuf/Manifest | 2 - |
13 |
.../gdk-pixbuf-2.32.1-gint64-shift-overflow.patch | 81 ------------- |
14 |
.../gdk-pixbuf-2.32.1-lowmem-test-glibc.patch | 60 ---------- |
15 |
x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild | 127 --------------------- |
16 |
x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild | 121 -------------------- |
17 |
5 files changed, 391 deletions(-) |
18 |
|
19 |
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest |
20 |
index 2423c52..46964d6 100644 |
21 |
--- a/x11-libs/gdk-pixbuf/Manifest |
22 |
+++ b/x11-libs/gdk-pixbuf/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
-DIST gdk-pixbuf-2.32.1.tar.xz 2427908 SHA256 4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc SHA512 4c744f166e86c17cafebe0db9434794666b64850a60597e34675cf9b902e48e89c3ff45032a10899944ae59b6c0db63c1ff33c4d2c50846393e77bad3a3adec2 WHIRLPOOL 566b73752c1e478fdf7011c3d2222ea39eb13052741c70a0dffd6a0800e892e951207856b90e0d20c352981565682dec28c51fc4951f2236767e97c838d239a2 |
25 |
-DIST gdk-pixbuf-2.32.3.tar.xz 2430720 SHA256 2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031 SHA512 9eb9b87c8104cff9292bebc41c411d2ba4b7fcd9d24c1b99e6dfc8281b5a202a53045dd3095666e3614eba59d417a7c0f69789b2a9dd52ed53bb5df4a0dfd117 WHIRLPOOL 053c48d7f0890ed0f324225ccf4d16f9afd4fd70b878acc6b9ec1bfd9c0c732bc290447cce25ba37cbbdded89a183d112b6e9b4b53141c62690bf45846f675e1 |
26 |
DIST gdk-pixbuf-2.34.0.tar.xz 2709320 SHA256 d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879 SHA512 874aed9af0352592674f2bebd4d9b0a945932a410c9f0b776f45766c2f18d442a39c684cca69b1aca6d14f67f18e690489f388ff58699dbd0efbd13244a1a8b5 WHIRLPOOL c2f7b1ac0d2fa13a00c1bed37a66b9b13564e1cef5262db656c640b0256f821658f8e6d0e1e5a300a2af83847b15518d7e0c72995df877970bf44ad28e5fd416 |
27 |
DIST gdk-pixbuf-2.36.2.tar.xz 4877452 SHA256 3a082ad67d68b55970aed0b2034a06618167be98a42d5c70de736756b45d325d SHA512 34a569aee7a26af701edbc9bf895617dc59d1a7f98292c832885cff88733cb7f581253a5caeecf265712a07f975b7c7dfeda4050e7a81cb5c9de19b4b82d17ba WHIRLPOOL fb2871f32084a2c40cea9cd662167645d5458dd4b96faa9967356a5a95b3a173f8d54c41608dfae0344460ffd87441be0f3c465eef7dbae979e5c2d8fb92ff27 |
28 |
|
29 |
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch |
30 |
deleted file mode 100644 |
31 |
index 273956e..00000000 |
32 |
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch |
33 |
+++ /dev/null |
34 |
@@ -1,81 +0,0 @@ |
35 |
-From 2fb6bce8b3fdae67b8cdd93f253dad3743fc01b8 Mon Sep 17 00:00:00 2001 |
36 |
-From: Mike Gorse <mgorse@××××.com> |
37 |
-Date: Tue, 6 Oct 2015 11:46:24 -0500 |
38 |
-Subject: [PATCH] pixops: use gint64 in more places to avoid overflow when |
39 |
- shifting |
40 |
- |
41 |
---- |
42 |
- gdk-pixbuf/pixops/pixops.c | 34 +++++++++++++++++----------------- |
43 |
- 1 file changed, 17 insertions(+), 17 deletions(-) |
44 |
- |
45 |
-diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c |
46 |
-index b0abecd..6a4a096 100644 |
47 |
---- a/gdk-pixbuf/pixops/pixops.c |
48 |
-+++ b/gdk-pixbuf/pixops/pixops.c |
49 |
-@@ -354,11 +354,11 @@ pixops_composite_nearest (guchar *dest_buf, |
50 |
- double scale_y, |
51 |
- int overall_alpha) |
52 |
- { |
53 |
-- int i; |
54 |
-- int x; |
55 |
-- int x_step = (1 << SCALE_SHIFT) / scale_x; |
56 |
-- int y_step = (1 << SCALE_SHIFT) / scale_y; |
57 |
-- int xmax, xstart, xstop, x_pos, y_pos; |
58 |
-+ gint64 i; |
59 |
-+ gint64 x; |
60 |
-+ gint64 x_step = (1 << SCALE_SHIFT) / scale_x; |
61 |
-+ gint64 y_step = (1 << SCALE_SHIFT) / scale_y; |
62 |
-+ gint64 xmax, xstart, xstop, x_pos, y_pos; |
63 |
- const guchar *p; |
64 |
- unsigned int a0; |
65 |
- |
66 |
-@@ -524,13 +524,13 @@ pixops_composite_color_nearest (guchar *dest_buf, |
67 |
- guint32 color1, |
68 |
- guint32 color2) |
69 |
- { |
70 |
-- int i, j; |
71 |
-- int x; |
72 |
-- int x_step = (1 << SCALE_SHIFT) / scale_x; |
73 |
-- int y_step = (1 << SCALE_SHIFT) / scale_y; |
74 |
-+ gint64 i, j; |
75 |
-+ gint64 x; |
76 |
-+ gint64 x_step = (1 << SCALE_SHIFT) / scale_x; |
77 |
-+ gint64 y_step = (1 << SCALE_SHIFT) / scale_y; |
78 |
- int r1, g1, b1, r2, g2, b2; |
79 |
- int check_shift = get_check_shift (check_size); |
80 |
-- int xmax, xstart, xstop, x_pos, y_pos; |
81 |
-+ gint64 xmax, xstart, xstop, x_pos, y_pos; |
82 |
- const guchar *p; |
83 |
- unsigned int a0; |
84 |
- |
85 |
-@@ -1338,20 +1338,20 @@ pixops_process (guchar *dest_buf, |
86 |
- PixopsLineFunc line_func, |
87 |
- PixopsPixelFunc pixel_func) |
88 |
- { |
89 |
-- int i, j; |
90 |
-- int x, y; /* X and Y position in source (fixed_point) */ |
91 |
-+ gint64 i, j; |
92 |
-+ gint64 x, y; /* X and Y position in source (fixed_point) */ |
93 |
- |
94 |
- guchar **line_bufs; |
95 |
- int *filter_weights; |
96 |
- |
97 |
-- int x_step; |
98 |
-- int y_step; |
99 |
-+ gint64 x_step; |
100 |
-+ gint64 y_step; |
101 |
- |
102 |
- int check_shift; |
103 |
-- int scaled_x_offset; |
104 |
-+ gint64 scaled_x_offset; |
105 |
- |
106 |
-- int run_end_x; |
107 |
-- int run_end_index; |
108 |
-+ gint64 run_end_x; |
109 |
-+ gint64 run_end_index; |
110 |
- |
111 |
- x_step = (1 << SCALE_SHIFT) / scale_x; /* X step in source (fixed point) */ |
112 |
- y_step = (1 << SCALE_SHIFT) / scale_y; /* Y step in source (fixed point) */ |
113 |
--- |
114 |
-2.6.1 |
115 |
- |
116 |
|
117 |
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch |
118 |
deleted file mode 100644 |
119 |
index cb50899..00000000 |
120 |
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch |
121 |
+++ /dev/null |
122 |
@@ -1,60 +0,0 @@ |
123 |
-From e1fd25a3d0c18bd941f685bbdf5aa3812403a48e Mon Sep 17 00:00:00 2001 |
124 |
-From: Natanael Copa <ncopa@×××××××××××.org> |
125 |
-Date: Tue, 6 Oct 2015 09:11:38 +0200 |
126 |
-Subject: [PATCH] Run only pixbuf-lowmem test on GNU libc |
127 |
- |
128 |
-The test case depends on GNU libc specific internals so we only run it |
129 |
-on GNU libc. |
130 |
- |
131 |
-This fixes build on Linux with musl libc. |
132 |
- |
133 |
-https://bugzilla.gnome.org/show_bug.cgi?id=756078 |
134 |
---- |
135 |
- tests/Makefile.am | 5 ----- |
136 |
- tests/pixbuf-lowmem.c | 8 ++++++++ |
137 |
- 2 files changed, 8 insertions(+), 5 deletions(-) |
138 |
- |
139 |
-diff --git a/tests/Makefile.am b/tests/Makefile.am |
140 |
-index 1f09711..2a0325a 100644 |
141 |
---- a/tests/Makefile.am |
142 |
-+++ b/tests/Makefile.am |
143 |
-@@ -19,13 +19,8 @@ LDADD = \ |
144 |
- noinst_PROGRAMS += \ |
145 |
- pixbuf-read \ |
146 |
- pixbuf-random \ |
147 |
-- $(NULL) |
148 |
-- |
149 |
--if OS_LINUX |
150 |
--noinst_PROGRAMS += \ |
151 |
- pixbuf-lowmem \ |
152 |
- $(NULL) |
153 |
--endif |
154 |
- |
155 |
- test_programs = \ |
156 |
- animation \ |
157 |
-diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c |
158 |
-index ae71788..9e9571f 100644 |
159 |
---- a/tests/pixbuf-lowmem.c |
160 |
-+++ b/tests/pixbuf-lowmem.c |
161 |
-@@ -24,6 +24,7 @@ |
162 |
- #include <time.h> |
163 |
- #include <string.h> |
164 |
- |
165 |
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) |
166 |
- #define PRETEND_MEM_SIZE (16 * 1024 * 1024) |
167 |
- #define REMAINING_MEM_SIZE 100000 |
168 |
- |
169 |
-@@ -225,3 +226,10 @@ main (int argc, char **argv) |
170 |
- |
171 |
- return 0; |
172 |
- } |
173 |
-+#else |
174 |
-+int |
175 |
-+main (int argc, char **argv) |
176 |
-+{ |
177 |
-+ return 0; |
178 |
-+} |
179 |
-+#endif |
180 |
--- |
181 |
-2.6.1 |
182 |
- |
183 |
|
184 |
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild |
185 |
deleted file mode 100644 |
186 |
index cfc7013..00000000 |
187 |
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild |
188 |
+++ /dev/null |
189 |
@@ -1,127 +0,0 @@ |
190 |
-# Copyright 1999-2016 Gentoo Foundation |
191 |
-# Distributed under the terms of the GNU General Public License v2 |
192 |
-# $Id$ |
193 |
- |
194 |
-EAPI="5" |
195 |
-GCONF_DEBUG="no" |
196 |
-GNOME2_LA_PUNT="yes" |
197 |
- |
198 |
-inherit autotools eutils flag-o-matic gnome2 multilib libtool multilib-minimal |
199 |
- |
200 |
-DESCRIPTION="Image loading library for GTK+" |
201 |
-HOMEPAGE="http://www.gtk.org/" |
202 |
- |
203 |
-LICENSE="LGPL-2+" |
204 |
-SLOT="2" |
205 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
206 |
-IUSE="+X debug +introspection jpeg jpeg2k tiff test" |
207 |
- |
208 |
-COMMON_DEPEND=" |
209 |
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}] |
210 |
- >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] |
211 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) |
212 |
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) |
213 |
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] ) |
214 |
- tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) |
215 |
- X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) |
216 |
-" |
217 |
-DEPEND="${COMMON_DEPEND} |
218 |
- >=dev-util/gtk-doc-am-1.20 |
219 |
- >=sys-devel/gettext-0.19 |
220 |
- virtual/pkgconfig |
221 |
-" |
222 |
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise |
223 |
-RDEPEND="${COMMON_DEPEND} |
224 |
- !<gnome-base/gail-1000 |
225 |
- !<gnome-base/librsvg-2.31.0 |
226 |
- !<x11-libs/gtk+-2.21.3:2 |
227 |
- !<x11-libs/gtk+-2.90.4:3 |
228 |
- abi_x86_32? ( |
229 |
- !<=app-emulation/emul-linux-x86-gtklibs-20131008-r2 |
230 |
- !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] |
231 |
- ) |
232 |
-" |
233 |
- |
234 |
-MULTILIB_CHOST_TOOLS=( |
235 |
- /usr/bin/gdk-pixbuf-query-loaders$(get_exeext) |
236 |
-) |
237 |
- |
238 |
-src_prepare() { |
239 |
- # Upstream patches from 2.32.x |
240 |
- epatch "${FILESDIR}"/${P}-gint64-shift-overflow.patch |
241 |
- epatch "${FILESDIR}"/${P}-lowmem-test-glibc.patch #563052, needs eautoreconf |
242 |
- eautoreconf |
243 |
- |
244 |
- # This will avoid polluting the pkg-config file with versioned libpng, |
245 |
- # which is causing problems with libpng14 -> libpng15 upgrade |
246 |
- # See upstream bug #667068 |
247 |
- # First check that the pattern is present, to catch upstream changes on bumps, |
248 |
- # because sed doesn't return failure code if it doesn't do any replacements |
249 |
- grep -q 'l in libpng16' configure || die "libpng check order has changed upstream" |
250 |
- sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die |
251 |
- [[ ${CHOST} == *-solaris* ]] && append-libs intl |
252 |
- |
253 |
- gnome2_src_prepare |
254 |
-} |
255 |
- |
256 |
-multilib_src_configure() { |
257 |
- # png always on to display icons |
258 |
- ECONF_SOURCE="${S}" \ |
259 |
- gnome2_src_configure \ |
260 |
- $(usex debug --enable-debug=yes "") \ |
261 |
- $(use_with jpeg libjpeg) \ |
262 |
- $(use_with jpeg2k libjasper) \ |
263 |
- $(use_with tiff libtiff) \ |
264 |
- $(multilib_native_use_enable introspection) \ |
265 |
- $(use_with X x11) \ |
266 |
- --with-libpng |
267 |
- |
268 |
- # work-around gtk-doc out-of-source brokedness |
269 |
- if multilib_is_native_abi; then |
270 |
- ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die |
271 |
- fi |
272 |
-} |
273 |
- |
274 |
-multilib_src_install() { |
275 |
- # Parallel install fails when no gdk-pixbuf is already installed, bug #481372 |
276 |
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install |
277 |
-} |
278 |
- |
279 |
-pkg_preinst() { |
280 |
- gnome2_pkg_preinst |
281 |
- |
282 |
- multilib_pkg_preinst() { |
283 |
- # Make sure loaders.cache belongs to gdk-pixbuf alone |
284 |
- local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" |
285 |
- |
286 |
- if [[ -e ${EROOT}${cache} ]]; then |
287 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
288 |
- else |
289 |
- touch "${ED}"/${cache} || die |
290 |
- fi |
291 |
- } |
292 |
- |
293 |
- multilib_foreach_abi multilib_pkg_preinst |
294 |
-} |
295 |
- |
296 |
-pkg_postinst() { |
297 |
- # causes segfault if set, see bug 375615 |
298 |
- unset __GL_NO_DSO_FINALIZER |
299 |
- |
300 |
- multilib_foreach_abi gnome2_pkg_postinst |
301 |
- |
302 |
- # Migration snippet for when this was handled by gtk+ |
303 |
- if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then |
304 |
- elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders |
305 |
- elog "to do that you can use qfile from portage-utils:" |
306 |
- elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)" |
307 |
- fi |
308 |
-} |
309 |
- |
310 |
-pkg_postrm() { |
311 |
- gnome2_pkg_postrm |
312 |
- |
313 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
314 |
- rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache |
315 |
- fi |
316 |
-} |
317 |
|
318 |
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild |
319 |
deleted file mode 100644 |
320 |
index 932c565..00000000 |
321 |
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild |
322 |
+++ /dev/null |
323 |
@@ -1,121 +0,0 @@ |
324 |
-# Copyright 1999-2016 Gentoo Foundation |
325 |
-# Distributed under the terms of the GNU General Public License v2 |
326 |
-# $Id$ |
327 |
- |
328 |
-EAPI="5" |
329 |
-GCONF_DEBUG="no" |
330 |
-GNOME2_LA_PUNT="yes" |
331 |
- |
332 |
-inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal |
333 |
- |
334 |
-DESCRIPTION="Image loading library for GTK+" |
335 |
-HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" |
336 |
- |
337 |
-LICENSE="LGPL-2+" |
338 |
-SLOT="2" |
339 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
340 |
-IUSE="X debug +introspection jpeg jpeg2k tiff test" |
341 |
- |
342 |
-COMMON_DEPEND=" |
343 |
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}] |
344 |
- >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] |
345 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) |
346 |
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) |
347 |
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] ) |
348 |
- tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) |
349 |
- X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) |
350 |
-" |
351 |
-DEPEND="${COMMON_DEPEND} |
352 |
- >=dev-util/gtk-doc-am-1.20 |
353 |
- >=sys-devel/gettext-0.19 |
354 |
- virtual/pkgconfig |
355 |
-" |
356 |
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise |
357 |
-RDEPEND="${COMMON_DEPEND} |
358 |
- !<gnome-base/gail-1000 |
359 |
- !<gnome-base/librsvg-2.31.0 |
360 |
- !<x11-libs/gtk+-2.21.3:2 |
361 |
- !<x11-libs/gtk+-2.90.4:3 |
362 |
-" |
363 |
- |
364 |
-MULTILIB_CHOST_TOOLS=( |
365 |
- /usr/bin/gdk-pixbuf-query-loaders$(get_exeext) |
366 |
-) |
367 |
- |
368 |
-src_prepare() { |
369 |
- # See https://bugzilla.gnome.org/show_bug.cgi?id=756590 |
370 |
- epatch "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch |
371 |
- |
372 |
- # This will avoid polluting the pkg-config file with versioned libpng, |
373 |
- # which is causing problems with libpng14 -> libpng15 upgrade |
374 |
- # See upstream bug #667068 |
375 |
- # First check that the pattern is present, to catch upstream changes on bumps, |
376 |
- # because sed doesn't return failure code if it doesn't do any replacements |
377 |
- grep -q 'l in libpng16' configure || die "libpng check order has changed upstream" |
378 |
- sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die |
379 |
- [[ ${CHOST} == *-solaris* ]] && append-libs intl |
380 |
- |
381 |
- gnome2_src_prepare |
382 |
-} |
383 |
- |
384 |
-multilib_src_configure() { |
385 |
- # png always on to display icons |
386 |
- ECONF_SOURCE="${S}" \ |
387 |
- gnome2_src_configure \ |
388 |
- $(usex debug --enable-debug=yes "") \ |
389 |
- $(use_with jpeg libjpeg) \ |
390 |
- $(use_with jpeg2k libjasper) \ |
391 |
- $(use_with tiff libtiff) \ |
392 |
- $(multilib_native_use_enable introspection) \ |
393 |
- $(use_with X x11) \ |
394 |
- --with-libpng |
395 |
- |
396 |
- # work-around gtk-doc out-of-source brokedness |
397 |
- if multilib_is_native_abi; then |
398 |
- ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die |
399 |
- fi |
400 |
-} |
401 |
- |
402 |
-multilib_src_install() { |
403 |
- # Parallel install fails when no gdk-pixbuf is already installed, bug #481372 |
404 |
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install |
405 |
-} |
406 |
- |
407 |
-pkg_preinst() { |
408 |
- gnome2_pkg_preinst |
409 |
- |
410 |
- multilib_pkg_preinst() { |
411 |
- # Make sure loaders.cache belongs to gdk-pixbuf alone |
412 |
- local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" |
413 |
- |
414 |
- if [[ -e ${EROOT}${cache} ]]; then |
415 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
416 |
- else |
417 |
- touch "${ED}"/${cache} || die |
418 |
- fi |
419 |
- } |
420 |
- |
421 |
- multilib_foreach_abi multilib_pkg_preinst |
422 |
-} |
423 |
- |
424 |
-pkg_postinst() { |
425 |
- # causes segfault if set, see bug 375615 |
426 |
- unset __GL_NO_DSO_FINALIZER |
427 |
- |
428 |
- multilib_foreach_abi gnome2_pkg_postinst |
429 |
- |
430 |
- # Migration snippet for when this was handled by gtk+ |
431 |
- if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then |
432 |
- elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders |
433 |
- elog "to do that you can use qfile from portage-utils:" |
434 |
- elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)" |
435 |
- fi |
436 |
-} |
437 |
- |
438 |
-pkg_postrm() { |
439 |
- gnome2_pkg_postrm |
440 |
- |
441 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
442 |
- rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache |
443 |
- fi |
444 |
-} |