upstream patch to include ctype.h when necessary

Package-Manager: portage-2.1.3_rc8

4 files changed, 31 insertions, 20 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 6946618f65d4..5c06a88b509a 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.134 2007/06/28 15:18:32 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.135 2007/07/13 14:24:26 cardoe Exp $
+
+  13 Jul 2007; Doug Goldstein <doug@gentoo.org>
+  +files/cairo-1.4.6-ctype.patch, cairo-1.4.6.ebuild:
+  upstream patch to include ctype.h when necessary
 
 *cairo-1.4.10 (28 Jun 2007)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 84e2c8b2b7c4..d4f4878a0d90 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX cairo-1.4.6-ctype.patch 329 RMD160 eb0557a3e5de8beb5d26547ca5b679a993acc26e SHA1 43386bf44d9e0c236d9607463405d1712619db4f SHA256 c776efcfdcf4e5e28ec1fca2a540946bd98433f3db6cdef8e95f0fa80c0a1123
+MD5 fbe188e74b3b279c35413e5333d05d89 files/cairo-1.4.6-ctype.patch 329
+RMD160 eb0557a3e5de8beb5d26547ca5b679a993acc26e files/cairo-1.4.6-ctype.patch 329
+SHA256 c776efcfdcf4e5e28ec1fca2a540946bd98433f3db6cdef8e95f0fa80c0a1123 files/cairo-1.4.6-ctype.patch 329
 AUX cairo-1.4.8-XError.patch 2455 RMD160 5887623e66013e7b347f2cbafff7333b281aa77f SHA1 be4134808b45e1e29701c6d4281097f2e4daf1c6 SHA256 b21957ce9a28e87309c52611741e1061b07685022bfb2d53b8054df8180d18a0
 MD5 a64b2c7ab1d874a10c9b2b83704b2b0d files/cairo-1.4.8-XError.patch 2455
 RMD160 5887623e66013e7b347f2cbafff7333b281aa77f files/cairo-1.4.8-XError.patch 2455
@@ -26,18 +27,18 @@ EBUILD cairo-1.4.4.ebuild 1892 RMD160 683fb7b82ffb42f5631e1d5f2a6d68fdad2a5c82 S
 MD5 a559566e03b890c76fb274226ad793aa cairo-1.4.4.ebuild 1892
 RMD160 683fb7b82ffb42f5631e1d5f2a6d68fdad2a5c82 cairo-1.4.4.ebuild 1892
 SHA256 b2056678933ce5ad63babf559018ff7473411144bae14cb1e3f86921090db2fc cairo-1.4.4.ebuild 1892
-EBUILD cairo-1.4.6.ebuild 1889 RMD160 c1e928a853fd700adc58d618373fbc25240ba899 SHA1 0e4e05fbb2b8819a2b7b21b49d0358bc1bf32318 SHA256 ccdde393a8c474408cc1c6129de4bea11b96f69b948454117bb4754b346e578f
-MD5 56c104087c24e2ad494163d6e2459961 cairo-1.4.6.ebuild 1889
-RMD160 c1e928a853fd700adc58d618373fbc25240ba899 cairo-1.4.6.ebuild 1889
-SHA256 ccdde393a8c474408cc1c6129de4bea11b96f69b948454117bb4754b346e578f cairo-1.4.6.ebuild 1889
+EBUILD cairo-1.4.6.ebuild 1998 RMD160 28c9ef34041504e8c4f19b2324df1ab7960fe75b SHA1 4e98f60dcccbdd963c6528e955727ca6300432ee SHA256 53529edf4f7b41b015f43176fba81b3ef8ba4bede4a05ff4e02c30cb33ec7876
+MD5 daf0450672666f44aa92939040984751 cairo-1.4.6.ebuild 1998
+RMD160 28c9ef34041504e8c4f19b2324df1ab7960fe75b cairo-1.4.6.ebuild 1998
+SHA256 53529edf4f7b41b015f43176fba81b3ef8ba4bede4a05ff4e02c30cb33ec7876 cairo-1.4.6.ebuild 1998
 EBUILD cairo-1.4.8.ebuild 2058 RMD160 5ce9f5e458413e135e075348acbdf65a9a7e5870 SHA1 38c8204ae56fb60e68b4fce845f5cdec23b499b3 SHA256 97e2d5111749fbe48d2caedf691f5c5540a569101361da5d752cde5f51700db4
 MD5 9c398418e7c8e92bd351a60383c000c7 cairo-1.4.8.ebuild 2058
 RMD160 5ce9f5e458413e135e075348acbdf65a9a7e5870 cairo-1.4.8.ebuild 2058
 SHA256 97e2d5111749fbe48d2caedf691f5c5540a569101361da5d752cde5f51700db4 cairo-1.4.8.ebuild 2058
