tetromino 15/03/05 18:22:53 Modified: ChangeLog Added: cairo-1.14.0-r2.ebuild Log: Add upstream patches to fix several crashes. Should fix bug #541326 (heap corruption in darktable and evince), thanks to sergeev917 and Andrey Volkov. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Revision Changes Path 1.409 x11-libs/cairo/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.409&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.409&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.408&r2=1.409 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v retrieving revision 1.408 retrieving revision 1.409 diff -u -r1.408 -r1.409 --- ChangeLog 2 Mar 2015 09:20:51 -0000 1.408 +++ ChangeLog 5 Mar 2015 18:22:53 -0000 1.409 @@ -1,6 +1,17 @@ # ChangeLog for x11-libs/cairo # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.408 2015/03/02 09:20:51 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.409 2015/03/05 18:22:53 tetromino Exp $ + +*cairo-1.14.0-r2 (05 Mar 2015) + + 05 Mar 2015; Alexandre Rostovtsev <[email protected]> + +cairo-1.14.0-r2.ebuild, +files/cairo-1.14.0-CFF-unaligned-access.patch, + +files/cairo-1.14.0-image-negative-span-length.patch, + +files/cairo-1.14.0-tor-scan-converter-do_fullrow-intersection.patch, + +files/cairo-1.14.0-xcb-0-sized-glyph.patch, + +files/cairo-1.14.0-xlib-0-sized-glyph.patch: + Add upstream patches to fix several crashes. Should fix bug #541326 (heap + corruption in darktable and evince), thanks to sergeev917 and Andrey Volkov. 02 Mar 2015; Agostino Sarubbo <[email protected]> cairo-1.12.18-r1.ebuild: Stable for ppc, wrt bug #540676 1.1 x11-libs/cairo/cairo-1.14.0-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.14.0-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.14.0-r2.ebuild?rev=1.1&content-type=text/plain Index: cairo-1.14.0-r2.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.14.0-r2.ebuild,v 1.1 2015/03/05 18:22:53 tetromino Exp $ EAPI=5 inherit eutils flag-o-matic autotools multilib-minimal if [[ ${PV} == *9999* ]]; then inherit git-2 EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo" SRC_URI="" else SRC_URI="http://cairographics.org/releases/${P}.tar.xz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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" fi DESCRIPTION="A vector graphics library with cross-device output support" HOMEPAGE="http://cairographics.org/"; LICENSE="|| ( LGPL-2.1 MPL-1.1 )" SLOT="0" IUSE="X aqua debug directfb drm gallium gles2 +glib opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb" # gtk-doc regeneration doesn't seem to work with out-of-source builds #[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it RESTRICT="test" RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}] directfb? ( dev-libs/DirectFB ) gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) ) openvg? ( >=media-libs/mesa-9.1.6[openvg,${MULTILIB_USEDEP}] ) qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] drm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] gallium? ( >=media-libs/mesa-9.1.6[gallium,${MULTILIB_USEDEP}] ) ) ) xcb? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} virtual/pkgconfig >=sys-devel/libtool-2 X? ( >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}] drm? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] ) )" #[[ ${PV} == *9999* ]] && DEPEND="${DEPEND} # doc? ( # >=dev-util/gtk-doc-1.6 # ~app-text/docbook-xml-dtd-4.2 # )" # drm module requires X # for gallium we need to enable drm REQUIRED_USE=" drm? ( X ) gallium? ( drm ) gles2? ( !opengl ) openvg? ( || ( gles2 opengl ) ) xlib-xcb? ( xcb ) " MULTILIB_WRAPPED_HEADERS=( /usr/include/cairo/cairo-directfb.h ) src_prepare() { epatch "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch # fixed in 1.14 branch epatch "${FILESDIR}"/${P}-align-64bit-types.patch # fixed in master branch epatch "${FILESDIR}"/${PN}-1.14.0-CFF-unaligned-access.patch epatch "${FILESDIR}"/${PN}-1.14.0-tor-scan-converter-do_fullrow-intersection.patch #541326 epatch "${FILESDIR}"/${PN}-1.14.0-xlib-0-sized-glyph.patch epatch "${FILESDIR}"/${PN}-1.14.0-xcb-0-sized-glyph.patch epatch "${FILESDIR}"/${PN}-1.14.0-image-negative-span-length.patch # tests and perf tools require X, bug #483574 if ! use X; then sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die fi epatch_user # Slightly messed build system YAY if [[ ${PV} == *9999* ]]; then touch boilerplate/Makefile.am.features touch src/Makefile.am.features touch ChangeLog fi eautoreconf } multilib_src_configure() { local myopts [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT use elibc_FreeBSD && myopts+=" --disable-symbol-lookup" # TODO: remove this (and add USE-dep) when DirectFB is converted, # bug #484248 -- but beware of the circular dep. if ! multilib_is_native_abi; then myopts+=" --disable-directfb" fi # TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010 if ! multilib_is_native_abi; then myopts+=" --disable-qt" fi # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)" ECONF_SOURCE="${S}" \ econf \ --disable-dependency-tracking \ $(use_with X x) \ $(use_enable X tee) \ $(use_enable X xlib) \ $(use_enable X xlib-xrender) \ $(use_enable aqua quartz) \ $(use_enable aqua quartz-image) \ $(use_enable debug test-surfaces) \ $(use_enable drm) \ $(use_enable directfb) \ $(use_enable gallium) \ $(use_enable gles2 glesv2) \ $(use_enable glib gobject) \ $(use_enable openvg vg) \ $(use_enable opengl gl) \ $(use_enable qt4 qt) \ $(use_enable static-libs static) \ $(use_enable svg) \ $(use_enable valgrind) \ $(use_enable xcb) \ $(use_enable xcb xcb-shm) \ $(use_enable xlib-xcb) \ --enable-ft \ --enable-pdf \ --enable-png \ --enable-ps \ ${myopts} } multilib_src_install_all() { prune_libtool_files --all einstalldocs } pkg_postinst() { if use !xlib-xcb; then if has_version net-misc/nxserver-freenx \ || has_version net-misc/x2goserver; then ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers." ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+" ewarn "applications that are running inside NX sessions. For details, see" ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173"; fi fi }
