From a1b00df88cdf84adce7d007c045afd6c7bcf0453 Mon Sep 17 00:00:00 2001 From: Dror Levin Date: Wed, 16 Jun 2010 18:11:35 +0000 Subject: [PATCH] Version bump now that mozilla issues are solved. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- x11-libs/cairo/ChangeLog | 8 +- x11-libs/cairo/Manifest | 19 +++- x11-libs/cairo/cairo-1.8.10.ebuild | 107 ++++++++++++++++++ .../cairo/files/cairo-1.8.10-libpng14.patch | 11 ++ 4 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 x11-libs/cairo/cairo-1.8.10.ebuild create mode 100644 x11-libs/cairo/files/cairo-1.8.10-libpng14.patch diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog index ce03914adc43..f280568fab5e 100644 --- a/x11-libs/cairo/ChangeLog +++ b/x11-libs/cairo/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/cairo # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.238 2010/03/26 22:34:15 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.239 2010/06/16 18:11:35 spatz Exp $ + +*cairo-1.8.10 (16 Jun 2010) + + 16 Jun 2010; Dror Levin +cairo-1.8.10.ebuild, + +files/cairo-1.8.10-libpng14.patch: + Version bump now that mozilla issues are solved. *cairo-1.8.8-r1 (26 Mar 2010) diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest index e56ffac65845..8cd5319d37e4 100644 --- a/x11-libs/cairo/Manifest +++ b/x11-libs/cairo/Manifest @@ -1,9 +1,26 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + AUX cairo-1.2.4-lcd-cleartype-like.diff 7244 RMD160 e50d5bf17cbead688a8b808a78fe4104c09af52e SHA1 f63131fd75bb496db59e3ce6bc755bbfb70baacb SHA256 4926d20d2b6b5071a5bf9ee9a12a36fef69510ebebd717c1dab151fe650f173a +AUX cairo-1.8.10-libpng14.patch 426 RMD160 f97e4f2d1e65e2c6a90c5fddbce66caeb4337bba SHA1 bb029f710432af7b24175aa941fc7cd3187ef767 SHA256 b090f829d3b9fb69b83bfa094552335b8382988d60ce7e46558c4069b8bca532 AUX cairo-1.8.8-interix.patch 619 RMD160 9bb28c5a88aa1f2776d32ac7020aef4ba93872b5 SHA1 857a4d2be0118a6d2d0d80388b5963a5f768341d SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299 AUX cairo-1.8.8-libpng14.patch 461 RMD160 e6676e89f64ae2c1390315ad58d0c697acf66e9d SHA1 0a900ceb2b5fa9721687dc670a1b582fa6c59341 SHA256 d4391514334809b6a13c644d7655c02e5d1070d61653452ff93fcc44bf904fb6 DIST cairo-1.8-lcd_filter.patch.bz2 7067 RMD160 5c2ee470022788df88425da24cebea3baed69298 SHA1 9202c14967a633a9e57dd203695896d0197fea8b SHA256 6965d46df45d8382d122170a0f1dfaeb25bd68adc998b42f62397123e5795d1d +DIST cairo-1.8.10.tar.gz 7102657 RMD160 9538baf30f812b950beeb93893f46d1223fb44ce SHA1 fd5e8ca82ff0e8542ea4c51612cad387f2a49df3 SHA256 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439 DIST cairo-1.8.8.tar.gz 6646082 RMD160 78af536ebaaffc608114b626b22fc9a20cff3750 SHA1 e4b8b219427d1ca3dc95f5f44914dce1ae0c3766 SHA256 3c51d3de5dc4596e01a6675acd3c86c2c99c00f02e8fad5493758a29fe451c90 +EBUILD cairo-1.8.10.ebuild 3594 RMD160 7bf770e7c1d8fe50f118a8c46bf8b6178112a1f9 SHA1 c1ec19e80709739958a2941691af177eca3ca0b3 SHA256 e4961a22c61bc7ff1ffe677a4e5990eca6a76806e1ae719b69bbdfd8dc89ab4f EBUILD cairo-1.8.8-r1.ebuild 3593 RMD160 f6c888711f3d671b9b7fcd9eb0aa869c76fba166 SHA1 7696a78537b92b28ee10fdd76aa4ef26fcf741e8 SHA256 012ce9545b9f23b8e1c77be48ea675641c47e11cfdeacdab7d99fa58e8ae1921 EBUILD cairo-1.8.8.ebuild 3268 RMD160 93e9229cfa92173c2941f22a59960b52f3841cbc SHA1 f505952d4df79f73f95e90c0415c1bd58f51df10 SHA256 c50936f777d7a29b223ed4f80e192e11759c6a0f35779e2eaaa18aa9bbf89bbc -MISC ChangeLog 33359 RMD160 2cef6066077ec3f1286580552b20e7599de551ff SHA1 2daf57c005b2f4416033fa48ebe2a67650f1ad55 SHA256 0d7003c2e1d7a64c36eb6d31ba499a948665d6cc2e9cd004db31530e4e31c42b +MISC ChangeLog 33545 RMD160 1f5b02e86fb6ae8898ac537373ce0fd1033a39ad SHA1 6b43bb4fd7650f34eaf7d1bc249a13fd393da203 SHA256 dec604beef25073f965c6a071e64354ec52bcbddedcf68561238a003340b173a MISC metadata.xml 880 RMD160 e438a6b32c150ad5bc85b6af589332348b163ce3 SHA1 4eaefef9d254e085d8438768202d4aa947814802 SHA256 3f735384598141c1905cd1e260e6392dbe8618aea2a173743fbbfe267c38ea5d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iQEcBAEBCgAGBQJMGRPfAAoJEAWF714uGAc6HDoH/3zBPoavZUZzJHKZ2rMMTWt4 +A+0OA+pMjdljfabRcgr9/H7gH6zIMuB+i53QGk/hylahqbm43cqmvMBxDg69rOKu +AXSe5xWueHsD08pqqsNvSwTLT3gVc4VsPYhXym0ItMsr6IGL2iuH8pvIHhhorl/r +/Is8srrpUOmsj3hljffcT00GLsO2zqBndLqT7MvDrCqIqf5FSq4VXCp68WY8+7PS +xcqda0akjt4DO6pGCq8UC0bZAsl2TGqO0PQZIAKXQnoUM0O+cw2mklhh+iasPEoN +4l6Xl8DpwowzMVYeUbGQYryVseJ7pKMcJ4EgDEGBaX7avpbDkZeXs1s3JIPkGmQ= +=1jG0 +-----END PGP SIGNATURE----- diff --git a/x11-libs/cairo/cairo-1.8.10.ebuild b/x11-libs/cairo/cairo-1.8.10.ebuild new file mode 100644 index 000000000000..871fff49b796 --- /dev/null +++ b/x11-libs/cairo/cairo-1.8.10.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.10.ebuild,v 1.1 2010/06/16 18:11:35 spatz Exp $ + +EAPI=2 + +inherit eutils flag-o-matic autotools + +DESCRIPTION="A vector graphics library with cross-device output support" +HOMEPAGE="http://cairographics.org/" +SRC_URI="http://cairographics.org/releases/${P}.tar.gz + mirror://gentoo/${PN}-1.8-lcd_filter.patch.bz2" + +LICENSE="|| ( LGPL-2.1 MPL-1.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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="aqua cleartype debug directfb doc glitz lcdfilter opengl +svg X xcb" + +# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it +RESTRICT="test" + +RDEPEND="media-libs/fontconfig + >=media-libs/freetype-2.1.9 + sys-libs/zlib + >=media-libs/libpng-1.2.43-r2:0 + >=x11-libs/pixman-0.12.0 + directfb? ( >=dev-libs/DirectFB-0.9.24 ) + glitz? ( >=media-libs/glitz-0.5.1 ) + svg? ( dev-libs/libxml2 ) + X? ( >=x11-libs/libXrender-0.6 + x11-libs/libXext + x11-libs/libX11 + x11-libs/libXft ) + xcb? ( >=x11-libs/libxcb-0.92 + x11-libs/xcb-util )" +# test? ( +# pdf test +# x11-libs/pango +# >=x11-libs/gtk+-2.0 +# >=app-text/poppler-bindings-0.9.2[gtk] +# ps test +# app-text/ghostscript-gpl +# svg test +# >=x11-libs/gtk+-2.0 +# >=gnome-base/librsvg-2.15.0 + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.19 + >=sys-devel/libtool-2 + doc? ( >=dev-util/gtk-doc-1.6 + ~app-text/docbook-xml-dtd-4.2 ) + X? ( x11-proto/renderproto )" + +src_prepare() { + if use lcdfilter; then + # LCD filter patch from Ubuntu, taken from: + # http://bazaar.launchpad.net/%7Eubuntu-branches/ubuntu/lucid/cairo/lucid/files/head%3A/debian/patches/ + epatch "${WORKDIR}"/${PN}-1.8-lcd_filter.patch + elif use cleartype; then + # ClearType-like patches applied by ArchLinux + epatch "${FILESDIR}"/${PN}-1.2.4-lcd-cleartype-like.diff + fi + + epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch \ + "${FILESDIR}"/${P}-libpng14.patch + + # We need to run elibtoolize to ensure correct so versioning on FreeBSD + # upgraded to an eautoreconf for the above interix patch. + eautoreconf +} + +src_configure() { + [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT + # http://bugs.freedesktop.org/show_bug.cgi?id=15463 + [[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS + + #gets rid of fbmmx.c inlining warnings + append-flags -finline-limit=1200 + + if use glitz && use opengl; then + export glitz_LIBS=$(pkg-config --libs glitz-glx) + fi + + econf $(use_enable X xlib) $(use_enable doc gtk-doc) \ + $(use_enable directfb) $(use_enable xcb) \ + $(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \ + $(use_enable debug test-surfaces) --enable-pdf --enable-png \ + --enable-ft --enable-ps \ + $(use_enable aqua quartz) $(use_enable aqua quartz-image) \ + || die "configure failed" +} + +src_install() { + make DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS ChangeLog NEWS README +} + +pkg_postinst() { + if use xcb; then + ewarn "You have enabled the Cairo XCB backend which is used only by" + ewarn "a select few apps. The Cairo XCB backend is presently" + ewarn "un-maintained and needs a lot of work to get it caught up" + ewarn "to the Xrender and Xlib backends, which are the backends used" + ewarn "by most applications. See:" + ewarn "http://lists.freedesktop.org/archives/xcb/2008-December/004139.html" + fi +} diff --git a/x11-libs/cairo/files/cairo-1.8.10-libpng14.patch b/x11-libs/cairo/files/cairo-1.8.10-libpng14.patch new file mode 100644 index 000000000000..18723675f8cb --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.8.10-libpng14.patch @@ -0,0 +1,11 @@ +--- configure.ac ++++ configure.ac +@@ -161,7 +161,7 @@ + AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config]) + if test "x$png_REQUIRES" = x; then + # libpng13 is GnuWin32's libpng-1.2.8 :-( +- for l in libpng12 libpng13 libpng10 libpng; do ++ for l in libpng14 libpng12 libpng13 libpng10 libpng; do + if $PKG_CONFIG --exists $l ; then + png_REQUIRES=$l + use_png=yes -- 2.26.2