| 1 |
sping 11/09/02 20:48:14 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: gimp-2.6.11-r4.ebuild gimp-2.7.3-r1.ebuild |
| 5 |
Log: |
| 6 |
media-gfx/gimp: Set precedence of Gimp on PDF files to zero (bug #321111) |
| 7 |
|
| 8 |
(Portage version: 2.1.10.11/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.335 media-gfx/gimp/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.335&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.335&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?r1=1.334&r2=1.335 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v |
| 20 |
retrieving revision 1.334 |
| 21 |
retrieving revision 1.335 |
| 22 |
diff -u -r1.334 -r1.335 |
| 23 |
--- ChangeLog 2 Sep 2011 17:39:01 -0000 1.334 |
| 24 |
+++ ChangeLog 2 Sep 2011 20:48:14 -0000 1.335 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for media-gfx/gimp |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.334 2011/09/02 17:39:01 sping Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.335 2011/09/02 20:48:14 sping Exp $ |
| 30 |
+ |
| 31 |
+*gimp-2.7.3-r1 (02 Sep 2011) |
| 32 |
+*gimp-2.6.11-r4 (02 Sep 2011) |
| 33 |
+ |
| 34 |
+ 02 Sep 2011; Sebastian Pipping <sping@g.o> +gimp-2.6.11-r4.ebuild, |
| 35 |
+ +gimp-2.7.3-r1.ebuild: |
| 36 |
+ Set precedence of Gimp on PDF files to zero (bug #321111) |
| 37 |
|
| 38 |
*gimp-2.6.11-r3 (02 Sep 2011) |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 media-gfx/gimp/gimp-2.6.11-r4.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r4.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r4.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: gimp-2.6.11-r4.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2011 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r4.ebuild,v 1.1 2011/09/02 20:48:14 sping Exp $ |
| 53 |
|
| 54 |
EAPI="3" |
| 55 |
PYTHON_DEPEND="python? 2:2.5" |
| 56 |
|
| 57 |
inherit eutils gnome2 fdo-mime multilib python |
| 58 |
|
| 59 |
DESCRIPTION="GNU Image Manipulation Program" |
| 60 |
HOMEPAGE="http://www.gimp.org/" |
| 61 |
SRC_URI="mirror://gimp/v2.6/${P}.tar.bz2" |
| 62 |
|
| 63 |
LICENSE="GPL-2" |
| 64 |
SLOT="2" |
| 65 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 66 |
|
| 67 |
IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf" |
| 68 |
|
| 69 |
RDEPEND=">=dev-libs/glib-2.18.1:2 |
| 70 |
>=x11-libs/gtk+-2.12.5:2 |
| 71 |
>=x11-libs/pango-1.18.0 |
| 72 |
x11-libs/libXpm |
| 73 |
>=media-libs/freetype-2.1.7 |
| 74 |
>=media-libs/fontconfig-2.2.0 |
| 75 |
sys-libs/zlib |
| 76 |
dev-libs/libxml2 |
| 77 |
dev-libs/libxslt |
| 78 |
x11-misc/xdg-utils |
| 79 |
x11-themes/hicolor-icon-theme |
| 80 |
>=media-libs/gegl-0.0.22 |
| 81 |
aalib? ( media-libs/aalib ) |
| 82 |
alsa? ( media-libs/alsa-lib ) |
| 83 |
curl? ( net-misc/curl ) |
| 84 |
dbus? ( dev-libs/dbus-glib ) |
| 85 |
gnome? ( gnome-base/gvfs ) |
| 86 |
webkit? ( net-libs/webkit-gtk:2 ) |
| 87 |
jpeg? ( virtual/jpeg:0 ) |
| 88 |
exif? ( >=media-libs/libexif-0.6.15 ) |
| 89 |
lcms? ( =media-libs/lcms-1* ) |
| 90 |
mng? ( media-libs/libmng ) |
| 91 |
pdf? ( >=app-text/poppler-0.12.3-r3[cairo] ) |
| 92 |
png? ( >=media-libs/libpng-1.2.2:0 ) |
| 93 |
python? ( >=dev-python/pygtk-2.10.4:2 ) |
| 94 |
tiff? ( >=media-libs/tiff-3.5.7 ) |
| 95 |
svg? ( >=gnome-base/librsvg-2.8.0:2 ) |
| 96 |
wmf? ( >=media-libs/libwmf-0.2.8 )" |
| 97 |
DEPEND="${RDEPEND} |
| 98 |
>=dev-util/pkgconfig-0.12.0 |
| 99 |
>=dev-util/intltool-0.40 |
| 100 |
>=sys-devel/gettext-0.17 |
| 101 |
doc? ( >=dev-util/gtk-doc-1 )" |
| 102 |
|
| 103 |
DOCS="AUTHORS ChangeLog* HACKING NEWS README*" |
| 104 |
|
| 105 |
pkg_setup() { |
| 106 |
G2CONF="--enable-default-binary \ |
| 107 |
--with-x \ |
| 108 |
$(use_with aalib aa) \ |
| 109 |
$(use_with alsa) \ |
| 110 |
$(use_enable altivec) \ |
| 111 |
$(use_with curl libcurl) \ |
| 112 |
$(use_with dbus) \ |
| 113 |
--without-hal \ |
| 114 |
$(use_with gnome gvfs) \ |
| 115 |
--without-gnomevfs \ |
| 116 |
$(use_with webkit) \ |
| 117 |
$(use_with jpeg libjpeg) \ |
| 118 |
$(use_with exif libexif) \ |
| 119 |
$(use_with lcms) \ |
| 120 |
$(use_enable mmx) \ |
| 121 |
$(use_with mng libmng) \ |
| 122 |
$(use_with pdf poppler) \ |
| 123 |
$(use_with png libpng) \ |
| 124 |
$(use_enable python) \ |
| 125 |
$(use_enable smp mp) \ |
| 126 |
$(use_enable sse) \ |
| 127 |
$(use_with svg librsvg) \ |
| 128 |
$(use_with tiff libtiff) \ |
| 129 |
$(use_with wmf)" |
| 130 |
|
| 131 |
if use python; then |
| 132 |
python_set_active_version 2 |
| 133 |
python_pkg_setup |
| 134 |
fi |
| 135 |
} |
| 136 |
|
| 137 |
src_prepare() { |
| 138 |
# security fixes from upstream, see |
| 139 |
# https://bugzilla.gnome.org/show_bug.cgi?id=639203 |
| 140 |
epatch "${FILESDIR}"/gimp-CVE-2010-4540-to-4543.diff |
| 141 |
|
| 142 |
# fixes for libpng 1.5 (incomplete), see |
| 143 |
# https://bugzilla.gnome.org/show_bug.cgi?id=640409 |
| 144 |
epatch "${FILESDIR}"/gimp-libpng15-v2.diff |
| 145 |
|
| 146 |
# don't use empty, removed header |
| 147 |
# https://bugs.gentoo.org/show_bug.cgi?id=377075 |
| 148 |
epatch "${FILESDIR}"/gimp-curl-headers.diff |
| 149 |
|
| 150 |
# apply file-uri patch by upstream |
| 151 |
# https://bugs.gentoo.org/show_bug.cgi?id=372941 |
| 152 |
# https://bugzilla.gnome.org/show_bug.cgi?id=653980#c6 |
| 153 |
epatch "${FILESDIR}"/${P}-file-uri.patch |
| 154 |
|
| 155 |
echo '#!/bin/sh' > py-compile |
| 156 |
gnome2_src_prepare |
| 157 |
} |
| 158 |
|
| 159 |
src_install() { |
| 160 |
gnome2_src_install |
| 161 |
|
| 162 |
if use python; then |
| 163 |
python_convert_shebangs -r $(python_get_version) "${ED}" |
| 164 |
python_need_rebuild |
| 165 |
fi |
| 166 |
|
| 167 |
# Workaround for bug #321111 to give GIMP the least |
| 168 |
# precedence on PDF documents by default |
| 169 |
mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die |
| 170 |
} |
| 171 |
|
| 172 |
pkg_postinst() { |
| 173 |
gnome2_pkg_postinst |
| 174 |
|
| 175 |
use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \ |
| 176 |
/usr/$(get_libdir)/gimp/2.0/plug-ins |
| 177 |
} |
| 178 |
|
| 179 |
pkg_postrm() { |
| 180 |
gnome2_pkg_postrm |
| 181 |
|
| 182 |
use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \ |
| 183 |
/usr/$(get_libdir)/gimp/2.0/plug-ins |
| 184 |
} |
| 185 |
|
| 186 |
|
| 187 |
|
| 188 |
1.1 media-gfx/gimp/gimp-2.7.3-r1.ebuild |
| 189 |
|
| 190 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.7.3-r1.ebuild?rev=1.1&view=markup |
| 191 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.7.3-r1.ebuild?rev=1.1&content-type=text/plain |
| 192 |
|
| 193 |
Index: gimp-2.7.3-r1.ebuild |
| 194 |
=================================================================== |
| 195 |
# Copyright 1999-2011 Gentoo Foundation |
| 196 |
# Distributed under the terms of the GNU General Public License v2 |
| 197 |
# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.3-r1.ebuild,v 1.1 2011/09/02 20:48:14 sping Exp $ |
| 198 |
|
| 199 |
EAPI="3" |
| 200 |
PYTHON_DEPEND="python? 2:2.5" |
| 201 |
|
| 202 |
inherit versionator autotools eutils gnome2 fdo-mime multilib python |
| 203 |
|
| 204 |
DESCRIPTION="GNU Image Manipulation Program" |
| 205 |
HOMEPAGE="http://www.gimp.org/" |
| 206 |
SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2" |
| 207 |
|
| 208 |
LICENSE="GPL-3 LGPL-3" |
| 209 |
SLOT="2" |
| 210 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 211 |
|
| 212 |
IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm" |
| 213 |
|
| 214 |
RDEPEND=">=dev-libs/glib-2.28.1:2 |
| 215 |
>=x11-libs/gtk+-2.24.3:2 |
| 216 |
>=x11-libs/gdk-pixbuf-2.22.1:2 |
| 217 |
>=x11-libs/cairo-1.10.2 |
| 218 |
>=x11-libs/pango-1.22.0 |
| 219 |
xpm? ( x11-libs/libXpm ) |
| 220 |
>=media-libs/freetype-2.1.7 |
| 221 |
>=media-libs/fontconfig-2.2.0 |
| 222 |
sys-libs/zlib |
| 223 |
dev-libs/libxml2 |
| 224 |
dev-libs/libxslt |
| 225 |
x11-misc/xdg-utils |
| 226 |
x11-themes/hicolor-icon-theme |
| 227 |
>=media-libs/babl-0.1.4 |
| 228 |
>=media-libs/gegl-0.1.6 |
| 229 |
aalib? ( media-libs/aalib ) |
| 230 |
alsa? ( media-libs/alsa-lib ) |
| 231 |
curl? ( net-misc/curl ) |
| 232 |
dbus? ( dev-libs/dbus-glib ) |
| 233 |
gnome? ( gnome-base/gvfs ) |
| 234 |
webkit? ( net-libs/webkit-gtk:2 ) |
| 235 |
jpeg? ( virtual/jpeg:0 ) |
| 236 |
jpeg2k? ( media-libs/jasper ) |
| 237 |
exif? ( >=media-libs/libexif-0.6.15 ) |
| 238 |
lcms? ( >=media-libs/lcms-1.16:0 ) |
| 239 |
mng? ( media-libs/libmng ) |
| 240 |
pdf? ( >=app-text/poppler-0.12.4[cairo] ) |
| 241 |
png? ( >=media-libs/libpng-1.2.37:0 ) |
| 242 |
python? ( >=dev-python/pygtk-2.10.4:2 ) |
| 243 |
tiff? ( >=media-libs/tiff-3.5.7 ) |
| 244 |
svg? ( >=gnome-base/librsvg-2.14.0:2 ) |
| 245 |
wmf? ( >=media-libs/libwmf-0.2.8 ) |
| 246 |
x11-libs/libXcursor |
| 247 |
udev? ( sys-fs/udev[gudev] )" |
| 248 |
DEPEND="${RDEPEND} |
| 249 |
>=dev-util/pkgconfig-0.22 |
| 250 |
>=dev-util/intltool-0.40.1 |
| 251 |
>=sys-devel/gettext-0.17 |
| 252 |
doc? ( >=dev-util/gtk-doc-1 )" |
| 253 |
|
| 254 |
DOCS="AUTHORS ChangeLog* HACKING NEWS README*" |
| 255 |
|
| 256 |
pkg_setup() { |
| 257 |
G2CONF="--enable-default-binary \ |
| 258 |
--with-x \ |
| 259 |
$(use_with aalib aa) \ |
| 260 |
$(use_with alsa) \ |
| 261 |
$(use_enable altivec) \ |
| 262 |
$(use_with curl libcurl) \ |
| 263 |
$(use_with dbus) \ |
| 264 |
$(use_with gnome gvfs) \ |
| 265 |
$(use_with webkit) \ |
| 266 |
$(use_with jpeg libjpeg) \ |
| 267 |
$(use_with jpeg2k libjasper) \ |
| 268 |
$(use_with exif libexif) \ |
| 269 |
$(use_with lcms) \ |
| 270 |
$(use_enable mmx) \ |
| 271 |
$(use_with mng libmng) \ |
| 272 |
$(use_with pdf poppler) \ |
| 273 |
$(use_with png libpng) \ |
| 274 |
$(use_enable python) \ |
| 275 |
$(use_enable smp mp) \ |
| 276 |
$(use_enable sse) \ |
| 277 |
$(use_with svg librsvg) \ |
| 278 |
$(use_with tiff libtiff) \ |
| 279 |
$(use_with udev gudev) \ |
| 280 |
$(use_with wmf) \ |
| 281 |
--with-xmc \ |
| 282 |
$(use_with xpm libxpm) \ |
| 283 |
--without-xvfb-run" |
| 284 |
|
| 285 |
if use python; then |
| 286 |
python_set_active_version 2 |
| 287 |
python_pkg_setup |
| 288 |
fi |
| 289 |
} |
| 290 |
|
| 291 |
src_prepare() { |
| 292 |
epatch "${FILESDIR}"/${P}-glib-2.29.patch |
| 293 |
eautoreconf |
| 294 |
|
| 295 |
echo '#!/bin/sh' > py-compile |
| 296 |
gnome2_src_prepare |
| 297 |
} |
| 298 |
|
| 299 |
src_install() { |
| 300 |
gnome2_src_install |
| 301 |
|
| 302 |
if use python; then |
| 303 |
python_convert_shebangs -r $(python_get_version) "${ED}" |
| 304 |
python_need_rebuild |
| 305 |
fi |
| 306 |
|
| 307 |
# Workaround for bug #321111 to give GIMP the least |
| 308 |
# precedence on PDF documents by default |
| 309 |
mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die |
| 310 |
} |
| 311 |
|
| 312 |
pkg_postinst() { |
| 313 |
gnome2_pkg_postinst |
| 314 |
|
| 315 |
use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \ |
| 316 |
/usr/$(get_libdir)/gimp/2.0/plug-ins |
| 317 |
} |
| 318 |
|
| 319 |
pkg_postrm() { |
| 320 |
gnome2_pkg_postrm |
| 321 |
|
| 322 |
use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \ |
| 323 |
/usr/$(get_libdir)/gimp/2.0/plug-ins |
| 324 |
} |
Archives