added patch required for interix prefix build - upstream committed already.

Package-Manager: portage-2.1.10.3/cvs/Linux i686

4 files changed, 56 insertions, 4 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index b929546a06de..13bb5514d26b 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.282 2011/07/03 10:45:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.283 2011/07/13 09:05:48 mduft Exp $
+
+  13 Jul 2011; Markus Duft <mduft@gentoo.org> cairo-1.10.2-r1.ebuild,
+  +files/cairo-1.10.2-interix.patch:
+  added patch required for interix prefix build - upstream committed already.
 
   03 Jul 2011; Raúl Porcel <armin76@gentoo.org> cairo-1.10.2-r1.ebuild,
   cairo-9999.ebuild:
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 4d5cbba9544c..0efdfa1439b1 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cairo-1.10.0-buggy_gradients.patch 581 RMD160 077fb7a18c2840c0d637d2161ca9d244cb69608b SHA1 45f4b6a834cb9f1c153f092fba18416d257d71c7 SHA256 3b622bb250b996ea5f5adc5c899af343e0efba5c477fa0e51fdbb720a8dd1b18
+AUX cairo-1.10.2-interix.patch 1235 RMD160 83803df650e8381649b11bd3c81dd0c6ee5f8e53 SHA1 d6b731fc8aa0c9461e62a9afc1431782d3af433b SHA256 d915d69e2eb96f6a4bef1de0c493ed9face7b5d6a79194ab9f2a7f3d85b799ea
 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
 DIST cairo-1.10.2.tar.gz 23558405 RMD160 8c8de00120398fe2b3a60a08ff59a464b2eebf47 SHA1 ccce5ae03f99c505db97c286a0c9a90a926d3c6e SHA256 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41
 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
-EBUILD cairo-1.10.2-r1.ebuild 4104 RMD160 2a0f29571b9111f1c644798cfab651ff0f0b5ff5 SHA1 dff255c2fe3a7f49c24be132a5f98407b26ba834 SHA256 ec7b462a7334c3982288c7525df37892a961059ee629f97009605291178aecae
+EBUILD cairo-1.10.2-r1.ebuild 4143 RMD160 a133b34322130bcc37bf24dcc47d4d0f2ee53586 SHA1 df64a3fe568a9c799927af4c47846bf4e833461c SHA256 0d23e478717f6221da9ede8781815e6d4c95520ecf514d2aba62c076b4238278
 EBUILD cairo-1.8.10.ebuild 3451 RMD160 c9205d9e45a024a67c3a7acb247a4f6feb21f4e2 SHA1 84ca8d3e011c476dc899e7f850d6885277643d15 SHA256 0fd58c9f5c9255f94864d9b137d6b4d940281d088a2f4f498a6b1495daca438c
 EBUILD cairo-9999.ebuild 3744 RMD160 c12315c9152b881ca995b5cb991ede75110e1870 SHA1 cbb683373ca0f19aa859158e13114213dd673c58 SHA256 ee1b817b90ec513d2a1c4746d6ea8f13c846d601c42519803b9547778d684974
-MISC ChangeLog 39664 RMD160 9db1cd097e379a67c1a8b4dc7dc8938310d4d65a SHA1 aab51ddea6ed079bf309f2e3d56eed7319f822bd SHA256 60c79856aea25dfbbad0e6ae9587d7b7c5d439d492b1cf84b68b3b35964d823b
+MISC ChangeLog 39848 RMD160 6ea1814eb3e495daacde0ee20dece45af2b646aa SHA1 7aae46ecb37bb951fd2696034a2f4b246ee6647b SHA256 ee69fde6cb770712206df9537a0452b993b571c71ebe3d12ed23d7d1c2eac1b2
 MISC metadata.xml 998 RMD160 2a4f5df13bc9d39c91e12e80924465450d758e32 SHA1 f4e943a00531a6f6a5ca2945a05ab95233b63e3b SHA256 325e1f55131748f3840ed1cfec421fe27aa6a621568135e4f6ce1d517b5d3cd8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4dX/EACgkQaBSIl5HlrrKPZgCdFoicZOmVnZCDTfCZzsNlX38C
+ROkAn093EVLtRH0xKKeK/MFd2lgIjvx8
+=Hy74
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.10.2-r1.ebuild b/x11-libs/cairo/cairo-1.10.2-r1.ebuild
index 53f72976ccd6..492794ebc44f 100644
--- a/x11-libs/cairo/cairo-1.10.2-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.10.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild,v 1.12 2011/07/03 10:45:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild,v 1.13 2011/07/13 09:05:48 mduft Exp $
 
 EAPI=3
 
@@ -64,6 +64,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
 	epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
+	epatch "${FILESDIR}"/${P}-interix.patch
 
 	# Slightly messed build system YAY
 	if [[ ${PV} == *9999* ]]; then
diff --git a/x11-libs/cairo/files/cairo-1.10.2-interix.patch b/x11-libs/cairo/files/cairo-1.10.2-interix.patch
new file mode 100644
index 000000000000..3333e3ee5256
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.10.2-interix.patch
@@ -0,0 +1,36 @@
+commit 95f6f7a174ca096a3d3dbe84ff220d166d1e2baa
+Author: Uli Schlachter <psychon@znc.in>
+Date:   Fri Oct 22 11:54:57 2010 +0200
+
+    Make both versions of _cairo_lround consistent again
+    
+    Commit c0008242b0f made cairo use libm's lround instead of its own _cairo_lround
+    by default. However, since commit ce58f874 from 2006, _cairo_lround does
+    arithmetic rounding instead of away-from-zero rounding (before said commit, it
+    was using baker's rounding).
+    
+    So to make the rounding of _cairo_lround be independent from
+    DISABLE_SOME_FLOATING_POINT, we have to use another function. Turns out that
+    _cairo_round already does the same thing that _cairo_lround does. Their only
+    difference is the return type.
+    
+    Signed-off-by: Uli Schlachter <psychon@znc.in>
+    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+diff --git a/src/cairoint.h b/src/cairoint.h
+index 53c87e5..539d92e 100644
+--- a/src/cairoint.h
++++ b/src/cairoint.h
+@@ -968,7 +968,11 @@ _cairo_round (double r)
+ cairo_private int
+ _cairo_lround (double d) cairo_const;
+ #else
+-#define _cairo_lround lround
++static inline int cairo_const
++_cairo_lround (double r)
++{
++    return _cairo_round (r);
++}
+ #endif
+ 
+ cairo_private uint16_t