tetromino 15/08/01 00:52:50 Modified: ChangeLog Added: gdk-pixbuf-2.30.8-r1.ebuild Log: Fix integer overflow in pixops (bug #556314, thanks to Agostino Sarubbo). Fix gtk-doc installation (bug #549166, thanks to Rafał Mużyło). (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Revision Changes Path 1.140 x11-libs/gdk-pixbuf/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog?rev=1.140&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog?rev=1.140&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog?r1=1.139&r2=1.140 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- ChangeLog 3 Mar 2015 11:07:39 -0000 1.139 +++ ChangeLog 1 Aug 2015 00:52:50 -0000 1.140 @@ -1,6 +1,14 @@ # ChangeLog for x11-libs/gdk-pixbuf # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.139 2015/03/03 11:07:39 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.140 2015/08/01 00:52:50 tetromino Exp $ + +*gdk-pixbuf-2.30.8-r1 (01 Aug 2015) + + 01 Aug 2015; Alexandre Rostovtsev <[email protected]> + +gdk-pixbuf-2.30.8-r1.ebuild, +files/gdk-pixbuf-2.30.8-divide-by-zero.patch, + +files/gdk-pixbuf-2.30.8-pixops-overflow.patch: + Fix integer overflow in pixops (bug #556314, thanks to Agostino Sarubbo). Fix + gtk-doc installation (bug #549166, thanks to Rafał Mużyło). 03 Mar 2015; Yixun Lan <[email protected]> gdk-pixbuf-2.30.8.ebuild: add arm64 support, tested on A53 board 1.1 x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r1.ebuild?rev=1.1&content-type=text/plain Index: gdk-pixbuf-2.30.8-r1.ebuild =================================================================== # Copyright 1999-2015 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.30.8-r1.ebuild,v 1.1 2015/08/01 00:52:50 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal DESCRIPTION="Image loading library for GTK+" HOMEPAGE="http://www.gtk.org/"; LICENSE="LGPL-2+" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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.37.6:2[${MULTILIB_USEDEP}] >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] ) tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) " DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.17 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 abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r2 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) " MULTILIB_CHOST_TOOLS=( /usr/bin/gdk-pixbuf-query-loaders ) src_prepare() { # Upstream patches from 2.31.x epatch "${FILESDIR}"/${PN}-2.30.8-divide-by-zero.patch \ "${FILESDIR}"/${PN}-2.30.8-pixops-overflow.patch #556314 # This will avoid polluting the pkg-config file with versioned libpng, # which is causing problems with libpng14 -> libpng15 upgrade # See upstream bug #667068 # 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 [[ ${CHOST} == *-solaris* ]] && append-libs intl gnome2_src_prepare } multilib_src_configure() { # png always on to display icons ECONF_SOURCE="${S}" \ gnome2_src_configure \ $(usex debug --enable-debug=yes "") \ $(use_with jpeg libjpeg) \ $(use_with jpeg2k libjasper) \ $(use_with tiff libtiff) \ $(multilib_native_use_enable introspection) \ $(use_with X x11) \ --with-libpng # work-around gtk-doc out-of-source brokedness if multilib_is_native_abi; then ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die fi } multilib_src_install() { # Parallel install fails when no gdk-pixbuf is already installed, bug #481372 MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install } pkg_preinst() { gnome2_pkg_preinst multilib_pkg_preinst() { # Make sure loaders.cache belongs to gdk-pixbuf alone local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" if [[ -e ${EROOT}${cache} ]]; then cp "${EROOT}"${cache} "${ED}"/${cache} || die else touch "${ED}"/${cache} || die fi } multilib_foreach_abi multilib_pkg_preinst } pkg_postinst() { # causes segfault if set, see bug 375615 unset __GL_NO_DSO_FINALIZER multilib_foreach_abi gnome2_pkg_postinst # Migration snippet for when this was handled by gtk+ 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 } pkg_postrm() { gnome2_pkg_postrm if [[ -z ${REPLACED_BY_VERSIONS} ]]; then rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache fi }