-MISC ChangeLog 18964 RMD160 52210382a2460b760b1facb3fcfb68c51a88d9ed SHA1 89626df5c7801fc9ae27721d0628c1d3b7446555 SHA256 6862de9af0ab6bfd5bc1680b74dcac6fb4d028af4a90d979df6b07ddff8c9f8e
-MD5 717996cfe852bc054e610ad6226f40f2 ChangeLog 18964
-RMD160 52210382a2460b760b1facb3fcfb68c51a88d9ed ChangeLog 18964
-SHA256 6862de9af0ab6bfd5bc1680b74dcac6fb4d028af4a90d979df6b07ddff8c9f8e ChangeLog 18964
+MISC ChangeLog 19118 RMD160 8bc54eec8c7a8565568abce43d4e35285638447f SHA1 d91549fb60aea5ede33c609cba88d28cd754154a SHA256 0cde5f2f7d21ba7d24b0f6be0b607ef81e736bea389dcfaa1d459d3a8a850bac
+MD5 f8f821f273208f390a0dd99414641e32 ChangeLog 19118
+RMD160 8bc54eec8c7a8565568abce43d4e35285638447f ChangeLog 19118
+SHA256 0cde5f2f7d21ba7d24b0f6be0b607ef81e736bea389dcfaa1d459d3a8a850bac ChangeLog 19118
 MISC metadata.xml 316 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 SHA1 3605a0ef9a0874134e3dbed331719153c1dc9db6 SHA256 5d1733aeedb6ad445d6e54a1dcfcfe822ea57bd010275fc46d9c34cc0c6b9b53
 MD5 b11544cc1116038b149ab213e9d56262 metadata.xml 316
 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 metadata.xml 316
@@ -57,10 +58,3 @@ SHA256 a83b198cc834e136f49d06c3be0c03f38917d67db6b3526bcacc7b1f06209640 files/di
 MD5 f494cfa2c79edbc6fbdb82b5b866dc99 files/digest-cairo-1.4.8 238
 RMD160 dfa3becb9173eb21c23a7ae55e45a624c3b2049c files/digest-cairo-1.4.8 238
 SHA256 7669cf859fcac6c89e7fc116ca6b22c5ef461e6850c0e40a2b80b814b6de6b9b files/digest-cairo-1.4.8 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGg9FtoeSe8B0zEfwRAm+KAJwLn97Fx8+3kwdyK4VMO8rGZ7wXpACfQ9jC
-VowyC2xNpviqClG3d8mCt24=
-=uPy6
------END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.4.6.ebuild b/x11-libs/cairo/cairo-1.4.6.ebuild
index 044294191866..6723446b22af 100644
--- a/x11-libs/cairo/cairo-1.4.6.ebuild
+++ b/x11-libs/cairo/cairo-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.6.ebuild,v 1.10 2007/06/24 22:28:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.6.ebuild,v 1.11 2007/07/13 14:24:26 cardoe Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -44,6 +44,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# some people use Werror in their code then don't define ctype.h.. 
+	epatch "${FILESDIR}"/${P}-ctype.patch
+
 	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
 	elibtoolize
 }
diff --git a/x11-libs/cairo/files/cairo-1.4.6-ctype.patch b/x11-libs/cairo/files/cairo-1.4.6-ctype.patch
new file mode 100644
index 000000000000..a40ef8d545eb
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.4.6-ctype.patch
@@ -0,0 +1,10 @@
+--- cairo-type1-subset.c.bak	2007-05-18 15:13:37.000000000 +0800
++++ cairo-type1-subset.c	2007-05-18 15:36:07.000000000 +0800
+@@ -41,6 +41,7 @@
+ /* XXX: Eventually, we need to handle other font backends */
+ #include "cairo-ft-private.h"
+ 
++#include <ctype.h>
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ #include FT_OUTLINE_H