| 1 |
angelos 11/07/30 16:03:01 |
| 2 |
|
| 3 |
Modified: gimp-2.6.11-r1.ebuild ChangeLog |
| 4 |
gimp-2.6.11-r2.ebuild |
| 5 |
Log: |
| 6 |
Fix compilation against curl-7.21.7 (bug #377075) |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha49/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.9 media-gfx/gimp/gimp-2.6.11-r1.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r1.ebuild?rev=1.9&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r1.ebuild?rev=1.9&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r1.ebuild?r1=1.8&r2=1.9 |
| 16 |
|
| 17 |
Index: gimp-2.6.11-r1.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r1.ebuild,v |
| 20 |
retrieving revision 1.8 |
| 21 |
retrieving revision 1.9 |
| 22 |
diff -u -r1.8 -r1.9 |
| 23 |
--- gimp-2.6.11-r1.ebuild 27 Mar 2011 09:45:59 -0000 1.8 |
| 24 |
+++ gimp-2.6.11-r1.ebuild 30 Jul 2011 16:03:01 -0000 1.9 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2011 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r1.ebuild,v 1.8 2011/03/27 09:45:59 ssuominen Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r1.ebuild,v 1.9 2011/07/30 16:03:01 angelos Exp $ |
| 30 |
|
| 31 |
EAPI="3" |
| 32 |
PYTHON_DEPEND="python? 2:2.5" |
| 33 |
@@ -94,6 +94,10 @@ |
| 34 |
# https://bugzilla.gnome.org/show_bug.cgi?id=640409 |
| 35 |
epatch "${FILESDIR}"/gimp-libpng15.diff |
| 36 |
|
| 37 |
+ # don't use empty, removed header |
| 38 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=377075 |
| 39 |
+ epatch "${FILESDIR}"/gimp-curl-headers.diff |
| 40 |
+ |
| 41 |
echo '#!/bin/sh' > py-compile |
| 42 |
gnome2_src_prepare |
| 43 |
} |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.329 media-gfx/gimp/ChangeLog |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.329&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.329&content-type=text/plain |
| 51 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?r1=1.328&r2=1.329 |
| 52 |
|
| 53 |
Index: ChangeLog |
| 54 |
=================================================================== |
| 55 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v |
| 56 |
retrieving revision 1.328 |
| 57 |
retrieving revision 1.329 |
| 58 |
diff -u -r1.328 -r1.329 |
| 59 |
--- ChangeLog 19 Apr 2011 20:08:44 -0000 1.328 |
| 60 |
+++ ChangeLog 30 Jul 2011 16:03:01 -0000 1.329 |
| 61 |
@@ -1,6 +1,10 @@ |
| 62 |
# ChangeLog for media-gfx/gimp |
| 63 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 64 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.328 2011/04/19 20:08:44 hanno Exp $ |
| 65 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.329 2011/07/30 16:03:01 angelos Exp $ |
| 66 |
+ |
| 67 |
+ 30 Jul 2011; Christoph Mende <angelos@g.o> gimp-2.6.11-r1.ebuild, |
| 68 |
+ gimp-2.6.11-r2.ebuild, +files/gimp-curl-headers.diff: |
| 69 |
+ Fix compilation against curl-7.21.7 (bug #377075) |
| 70 |
|
| 71 |
*gimp-2.6.11-r2 (19 Apr 2011) |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.2 media-gfx/gimp/gimp-2.6.11-r2.ebuild |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r2.ebuild?rev=1.2&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r2.ebuild?rev=1.2&content-type=text/plain |
| 80 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r2.ebuild?r1=1.1&r2=1.2 |
| 81 |
|
| 82 |
Index: gimp-2.6.11-r2.ebuild |
| 83 |
=================================================================== |
| 84 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r2.ebuild,v |
| 85 |
retrieving revision 1.1 |
| 86 |
retrieving revision 1.2 |
| 87 |
diff -u -r1.1 -r1.2 |
| 88 |
--- gimp-2.6.11-r2.ebuild 19 Apr 2011 20:08:45 -0000 1.1 |
| 89 |
+++ gimp-2.6.11-r2.ebuild 30 Jul 2011 16:03:01 -0000 1.2 |
| 90 |
@@ -1,6 +1,6 @@ |
| 91 |
# Copyright 1999-2011 Gentoo Foundation |
| 92 |
# Distributed under the terms of the GNU General Public License v2 |
| 93 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r2.ebuild,v 1.1 2011/04/19 20:08:45 hanno Exp $ |
| 94 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r2.ebuild,v 1.2 2011/07/30 16:03:01 angelos Exp $ |
| 95 |
|
| 96 |
EAPI="3" |
| 97 |
PYTHON_DEPEND="python? 2:2.5" |
| 98 |
@@ -94,6 +94,10 @@ |
| 99 |
# https://bugzilla.gnome.org/show_bug.cgi?id=640409 |
| 100 |
epatch "${FILESDIR}"/gimp-libpng15-v2.diff |
| 101 |
|
| 102 |
+ # don't use empty, removed header |
| 103 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=377075 |
| 104 |
+ epatch "${FILESDIR}"/gimp-curl-headers.diff |
| 105 |
+ |
| 106 |
echo '#!/bin/sh' > py-compile |
| 107 |
gnome2_src_prepare |
| 108 |
} |
Archives