diff options
author | 2013-06-09 11:11:43 +0000 | |
---|---|---|
committer | 2013-06-09 11:11:43 +0000 | |
commit | 53f002134089cd52ffe50a4d3b4589538a2b1401 (patch) | |
tree | df612467d898911c9853ed5b29ed5b88ed95f11b /x11-libs | |
parent | Version bump by Nikoli <nikoli@lavabit.com> wrt bug #472016. (diff) | |
download | gentoo-2-53f002134089cd52ffe50a4d3b4589538a2b1401.tar.gz gentoo-2-53f002134089cd52ffe50a4d3b4589538a2b1401.tar.bz2 gentoo-2-53f002134089cd52ffe50a4d3b4589538a2b1401.zip |
Version bump, drop old
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/gdk-pixbuf/ChangeLog | 8 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.24.1-xbm-overflow.patch | 48 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild (renamed from x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild) | 71 |
3 files changed, 42 insertions, 85 deletions
diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog index 05ab6e8cc6c5..e8e8a3ea83df 100644 --- a/x11-libs/gdk-pixbuf/ChangeLog +++ b/x11-libs/gdk-pixbuf/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/gdk-pixbuf # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.84 2013/04/21 19:09:39 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.85 2013/06/09 11:11:43 pacho Exp $ + +*gdk-pixbuf-2.28.2 (09 Jun 2013) + + 09 Jun 2013; Pacho Ramos <pacho@gentoo.org> +gdk-pixbuf-2.28.2.ebuild, + -files/gdk-pixbuf-2.24.1-xbm-overflow.patch, -gdk-pixbuf-2.24.1-r1.ebuild: + Version bump, drop old *gdk-pixbuf-2.28.1 (21 Apr 2013) diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.24.1-xbm-overflow.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.24.1-xbm-overflow.patch deleted file mode 100644 index 66b15f70ce63..000000000000 --- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.24.1-xbm-overflow.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4f0f465f991cd454d03189497f923eb40c170c22 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Sat, 14 Apr 2012 14:21:09 -0400 -Subject: [PATCH] Avoid an integer overflow in the xbm loader - -At the same time, reject some silly input, such as negative -width or height. - -https://bugzilla.gnome.org/show_bug.cgi?id=672811 ---- - gdk-pixbuf/io-xbm.c | 12 ++++++++++-- - 1 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/gdk-pixbuf/io-xbm.c b/gdk-pixbuf/io-xbm.c -index 46653b9..4f3e1e8 100644 ---- a/gdk-pixbuf/io-xbm.c -+++ b/gdk-pixbuf/io-xbm.c -@@ -183,10 +183,16 @@ read_bitmap_file_data (FILE *fstream, - type++; - } - -- if (!strcmp ("width", type)) -+ if (!strcmp ("width", type)) { -+ if (value <= 0) -+ RETURN (FALSE); - ww = (unsigned int) value; -- if (!strcmp ("height", type)) -+ } -+ if (!strcmp ("height", type)) { -+ if (value <= 0) -+ RETURN (FALSE); - hh = (unsigned int) value; -+ } - if (!strcmp ("hot", type)) { - if (type-- == name_and_type - || type-- == name_and_type) -@@ -231,6 +237,8 @@ read_bitmap_file_data (FILE *fstream, - bytes_per_line = (ww+7)/8 + padding; - - size = bytes_per_line * hh; -+ if (size / bytes_per_line != hh) /* overflow */ -+ RETURN (FALSE); - bits = g_malloc (size); - - if (version10p) { --- -1.7.8.5 - diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild index 1f786837e68d..9a327c1ffe35 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild @@ -1,70 +1,67 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild,v 1.12 2012/11/10 05:54:13 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild,v 1.1 2013/06/09 11:11:43 pacho Exp $ -EAPI="4" - -inherit eutils gnome.org multilib libtool autotools +EAPI="5" +inherit gnome.org multilib libtool DESCRIPTION="Image loading library for GTK+" HOMEPAGE="http://www.gtk.org/" LICENSE="LGPL-2+" SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~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" IUSE="+X debug +introspection jpeg jpeg2k tiff test" COMMON_DEPEND=" - >=dev-libs/glib-2.27.2:2 - >=media-libs/libpng-1.4:0 + >=dev-libs/glib-2.34.0:2 + >=media-libs/libpng-1.4:0= introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) - jpeg? ( virtual/jpeg ) - jpeg2k? ( media-libs/jasper ) - tiff? ( >=media-libs/tiff-3.9.2:0 ) - X? ( x11-libs/libX11 )" + jpeg? ( virtual/jpeg:= ) + jpeg2k? ( media-libs/jasper:= ) + tiff? ( >=media-libs/tiff-3.9.2:0= ) + X? ( x11-libs/libX11 ) +" DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.11 >=sys-devel/gettext-0.17 - virtual/pkgconfig" + virtual/pkgconfig +" # librsvg blocker is for the new pixbuf loader API, you lose icons otherwise RDEPEND="${COMMON_DEPEND} !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 - !<x11-libs/gtk+-2.90.4:3" + !<x11-libs/gtk+-2.90.4:3 +" src_prepare() { # This will avoid polluting the pkg-config file with versioned libpng, # which is causing problems with libpng14 -> libpng15 upgrade # See upstream bug #667068 - sed -i -e 's:libpng15:libpng libpng15:' configure.ac || die - # Backport from 2.26.1, fixes xbm loader overflow - epatch "${FILESDIR}/${P}-xbm-overflow.patch" - eautoreconf + # First check that the pattern is present, to catch upstream changes on bumps, + # because sed doesn't return failure code if it doesn't do any replacements + grep -q 'l in libpng16' configure || die "libpng check order has changed upstream" + sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die + default + elibtoolize # for Darwin modules, bug #???? } src_configure() { - # png always on to display icons (foser) - local myconf=" - $(use_with jpeg libjpeg) - $(use_with jpeg2k libjasper) - $(use_with tiff libtiff) - $(use_enable introspection) - $(use_with X x11) - --with-libpng" - - # Passing --disable-debug is not recommended for production use - use debug && myconf="${myconf} --enable-debug=yes" - - econf ${myconf} + # png always on to display icons + econf \ + $(usex debug --enable-debug=yes "") \ + $(use_with jpeg libjpeg) \ + $(use_with jpeg2k libjasper) \ + $(use_with tiff libtiff) \ + $(use_enable introspection) \ + $(use_with X x11) \ + --with-libpng } src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS NEWS* README* - - # New library, remove .la files - find "${D}" -name '*.la' -exec rm -f '{}' + || die + default + prune_libtool_files --modules } pkg_postinst() { @@ -81,6 +78,8 @@ pkg_postinst() { fi rm "${tmp_file}" + # FIXME: use subslots to get rebuilds when really needed + # Every major version bump??? if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders elog "to do that you can use qfile from portage-utils:" |