diff options
-rw-r--r-- | x11-libs/cairo/Manifest | 14 | ||||
-rw-r--r-- | x11-libs/cairo/cairo-1.14.0.ebuild | 202 | ||||
-rw-r--r-- | x11-libs/cairo/cairo-9999.ebuild | 6 | ||||
-rw-r--r-- | x11-libs/cairo/files/cairo-1.12.16-all-clipped-1.patch | 38 | ||||
-rw-r--r-- | x11-libs/cairo/files/cairo-1.12.16-all-clipped-2.patch | 28 | ||||
-rw-r--r-- | x11-libs/cairo/files/cairo-1.12.16-all-clipped-3.patch | 29 | ||||
-rw-r--r-- | x11-libs/cairo/files/cairo-1.12.16-lto-optional.patch | 28 |
7 files changed, 329 insertions, 16 deletions
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest index 01ca540..1ca78b4 100644 --- a/x11-libs/cairo/Manifest +++ b/x11-libs/cairo/Manifest @@ -1,12 +1,4 @@ AUX cairo-1.10.0-buggy_gradients.patch 581 SHA256 3b622bb250b996ea5f5adc5c899af343e0efba5c477fa0e51fdbb720a8dd1b18 SHA512 c602992dd962586f9de09d2a838f828901845a02ba7afa1bc0cb434393aa05e98f02dc2342299b0b09f7cfbabb0295a22874023b68e1312982df2b71e3030442 WHIRLPOOL 55c72b55b1d378653204e1c8e0db463d12254ffa7a52e5c4b86eca9b67607bdcbb545b1589fa9a6df781d230d17264c67a018cece4030aac90eda7c68c41f5ea -AUX cairo-1.10.2-export-symbols.patch 2072 SHA256 31df610ff96a9d04b51e9636c8566bbe35112e5e012f585199bf883ee0924b3c SHA512 c74e670a4d2e372f37fe5b9e9c3b238bbd4eaae7ed98dc5e80efebfad243d777e0f09fd376761b082c2997848b08a88043c38f077408a4cfa7aacd941b54624f WHIRLPOOL 885e16165878e5c3817ff6ae07f2cf275a70721ebe903e51d9b9eb25f4790c5c9bb432516935427911e9417440f4a054dfb13da1d74f47ad998d88a44a271c92 -AUX cairo-1.10.2-interix.patch 1235 SHA256 d915d69e2eb96f6a4bef1de0c493ed9face7b5d6a79194ab9f2a7f3d85b799ea SHA512 fbc524c2f359b489dc337a2aa70fbfc21e4cea0e306d144f45f520875471a66b65cd7687730461bff16c47792a30d81ed2be48895e2809cc24996a2dc26c560e WHIRLPOOL d25a09cb9c53b553690e865385be90cd696ed6135734d4d2f3814bd30e386c5f0bff05e7cd4f34c737dd2db2e35f590023b4dd7a00e767abdad9acf60775d684 -AUX cairo-1.10.2-qt-surface.patch 2687 SHA256 fb96199ec7a4cf8527726be8d0333ed883183b56960832218eca1c9ef2e05dbd SHA512 1263f129f96ecf0277ba436cac0229b6245bed273594b2199d6b0f36711e323c966c43d9264e4cc8b69a299c8e9c1ec4af09ae2284bf5ca59a72486b31439c48 WHIRLPOOL 1ec6c56a6e1de3c838fb2dfa541e062e3f63630910a5609fe211bab8c8bbdb1968af021954020b4da208ba43cde18795e6114fccdd13ee0de2e0edd285d7996a -AUX cairo-1.10.2-ubuntu.patch 1777 SHA256 150d5b9f7f842d574a6e10e579bc8f27ca7b2055af8e0dd455aa0832bc3f4dae SHA512 8d9144fe809c4135f0dbd271d580620da769e2f946386e345783cf2379db458ed5ef964785b66d70b4e44a007c85a9209c85366144ad057d3ac5b60ee80383bc WHIRLPOOL c0754ccdeacc91ee2d222a945d8787ae3379a2881c36d8f0f6c545262baeb8f9fc866dba657f5d706c0b658efd5834c06725c2b942473b8755af10662f8ec088 -AUX cairo-1.12.10-xlib-corruption.patch 3199 SHA256 917c8d49ef881982e124a8e3b22bd4a2160ec3372c3518cf6c45287e10a434b3 SHA512 e7d6ec9729bcc3e755fdf7214d662728686ddecaee10a43ec50fa3bea010db156e063ba9f817ffdbf46ee85bfd4097a927b101b525505dd15eaec79ed622b479 WHIRLPOOL 3783515ab7e0b7700e77b56f699645060531a328b14975259250745a6f180bc36d9d2ac4feb494608a0a073e2729f5cb4662dafe25582ea3617e653497b2fc72 -AUX cairo-1.12.10-xshm-corruption.patch 1039 SHA256 3bf1147514160a76dbd6282e1e1b834155710a34c0f8fae6fe979f91b0cab735 SHA512 e7c793a2468fc3173be9058a250feea8390b3090c81f59ba00c052885077d2ff65e08bbc0536b96e2c7fee136bb2307aa8e8193e54e6dd3fd47107529a65d5c7 WHIRLPOOL 3cc47b61920197c069063805b89c1e0ab8964996c4331eb018049a268ee08275ac0dbb58dce891b58b335808b8c4fb6be565bf95181e6d1bc7a9551e17b5def9 -AUX cairo-1.12.12-disable-test-suite.patch 461 SHA256 da474e8982b1177ee6f8df70ce0867ee4e451a1ff6a94dce53ca2d62a936cd95 SHA512 1985a369fd6d707e816d9bb22aed89039b09fee105c84ffa4c63232dba15e87f12888d6ac735c766c075851e64e53c052df8af1eef08a75d6b908a5244ae2303 WHIRLPOOL c4ad092277b83d110094400af19f98b569297359be32b3e9a07a6e46acd43bcbdc3721838e833180809d647a2c7b941c9be1e8a00a437c3de3602dd8935610b2 -AUX cairo-1.12.14-libpng16.patch 1525 SHA256 f1af9d30e658b795062a42be3ef0bd0e215a69d7f8d3d295910a2459cf7aa21a SHA512 94483ddc3dc6ad4ff6e37c902e845d38375485077fbb682b512ead0b62abbe6708ad4e708bf84abb877c993b938c3412d581b42248ad3e2b77eda03c98437808 WHIRLPOOL fb5721a399059fbc1ea324192b5cd0ce63c9604f8cd3df9ecb51a239b9479450a2cba3786594a5ffec111212daeb72d6a5f14dcff9d081757a97b5344edbd6c0 AUX cairo-1.12.16-all-clipped-1.patch 1407 SHA256 9bee55cbb316e30f80df929902773190c50a3146754dcd10a712eb904689f904 SHA512 61cc6e02949ac78839bfb515f8c9100617b2179877cee9b72949bfaf4fe71db4cc41a22833c69966cd4eb49111cb6f8cfcd6d0a19f1f5e055b4bfc152baa4db6 WHIRLPOOL c9b5287417e66c9ed13fa6cf55d67aaddfbf0a31827a14c2b86fddb123a010dc3a3b950532a2ccadaaa4b1c935159a57a8b129c9768a80113ed1bc92dbf3ac34 AUX cairo-1.12.16-all-clipped-2.patch 959 SHA256 f44543a285c36a6433319d3ac95e7a3931e91ffd4ba284a29205b71ad77d4008 SHA512 ae236744df2779523789080a6557eb58e614e6579bfa7df470b4e6f7663b306f06806680c3f907172eb42de42a838f1b168bfd4c453bf3a798b8c04bcfab6d23 WHIRLPOOL e15ef92aa68e2581e999e6f07798d76c90f6f6bdae231c4ca28bc4b70e9d684a0777d85397283ab543f17c0a9599f6fffe219c7a6cd1dd5cb8fbd2a94456128d AUX cairo-1.12.16-all-clipped-3.patch 982 SHA256 4fed4974b303e16a67a295683a591fd594706b930d829488b6a87b12c8a17994 SHA512 32ebbaa05fff024bd8493aef350935b2fec098482ac90283b524c4e2ccd6b9f60e1053b7585f5f679b45eb463726c0b4291d840b51bc36e8477d92576ef33c7f WHIRLPOOL e564da5f1aa12990c4470b49f8cf72126530b7189897194c1d2ca6e7c50ddf8ba21c7ef5b037f1ecc53d46c747345f28f0d770bbf882aaef6c03f8c6305d3ba0 @@ -14,6 +6,6 @@ AUX cairo-1.12.16-lto-optional.patch 794 SHA256 7f7c7e7c13c6920019ae8663f3b6d829 AUX cairo-1.8.8-interix.patch 619 SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299 SHA512 651b73124ee5b65e2735deefde36727122e9c513da134441be923fb875aedfd3dbd81de8652e3919f3fa04d1de13dee6ec28e4fcd687aaec427d3b0dd94ac703 WHIRLPOOL a1803cbd8f32a8e926a8af932e099c5275920e3e09f7a53ee49898823e81ee7a2533a4db8d2125f200fa409d98fb8e2cbdeb01f00f64b7ba64ba8dffb8487bc3 AUX cairo-gl-headers.patch 1261 SHA256 270a8aa42c918e4acc5e68dead7bff9a1dcd3637506c5eb0b749dac30c0b2def SHA512 76f4861ce0f43d8da111b050cf941c6cf7110b81f249e2317b44569c34a5e18428a6f7c1009a5716175aefc501725e2b006106cfd52206bed52c34842cbaabb4 WHIRLPOOL 75aeec62724cf4fb2146146889c0ea7c9315c5b9e7586acac4f9eb395ab485687a67ec7b3e62663ed9c930de1deeff7ce6253af28b9c368646d8795fd4c3dd16 AUX cairo-respect-fontconfig.patch 538 SHA256 1732f21adfe5ab291d987b7537b13470266253f599901a4707d27fd2b3d66734 SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e WHIRLPOOL c7d8f364a787b095054507a6dceafe08e8112322853e261303adc07b79a9070be63200dbd4ff465943e2303126bcd7eec51b0f6c53f1d4e9a49fd363acbccde2 -DIST cairo-1.12.16.tar.xz 35889824 SHA256 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846 SHA512 35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f WHIRLPOOL 00c5e237ac67c2287f90f204456178dcd123126c42669fa63e3dc04fbf9b46d867c554b8f2ecaf803a2553c388661fda5efc4803d6c1f30d7d8fc75fff06cde0 -EBUILD cairo-1.12.16.ebuild 4064 SHA256 c0729f6266656a6195a53ed2fc8aa68257a46c2ec4fcef66a89852ebb9ddf296 SHA512 8a562abc3d9c9a1571ec9f08b5e9209ff7af07cb36a1467bc530732bdf1f6300f3ccc97622070b9ae9c3fd1051673a1d602da90582c636e3640f8649099e5761 WHIRLPOOL 5b3637108faa056d5afd80dbdfd587c9608de2156488724c6f5b9a762001cc46238ae53159e948a30f65bb93e652ea34d451e646b6bc61f1994cba5c425d466f -EBUILD cairo-9999.ebuild 6130 SHA256 9a81a6dd3d19431f8bbcf44ba4b0a29786eab6cdc202fd2475fa7d73d4d735b6 SHA512 ec413d7d651e03e1acd269dc3b8549675c61ef2cedba00aae008173265f29275daf19cac69ce84396cc0ae141efc7fe3ab006cec7d9c6c90e81231d8e460d3a2 WHIRLPOOL 66d4d53ab0a278c4b69f2dca8e37a7312212e2b8c8ec44298875317618acf18d6c8a8e6619e5ef042cb308581481def45e2f99efbddc9ef9c8feae3fee379c1b +DIST cairo-1.14.0.tar.xz 36584076 SHA256 2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7 SHA512 46900fac809763d610062d92fad6a65440d63f957907ebccc82cd90222bb8fea9782293b7825bdf9d86c396dd7f3879043a4c69dd80b519efa5488357c34ab58 WHIRLPOOL 8ac5e8be6f56f1636529ac61506db123ee343b051d99463b1644abf56b5e7eeb16197eab08c6d29faf4d99c8c0ba7d43902def99e33af1e20882bf44c5825309 +EBUILD cairo-1.14.0.ebuild 5930 SHA256 f8334aa189ce8d028b1ace85a6bacd10b1b471e4b72df0222d26143b81587338 SHA512 a187aa8d9da0cddfa2f484626451f516451424036c1dd90a147c7517fc0d722c30de81a58a9f70f6d310c37e68e55aa60e44898ab90d42fcf1229e9db7b19caa WHIRLPOOL af1c4934e462b986f85e4a71c844078adc961b62e325bbdf3e6f7764c9fdae7e3596ef1027ea08271874bf77cccd5e50ef9b7f437678399f43985530a89ed8b3 +EBUILD cairo-9999.ebuild 5971 SHA256 d9936b735960d407c37727d50119df65a6b56ce222b3c0c868eb5367457f813c SHA512 c6b36c90fc444af5702a2a6f68d3029c22ce4b46c2d32c047b9ba1e5f715777ab513d9849b06cf4bfc728e6bb7f8391d8831da7c89d295bec2144f8aa73f39b1 WHIRLPOOL 5f4965c11c1c16bb4a8687622dfa807ea130988708c88641a5ba4bfd5d700b6f79b12922ed12696c2fd25e0ad03c93aa63aca27016c66c743102ac21e6097d8e diff --git a/x11-libs/cairo/cairo-1.14.0.ebuild b/x11-libs/cairo/cairo-1.14.0.ebuild new file mode 100644 index 0000000..c7573fb --- /dev/null +++ b/x11-libs/cairo/cairo-1.14.0.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit check-reqs 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 cogl debug directfb drm gallium gles2 +glib glx legacy-drivers lto 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 ) + 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 ) + glx? ( opengl ) + openvg? ( || ( gles2 opengl ) ) + xlib-xcb? ( xcb ) +" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/cairo/cairo-features.h + /usr/include/cairo/cairo-directfb.h +) + +CHECKREQS_MEMORY="768M" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then + einfo "Checking for sufficient memory to build $PN with USE=lto" + check-reqs_pkg_pretend + fi +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then + check-reqs_pkg_setup + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch + use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch + epatch "${FILESDIR}"/${PN}-respect-fontconfig.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 + + # We need to run elibtoolize to ensure correct so versioning on FreeBSD + # upgraded to an eautoreconf for the above interix patch. + 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 cogl) \ + $(use_enable debug test-surfaces) \ + $(use_enable drm) \ + $(use_enable directfb) \ + $(use_enable gallium) \ + $(use_enable gles2 glesv2) \ + $(use_enable glib gobject) \ + $(use_enable glx) \ + $(use_enable lto) \ + $(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() { + # parallel make install fails + emake -j1 DESTDIR="${D}" install +} + +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 +} diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index 443770b..00349ef 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.ebuild @@ -9,7 +9,7 @@ inherit check-reqs eutils flag-o-matic autotools multilib-minimal if [[ ${PV} == *9999* ]]; then inherit git-2 EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo" - EGIT_COMMIT="f337342c88092a251dc00476c4a9880d1cb90822" + # EGIT_COMMIT="f337342c88092a251dc00476c4a9880d1cb90822" SRC_URI="" else SRC_URI="http://cairographics.org/releases/${P}.tar.xz" @@ -125,10 +125,6 @@ src_prepare() { # We need to run elibtoolize to ensure correct so versioning on FreeBSD # upgraded to an eautoreconf for the above interix patch. eautoreconf - - # this header patch required for embedded egl/gles builds against - # mesa stable-ish (up through at least 10.2.4) - epatch "${FILESDIR}"/${PN}-gl-headers.patch } multilib_src_configure() { diff --git a/x11-libs/cairo/files/cairo-1.12.16-all-clipped-1.patch b/x11-libs/cairo/files/cairo-1.12.16-all-clipped-1.patch new file mode 100644 index 0000000..cef9e29 --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.12.16-all-clipped-1.patch @@ -0,0 +1,38 @@ +From 3b261bea7d8e8094ff3899aefab6bbc8628a3585 Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +Date: Thu, 06 Mar 2014 08:34:10 +0000 +Subject: clip: Do not modify the special all-clipped cairo_clip_t + +Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75819 +--- +diff --git a/src/cairo-clip-boxes.c b/src/cairo-clip-boxes.c +index bbb4197..352654f 100644 +--- a/src/cairo-clip-boxes.c ++++ b/src/cairo-clip-boxes.c +@@ -173,7 +173,7 @@ _cairo_clip_intersect_rectangle_box (cairo_clip_t *clip, + clip->extents = *r; + } else { + if (! _cairo_rectangle_intersect (&clip->extents, r)) +- clip = _cairo_clip_set_all_clipped (clip); ++ return _cairo_clip_set_all_clipped (clip); + } + if (clip->path == NULL) + clip->is_region = _cairo_box_is_pixel_aligned (box); +@@ -312,10 +312,12 @@ _cairo_clip_intersect_boxes (cairo_clip_t *clip, + _cairo_boxes_extents (boxes, &limits); + + _cairo_box_round_to_rectangle (&limits, &extents); +- if (clip->path == NULL) ++ if (clip->path == NULL) { + clip->extents = extents; +- else if (! _cairo_rectangle_intersect (&clip->extents, &extents)) ++ } else if (! _cairo_rectangle_intersect (&clip->extents, &extents)) { + clip = _cairo_clip_set_all_clipped (clip); ++ goto out; ++ } + + if (clip->region) { + cairo_region_destroy (clip->region); +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-libs/cairo/files/cairo-1.12.16-all-clipped-2.patch b/x11-libs/cairo/files/cairo-1.12.16-all-clipped-2.patch new file mode 100644 index 0000000..df537da --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.12.16-all-clipped-2.patch @@ -0,0 +1,28 @@ +From ed175b2a2bebb6def85133257bc11a875d13b0dd Mon Sep 17 00:00:00 2001 +From: Uli Schlachter <psychon@znc.in> +Date: Thu, 06 Mar 2014 08:45:08 +0000 +Subject: clip: Fix handling of special all-clipped cairo_clip_t + +_cairo_clip_intersect_box() wasn't checking if it was called with the special, +read-only all-clipped clip and thus could have ended up writing to read-only +memory. + +References: https://bugs.freedesktop.org/show_bug.cgi?id=75819 +Signed-off-by: Uli Schlachter <psychon@znc.in> +--- +diff --git a/src/cairo-clip-boxes.c b/src/cairo-clip-boxes.c +index 352654f..7bcbeb1 100644 +--- a/src/cairo-clip-boxes.c ++++ b/src/cairo-clip-boxes.c +@@ -258,6 +258,9 @@ _cairo_clip_intersect_box (cairo_clip_t *clip, + { + cairo_rectangle_int_t r; + ++ if (_cairo_clip_is_all_clipped (clip)) ++ return clip; ++ + _cairo_box_round_to_rectangle (box, &r); + if (r.width == 0 || r.height == 0) + return _cairo_clip_set_all_clipped (clip); +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-libs/cairo/files/cairo-1.12.16-all-clipped-3.patch b/x11-libs/cairo/files/cairo-1.12.16-all-clipped-3.patch new file mode 100644 index 0000000..8b796fa --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.12.16-all-clipped-3.patch @@ -0,0 +1,29 @@ +From 18b3cce2f5812c357e4b6310e72d72dd9ec92ed4 Mon Sep 17 00:00:00 2001 +From: Bryce Harrington <b.harrington@samsung.com> +Date: Tue, 6 May 2014 10:18:19 -0700 +Subject: [PATCH] Fix segfault in firefox when scrolling on certain pages + +Bug discovered by thorsten <fly_a320@gmx.de> + +Patch from Chris Wilson <chris@chris-wilson.co.uk> +--- + src/cairo-xcb-surface-render.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c +index 9625953..75455e5 100644 +--- a/src/cairo-xcb-surface-render.c ++++ b/src/cairo-xcb-surface-render.c +@@ -3121,6 +3121,9 @@ _clip_and_composite_boxes (cairo_xcb_surface_t *dst, + + clip = _cairo_clip_copy (extents->clip); + clip = _cairo_clip_intersect_boxes (clip, boxes); ++ if (_cairo_clip_is_all_clipped (clip)) ++ return CAIRO_INT_STATUS_NOTHING_TO_DO; ++ + status = _cairo_clip_get_polygon (clip, &polygon, + &fill_rule, &antialias); + _cairo_clip_path_destroy (clip->path); +-- +1.9.2 + diff --git a/x11-libs/cairo/files/cairo-1.12.16-lto-optional.patch b/x11-libs/cairo/files/cairo-1.12.16-lto-optional.patch new file mode 100644 index 0000000..641ccea --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.12.16-lto-optional.patch @@ -0,0 +1,28 @@ +diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings +index f984eb2..15b3da2 100644 +--- a/build/configure.ac.warnings ++++ b/build/configure.ac.warnings +@@ -38,13 +38,18 @@ dnl options. Namely, the following: + + dnl -flto working really needs a test link, not just a compile + +-safe_MAYBE_WARN="$MAYBE_WARN" +-MAYBE_WARN="$MAYBE_WARN -flto" +-AC_TRY_LINK([],[ ++AC_ARG_ENABLE(lto, ++ AS_HELP_STRING([--disable-lto], ++ [Do not try to use Link-Time Optimization])) ++if test "x$enable_lto" != "xno"; then ++ safe_MAYBE_WARN="$MAYBE_WARN" ++ MAYBE_WARN="$MAYBE_WARN -flto" ++ AC_TRY_LINK([],[ + int main(int argc, char **argv) { return 0; } +-],[],[ ++ ],[],[ + MAYBE_WARN="$safe_MAYBE_WARN" +-]) ++ ]) ++fi + + MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" + |