Remove useless extern, fixes compile on uclibc, bug #469954

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 40 insertions, 13 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 2c6952957c75..3f5cbdb63a9f 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/fontforge
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.149 2012/09/05 07:52:11 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.150 2013/05/28 15:46:22 blueness Exp $
+
+  28 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +files/fontforge-20110222-remove-useless-extern.patch,
+  fontforge-20110222-r1.ebuild:
+  Remove useless extern, fixes compile on uclibc, bug #469954
 
   05 Sep 2012; Justin Lecher <jlec@gentoo.org> fontforge-20100501.ebuild,
   fontforge-20110222-r1.ebuild, fontforge-20110222.ebuild:
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 45e30f00db82..becd3b0d9d3e 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -3,23 +3,33 @@ Hash: SHA256
 
 AUX fontforge-20110222-libz.so-linkage.patch 2959 SHA256 8358e7fa2fd43876cb24f3d1c58765aacc8560ddfd7d3577d65984e2c796128e SHA512 7f407489ed1554e45b7aef8f15626bc9141ad544f368a67b734b4c6602ac1eb2bd26485039312d856853a79e2ed4046caa14bd22db53948402b29270d8f0edc3 WHIRLPOOL 857339763873909c1746b3b1becc7cf136c1170b9edfe010200872eeab7ad1f9152424e4411ed74f7b017aa23cbabb035e039503288d95bdf019cbde7c40c97c
 AUX fontforge-20110222-lxkbui.patch 545 SHA256 192d3606dcf8f925a9cc5f79e7430979d0eb1a0f209a4447682f135f79d33828 SHA512 a60bd08aeb16ce515172814b1867fe4d7e876c960d8f044f9f90c8837230ea0e50ac50113145cdf23c6c04f7caad16dfdd1b20c96eda1e2266b9e0f0091fa970 WHIRLPOOL 3f50a26e9325bfda0391d2facffc6c553c3ec193f11a138e573b892426f9b068d20b0f0411bdb7d14395754a1f081f3474e71102255e8e2a93842afd9c33adea
+AUX fontforge-20110222-remove-useless-extern.patch 554 SHA256 45f169384d528766426272b16a9cca4cadbb63fbf5f37a1b084afbc187b21ac9 SHA512 5d665c61834ce2c1002743fa90658b138bf6fd768585821f729de5a1f3a4e30b29d88dbf3ae525640d5b5a62a77d41f87d6e6ebb0e4495130115913014be8a46 WHIRLPOOL 95592a878ced57d853e727ac1366823beb6e82b8f21975c302a3a2f30fcda7765f22ce37042e09fc33c62646b31a6eda58a7517d6362a076f5d00af5b3c7ecfc
 AUX fontforge-desktop.patch 662 SHA256 b2308b21b7db3c1ad0f8e2880678a0866f401e3ce57903e98ed68472f1e187e8 SHA512 d0e261421a2bb469b9280096b7da41d767cb1ec38525d03a1ee1cc70f2fe4c102a0fe01658ecbfb704ec7346b398bc9a2ef572b7db66d9aa3583c849afd567aa WHIRLPOOL 7dfd65973126d971617de96dd796ca84c465be7e85d5b54660f5633990045afd76d043c7d1a23b5274adfb64fa596c8bdbb3dd3dedd6e1bf2e1abeaf2d504ebb
 AUX fontforge-py27.diff 387 SHA256 18d71c28258a00459621113a0126b525b08cfd0a2dfb406fc90c6bed3d3790ed SHA512 c785ccc6288346568812d9da6f99a7d0630b130989e3813fb29cc355ec5f726d62fede6616b21767b5eb7eb26f1c9ced80dbf316144b73e956ba6245354ae4e0 WHIRLPOOL 220a6ed9f71f7fbdf84abef0be697a43d3b6edaa3e291e36dc355b0f21f05cd5bcccb607af50923cbd9f042e4246d341db2bdbfb85d97f992c40c12e5c885e96
-DIST cidmaps-20090121.tgz 314314 SHA256 1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3
+DIST cidmaps-20090121.tgz 314314 SHA256 1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3 SHA512 a85daeb16b6650179f54ff9e35915c4c7bb5e2efca0455262a271063849484dbba08c4b493c4ca08552365205995cad5c3770ba7b3cadb2e5c386626dc46636c WHIRLPOOL 0c840cf7f4d7f432597f68620231da34cff2dac5af1ba3200b57b63566f3b81b151ddf7cbaa84665f4b7c629bb8f100c72b8bade8634687e5c11110ed91ed821
 DIST fontforge_full-20100501.tar.bz2 6666386 SHA256 ee4928b0df7480c31a422645854d9f3f4f6718dd423b6885bd33e87a8a6edd79
