* [gentoo-commits] gentoo-x86 commit in x11-libs/gdk-pixbuf: gdk-pixbuf-2.24.1-r1.ebuild ChangeLog gdk-pixbuf-2.26.1.ebuild gdk-pixbuf-2.26.0.ebuild
@ 2012-04-14 20:52 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; only message in thread
From: Alexandre Rostovtsev (tetromino) @ 2012-04-14 20:52 UTC (permalink / raw
To: gentoo-commits
tetromino 12/04/14 20:52:57
Modified: ChangeLog
Added: gdk-pixbuf-2.24.1-r1.ebuild
gdk-pixbuf-2.26.1.ebuild
Removed: gdk-pixbuf-2.26.0.ebuild
Log:
Fix integer overflow in xbm loader (bug #412033).
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Revision Changes Path
1.49 x11-libs/gdk-pixbuf/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog?r1=1.48&r2=1.49
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ChangeLog 12 Apr 2012 17:04:23 -0000 1.48
+++ ChangeLog 14 Apr 2012 20:52:57 -0000 1.49
@@ -1,6 +1,14 @@
# ChangeLog for x11-libs/gdk-pixbuf
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.48 2012/04/12 17:04:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.49 2012/04/14 20:52:57 tetromino Exp $
+
+*gdk-pixbuf-2.26.1 (14 Apr 2012)
+*gdk-pixbuf-2.24.1-r1 (14 Apr 2012)
+
+ 14 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ +gdk-pixbuf-2.24.1-r1.ebuild, +files/gdk-pixbuf-2.24.1-xbm-overflow.patch,
+ -gdk-pixbuf-2.26.0.ebuild, +gdk-pixbuf-2.26.1.ebuild:
+ Fix integer overflow in xbm loader (bug #412033).
12 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
gdk-pixbuf-2.26.0.ebuild:
1.1 x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: gdk-pixbuf-2.24.1-r1.ebuild
===================================================================
# Copyright 1999-2012 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.1 2012/04/14 20:52:57 tetromino Exp $
EAPI="4"
inherit eutils gnome.org multilib libtool autotools
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"
IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
COMMON_DEPEND="
>=dev-libs/glib-2.27.2: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 )"
DEPEND="${COMMON_DEPEND}
>=dev-util/pkgconfig-0.9
>=sys-apps/coreutils-8.5
>=sys-devel/gettext-0.17
>=dev-util/gtk-doc-am-1.11
doc? (
>=dev-util/gtk-doc-1.11
~app-text/docbook-xml-dtd-4.1.2 )"
# 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"
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
}
src_configure() {
# png always on to display icons (foser)
local myconf="
$(use_enable doc gtk-doc)
$(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}
}
src_install() {
emake DESTDIR="${D}" install
dodoc AUTHORS NEWS* README*
# New library, remove .la files
find "${D}" -name '*.la' -exec rm -f '{}' + || die
}
pkg_postinst() {
# causes segfault if set, see bug 375615
unset __GL_NO_DSO_FINALIZER
tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
# be atomic!
gdk-pixbuf-query-loaders > "${tmp_file}"
if [ "${?}" = "0" ]; then
cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
else
ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run"
fi
rm "${tmp_file}"
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:"
elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
fi
}
1.1 x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.1.ebuild?rev=1.1&content-type=text/plain
Index: gdk-pixbuf-2.26.1.ebuild
===================================================================
# Copyright 1999-2012 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.26.1.ebuild,v 1.1 2012/04/14 20:52:57 tetromino Exp $
EAPI="4"
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"
IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
COMMON_DEPEND="
>=dev-libs/glib-2.31.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 )"
DEPEND="${COMMON_DEPEND}
>=dev-util/pkgconfig-0.9
>=sys-apps/coreutils-8.5
>=sys-devel/gettext-0.17
>=dev-util/gtk-doc-am-1.11
doc? (
>=dev-util/gtk-doc-1.11
~app-text/docbook-xml-dtd-4.1.2 )"
# 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"
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 -e 's:libpng15:libpng libpng15:' \
-i configure || die
default
}
src_configure() {
# png always on to display icons (foser)
local myconf="
$(use_enable doc gtk-doc)
$(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}
}
src_install() {
default
dodoc AUTHORS NEWS* README*
# New library, remove .la files
find "${D}" -name '*.la' -exec rm -f '{}' + || die
}
pkg_postinst() {
# causes segfault if set, see bug 375615
unset __GL_NO_DSO_FINALIZER
tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
# be atomic!
gdk-pixbuf-query-loaders > "${tmp_file}"
if [ "${?}" = "0" ]; then
cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
else
ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run"
fi
rm "${tmp_file}"
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:"
elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-04-14 20:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-14 20:52 [gentoo-commits] gentoo-x86 commit in x11-libs/gdk-pixbuf: gdk-pixbuf-2.24.1-r1.ebuild ChangeLog gdk-pixbuf-2.26.1.ebuild gdk-pixbuf-2.26.0.ebuild Alexandre Rostovtsev (tetromino)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox