1 |
sping 11/09/29 16:13:30 |
2 |
|
3 |
Modified: ChangeLog gimp-2.6.11-r5.ebuild |
4 |
Log: |
5 |
media-gfx/gimp: Fix compilation against recent poppler (bug #384903) |
6 |
|
7 |
(Portage version: 2.1.10.19/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.343 media-gfx/gimp/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.343&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.343&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?r1=1.342&r2=1.343 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v |
19 |
retrieving revision 1.342 |
20 |
retrieving revision 1.343 |
21 |
diff -u -r1.342 -r1.343 |
22 |
--- ChangeLog 12 Sep 2011 15:19:48 -0000 1.342 |
23 |
+++ ChangeLog 29 Sep 2011 16:13:30 -0000 1.343 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for media-gfx/gimp |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.342 2011/09/12 15:19:48 xarthisius Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.343 2011/09/29 16:13:30 sping Exp $ |
29 |
+ |
30 |
+ 29 Sep 2011; Sebastian Pipping <sping@g.o> gimp-2.6.11-r5.ebuild, |
31 |
+ +files/gimp-2.6.11-poppler-0.17.patch: |
32 |
+ Fix compilation of 2.6.11-r5 against recent poppler (patch from Fedora, |
33 |
+ Gentoo bug #384903) |
34 |
|
35 |
12 Sep 2011; Kacper Kowalik <xarthisius@g.o> gimp-2.6.11-r5.ebuild: |
36 |
ppc/ppc64 stable wrt #379289 |
37 |
|
38 |
|
39 |
|
40 |
1.7 media-gfx/gimp/gimp-2.6.11-r5.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r5.ebuild?rev=1.7&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r5.ebuild?rev=1.7&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r5.ebuild?r1=1.6&r2=1.7 |
45 |
|
46 |
Index: gimp-2.6.11-r5.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r5.ebuild,v |
49 |
retrieving revision 1.6 |
50 |
retrieving revision 1.7 |
51 |
diff -u -r1.6 -r1.7 |
52 |
--- gimp-2.6.11-r5.ebuild 12 Sep 2011 15:19:48 -0000 1.6 |
53 |
+++ gimp-2.6.11-r5.ebuild 29 Sep 2011 16:13:30 -0000 1.7 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2011 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r5.ebuild,v 1.6 2011/09/12 15:19:48 xarthisius Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r5.ebuild,v 1.7 2011/09/29 16:13:30 sping Exp $ |
59 |
|
60 |
EAPI="3" |
61 |
PYTHON_DEPEND="python? 2:2.5" |
62 |
@@ -107,6 +107,10 @@ |
63 |
# https://bugzilla.gnome.org/show_bug.cgi?id=653980#c6 |
64 |
epatch "${FILESDIR}"/${P}-file-uri.patch |
65 |
|
66 |
+ # fix compilation against poppler 0.17/0.18 |
67 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=384903 |
68 |
+ epatch "${FILESDIR}"/${P}-poppler-0.17.patch |
69 |
+ |
70 |
echo '#!/bin/sh' > py-compile |
71 |
gnome2_src_prepare |
72 |
} |