-DIST fontforge_full-20110222.tar.bz2 5126031 SHA256 8fa2818026f84bb7b8a77451d21cab7e9dea8aa904e5218afa158be6a320433e
+DIST fontforge_full-20110222.tar.bz2 5126031 SHA256 8fa2818026f84bb7b8a77451d21cab7e9dea8aa904e5218afa158be6a320433e SHA512 af74ca482d8892c30e650bd377df16d44a11738c930625bcf9878d97ba8faaf67f2965dcf3c32b722120273d99dcdd042405bb6afeee1286f0cf18f916e4f12a WHIRLPOOL f6446b8b6d5d49d9bb421bf39a4a192f4622916eb68013a3317c78585d1ae05837478c5d2fa1bb2ebad9caa3455cf0db6e132f6e7ad07d3ae9f58b1b4ab7fd52
 DIST fontforge_htdocs-20100429.tar.bz2 3115782 SHA256 842a5e675341578aacdd2614ec416719eba51826749d73b2044731335d1a1883
-DIST fontforge_htdocs-20110221.tar.bz2 3129839 SHA256 7a81b9a30fa8f287e63abcfee568d7fcfd1a21c75c5c69effe95fe677d963fec
+DIST fontforge_htdocs-20110221.tar.bz2 3129839 SHA256 7a81b9a30fa8f287e63abcfee568d7fcfd1a21c75c5c69effe95fe677d963fec SHA512 b91808cd5deb6472785f3353fe9856279ddb0887ae249eccd37cff8dbdf53065a8d6008dbf160dd6c5ba6cfecf37b9c4e63c5baa6332f4b4128d5e471d243236 WHIRLPOOL 7664b853e7dd0c9a36c50e84dbd332ff4c10232fa200e9ac42c97982993c7d23e06e235a0f88183a7e6a78f342789c0141fb396879b5e5fa0ccb9d4bd3b30d43
 EBUILD fontforge-20100501.ebuild 3499 SHA256 e28182deffee715039d7b1fd041d75744e3a25ca2b7819163b65f69a7a8abf29 SHA512 f4691b00c0046f3e66303c36020d8acf4439946f1bd91140635c47dd96996ba6b092c91768a0a6e3502ed36bc1f2f553a6b3b8e8cbe1b54f93b871c0e532ee32 WHIRLPOOL f3582d89e25ac5b85a5d94943fdadfcdb1866a68cb1653d14ba5313d04831b3365a4698d75a4c785934e5f625592717c67fb917767f8bc73c38e9c7542ec2556
-EBUILD fontforge-20110222-r1.ebuild 3749 SHA256 b95c911d35c70b00f420e7e1e9c8757ec36df2dd075ead699bb6669c6b2bae2b SHA512 2ddc65605b5be9f7e8e9b55a5b52f9f48b91dee95a56f2f4eb046c966f4782ea6344cb28bdeaf6624ace4953a0831b10fd3e01a60c30d8994b1b3f00dbb57429 WHIRLPOOL 38535aa74234097ec29c2ced20de65d18769935e92085faf3c7cb9809c9cecc23df7bc5244e88986888dd58f216344ce3cf9b9010b670f29c5c36f2e96614062
+EBUILD fontforge-20110222-r1.ebuild 3808 SHA256 ea922443d760c9d052bb9b92ee3de9fe823f419fba42f0a94d31722ce1524c5e SHA512 f67d2ee6242319228262cf2d02e5ec7bb4d21168943317ff8133d19c277af2e01ad02232da8195a16282dacac13d677be14f01454b405b593a76479b117f487c WHIRLPOOL 875d3bedd5bf5b4da72002d645215fe581d60e02ad1faef51579bbbb19771b62b8633b9cde6d52af6591d5b50499c4b6cfaf65f5119265522859c9fa717d543e
 EBUILD fontforge-20110222.ebuild 3696 SHA256 da3b2a27843e9af54f68a1fc1dcabd65b22ac6c3db9209cb5a84f8dca2d30175 SHA512 3fa047e30992c5280182bce51fef00971d97ff4d8b0ec5749b33de800aa1fbb5e65adc21790af63bf2efef09cbc1feaa43320f145d232519d04b4a49e6476db1 WHIRLPOOL 4dbb2b4522a47f90c7a93122a2362653b7ba3c71ed39d7d8922cce8ce14d0a1cd7bbf4ba0e2ee09d95f29cf1ba8a08c4c8decd5d151cc951faf8bf1975187004
-MISC ChangeLog 21999 SHA256 11023ef851ed9e6b59fff76daed124365d9f25b5be0c86dc01213ebf131de3db SHA512 ec9929ca0f47bc9fad03393419d69c869f8ddcac9e6916aa6641e11f7ccc99497e88ce338be7cac2f74a2d03dfba4fa2d5715dabd00aaa0a956744a47f670cbc WHIRLPOOL 380094d280cf8c865ec01c9e22b610e99933eb319e1a41dbb91a824d38fbd5d047510af555c0fb8c13c130310f6bbc86386dadb4779e38693291b5f128443baf
+MISC ChangeLog 22210 SHA256 1e572456ab793a47ba5d307d1198c506ac0c21c442ed3e10b9d3221b35003b2b SHA512 7977996be9d8e9a784962bfed3d4ab3b496173d0f84929f94b4254d15f9e0c55dde737a70bc0cebc7f02bfbf49f1ce8de35515595e73863bf2a56b21a99f3a87 WHIRLPOOL 04cd20d896b532d3855ff1b7c963f43e917bbd270f48757638e405015099b96ced4def5edceb2f1fd8bb5d1aad976e0d1a7468a92e2564d32c9462df2831d6dd
 MISC metadata.xml 1457 SHA256 964fda064eb8db8a937daf398f089df1779527e1fe45aee0edede3142ea62604 SHA512 b4c13b65e4a2b24971c7c5216f746d85db6ff0d2d7961a4fbda99d1a722114437f3629140364374abff2acec4d38e87e67d44e9c7373da12561336445e6168d6 WHIRLPOOL a7060604b91f4dd495dd76e7b5671339ddf8a89e2c5f9e0754e315f8278b70bdd0526b2046a38ff3c0fcfed1ccd700c95427fdb9f87bff04817d043d831c614e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlBHBKwACgkQgAnW8HDreRYzhQCfYzgX/M4IP8oSYVlh7yhxRu4Q
-qNcAni8Q1W6sMqeKKIHpYTzJChN5OZmI
-=9xHm
+iQIcBAEBCAAGBQJRpNFeAAoJEJOE+m71LUu6OUUQAIaSDUKDmIw9EnvXbHs7hMlc
+9AHqrIz+CCkO2bpa2XxIrJX+tF7RSvg0TrVQoyNAm5T+o2H/lCvbwsUUUF91A3UF
+bqqL6PNvL0PAiRjb0yOosBW9pyj9AoSGw31q9/Ieau0D2a/xN+MANW5MYPec28DF
+g2OVDvi1+v7DfybxwJ7cCDc9AHOxHOhzuM25QyDvT9pW2/XlAD1FiGhwFcX8dIi1
+MeXMg0eqg6vEJNyYpoeA4fAFP+ZQ2QdvXN3Q7pGf0+NfJOGczTo5mzN0cYF4FJC7
+bA70isiYiLVZXgxyKhpuU/hIKIJiPhztSfBbMTvwHdzWLeZL7rdYHWTM2EkrgMX9
+CmfsOswNqUGeCbn+Mq3uA6+GL7i8eOvt50fFUZUmyhpyU8D4KkuA4jZ7VMbZVdfL
+htn3qfTyybZhPP/YlPYqR4xCqKzCg28iccijhpTkdqrBoKDfDidL+Ef7s0vjdr21
+5CQNMgDuW07JF1GtgiuTcQIBDFfI4zZgjgKfahfagtZJpKkHzdfngy/K6zIEgvzQ
+UThrGyuO92ejtd+gf9NByGX0MtOK2EONvoE71NEeyUSPCV/p7tLKE5oq+N1rPgp9
+W2a+hnQ/2jCwOa/C3Fsr3+rHV3Q3eIB+/mGmRYJkMhhlX4Wnhkji+ezrZe4+/luW
+t4El05z9zecKgZWd7KpH
+=iPYD
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch b/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch
new file mode 100644
index 000000000000..f7e7152f2eaf
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch
@@ -0,0 +1,11 @@
+diff -Naur fontforge-20110222.orig/gutils/gimagereadrgb.c fontforge-20110222/gutils/gimagereadrgb.c
+--- fontforge-20110222.orig/gutils/gimagereadrgb.c	2013-05-05 18:03:18.884623199 +0000
++++ fontforge-20110222/gutils/gimagereadrgb.c	2013-05-05 18:03:35.452624126 +0000
+@@ -86,7 +86,6 @@
+ 
+ static void find_scanline(FILE *fp,struct sgiheader *header,int cur,
+ 	unsigned long *starttab,unsigned char **ptrtab) {
+-    extern int fgetc(FILE *);
+     int (*getthingamy)(FILE *) = header->bpc==1?fgetc:getshort;
+     int ch,i,cnt,val;
+     unsigned char *pt;
diff --git a/media-gfx/fontforge/fontforge-20110222-r1.ebuild b/media-gfx/fontforge/fontforge-20110222-r1.ebuild
index 88f77af7653c..e86c6d2a029a 100644
--- a/media-gfx/fontforge/fontforge-20110222-r1.ebuild
+++ b/media-gfx/fontforge/fontforge-20110222-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222-r1.ebuild,v 1.8 2012/09/05 07:52:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222-r1.ebuild,v 1.9 2013/05/28 15:46:22 blueness Exp $
 
 # Some notes for maintainers this package:
 # 1. README-unix: freetype headers are required to make use of truetype debugger
@@ -67,6 +67,7 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}/${P}-lxkbui.patch"
 	epatch "${FILESDIR}/${P}-libz.so-linkage.patch"
+	epatch "${FILESDIR}/${P}-remove-useless-extern.patch"
 	if use doc; then
 		chmod -x "${WORKDIR}"/html/*.html || die
 	fi