Fix build issue due to missing header (bug #385037, patch by Rafał Mużyło).

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

4 files changed, 41 insertions, 13 deletions

diff --git a/net-print/gutenprint/ChangeLog b/net-print/gutenprint/ChangeLog
index bd0fa4f56ce4..c562dc144ca5 100644
--- a/net-print/gutenprint/ChangeLog
+++ b/net-print/gutenprint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/gutenprint
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.26 2011/09/15 21:30:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.27 2011/10/27 05:57:18 radhermit Exp $
+
+  27 Oct 2011; Tim Harder <radhermit@gentoo.org> gutenprint-5.2.7-r1.ebuild,
+  +files/gutenprint-5.2.7-stdio.patch:
+  Fix build issue due to missing header (bug #385037, patch by Rafał
+  Mużyło).
 
 *gutenprint-5.2.7-r1 (15 Sep 2011)
 
diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index 226ec3c705d2..c97d55c3c35b 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -4,6 +4,7 @@ Hash: SHA512
 AUX gutenprint-5.2.4-CFLAGS.patch 781 RMD160 f9c6650d899768cc3e8cb846cca388aca8c33872 SHA1 248af46ba40397d0c75b5cbf2b9ee5a99990fc22 SHA256 e4df928bf523a90f595bea773ffbbdaf3b982a941a6f995a5709abfdb5e5c438
 AUX gutenprint-5.2.5-Makefile.patch 564 RMD160 c292214f0a46d3cc36e6a08ac5fbc72a739279f7 SHA1 92df0231b7ce7b779c78f3ba80670acf032e5260 SHA256 b17043d3160e754ca1bb50acf92818f13d3f7983343c97508985f42aba288462
 AUX gutenprint-5.2.7-genppd.patch 2263 RMD160 6adb3f024faee881537cd91c3b0a085e5902f87f SHA1 e139fba1c475efa1ed60fff863b4dd1b486d6c2b SHA256 8acd830eaff2b063875843130bae1e83694335d33045549d1a61771f66a8b4b8
+AUX gutenprint-5.2.7-stdio.patch 429 RMD160 6d6b1684bf084059d24f57bda63fe4e6ca6ef239 SHA1 1c4bab2bb862b46b6efbaedd049f32bad7c41e19 SHA256 0bdef9bdedb5120aedbb14e8d2ccc7e3526b7d6f6bedd7221c95420321a69214
 DIST gutenprint-5.1.4.tar.bz2 4714151 RMD160 44f23d30eeab6f911f28c5982ca9ffc1677a0c49 SHA1 1e65fbb90d1b6f2344f32378d026326c103bb3eb SHA256 2189127e50171334ebd8ca3791455062daeef150894ce8dfb063bc2da7b35763
 DIST gutenprint-5.2.5.tar.bz2 5215539 RMD160 cd88cd3ffc28fcc54e1de94d2f5ee069102d23a6 SHA1 380d9f870e7f12088fc5dffac02413cae9a9ccb4 SHA256 6b562390769785573bb25715a9cbcb2e638b2740d391f4632a0ed4a0bc8fa3fa
 DIST gutenprint-5.2.6.tar.bz2 5283223 RMD160 ede2dea11742c77fede450880685efcde3a91967 SHA1 9fbe1ab899d5e83f34e21534cc5c1b8921c9039b SHA256 4744e1b5aab4c78a5af8da629d83d8ca3d8d217171301dc905c2e11dca5edc7e
@@ -11,17 +12,17 @@ DIST gutenprint-5.2.7.tar.bz2 5498414 RMD160 63c6dbc136ac7095c06accf48979a379a92
 EBUILD gutenprint-5.1.4.ebuild 2583 RMD160 62ceb05e24d0f6155c1ef8d9b6cbbd13426359b0 SHA1 5245949bc3987db34a62ad3f5ff0977e8547bdb8 SHA256 a96c2182807829c0545cd176e17a9748067e26ac134fca2f0afa5c41eb54f660
 EBUILD gutenprint-5.2.5-r1.ebuild 2564 RMD160 79d250dc1a8424a9e6538c2d12728605492e3014 SHA1 ac0df1235b6e3a7ce57f7d9869fde976a16433ee SHA256 218a4098056f276c7840fd522245e8c2b69e086ea5b675debf9ee405ddc2fc90
 EBUILD gutenprint-5.2.6.ebuild 2381 RMD160 889711343291d24c9a2e3fca2a8b7cfb14e7ac74 SHA1 5df153ea0052cdbd92e99cf1d989944d3623b35a SHA256 2e712e09c0675784d609beed8517ca8a48e3b2799d91e438f376c0c766d6841a
-EBUILD gutenprint-5.2.7-r1.ebuild 2420 RMD160 030e930fd3e36448eb89698f0a1245eb9e2efc50 SHA1 e911d7f7cf8cd1ac53947fd1dd1b5ddb4608af10 SHA256 b9e13b1eedf58db6207b657a86f38b6545413b7f6e4b39fc4eb36f6e1a650db3
-MISC ChangeLog 19784 RMD160 f791110a82c49c5cee65d12f031a3a97dc8d88ab SHA1 1bfea1b287061a372d009458fd76e390dbb15bcd SHA256 1d00dee72f201c5d6da75b638864da0511fc9f4a29605a3cdc17b02cd257869b
+EBUILD gutenprint-5.2.7-r1.ebuild 2490 RMD160 2fe6acf40990bb67007616c5ff6cd5986a20f03a SHA1 9541a89fd8eb1f0396ac345d8c11c94cff644c6a SHA256 342e625ea74e9f2c7463e1c896eaef378ccb46ca25c3060133ab87d2f28cf280
+MISC ChangeLog 19984 RMD160 43f669afd6c925611ac819dba2257cc231215900 SHA1 077ba214aeb3653346dff9e234177cbc75705d96 SHA256 35fb630b057b1508dde8b2934aed5d2680325abfe8aeeb9649cf04f6a2d93c79
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOcm5jAAoJEEqz6FtPBkyjsLgIAKs4xuOsWUcnZt4XUv+WcpI1
-ZHPwwwed8JX38aDwSWwi2hRAV6M2bC1Oow9BUn+PIw12Oc+ME5vtGTRlWTEj88CC
-8TZ0je2iwAwDLiaZ7r9ctfSXQbDR5u76JSE1AkSgMkf46gJ9N/LBnGaa1lAvExIO
-VVKjMJWqZAUVtawZLMyLbHWooBtIJT2vG1CoH/8UA1giFpqDJrg1Myuqg7NhaGoV
-9JM0a0ig6XncZaQabDaNIqNR6X9t2G43MISssqOyHH5ImxdwlrxjCGw9YIvF2kiN
-Ba3kuENBN9X2bbW55/LsjX5BuKsBZXY4VYaMpD7SDp5NPy0ACdMzMCnzg7CTTF4=
-=wzR0
+iQEcBAEBCgAGBQJOqPLDAAoJEEqz6FtPBkyjMakH/ifRGwuYiWkuWS/DmGAQXOVH
+v7/AeUx3qaAixRkvrqN9HoxWhQqDaGEyjUc3wPIUQ3h0Gr0AN2b0LOlG4da+staw
+osuYxSSSvL361s/VjRrXpnbyiFblbRvNL7CCtBGrMZRz6ISm6ROaOwGjg2mMN1Nb
+LYOeY1G/HdoDin4UXbXSJKxtNAslIGYY88659csMRgTNy2wNxo5HVTCtm+nOGKhy
+6vuxFo+HGehyhr9JfK6uHHYuwxj2o3SisyBw8/DYhtge12JsJWOYVcsFkyesTlun
+RVpO6SMjaI4yXM/UtyQXXoCMgC6YHYbKOX55DQPavWtcWdUCOSBRf1SOgHjWBac=
+=xHjv
 -----END PGP SIGNATURE-----
diff --git a/net-print/gutenprint/files/gutenprint-5.2.7-stdio.patch b/net-print/gutenprint/files/gutenprint-5.2.7-stdio.patch
new file mode 100644
index 000000000000..e62497b30564
--- /dev/null
+++ b/net-print/gutenprint/files/gutenprint-5.2.7-stdio.patch
@@ -0,0 +1,20 @@
+--- gutenprint-5.2.7.orig/src/cups/commandtocanon.c
++++ gutenprint-5.2.7/src/cups/commandtocanon.c
+@@ -14,6 +14,7 @@
+ #include <cups/cups.h>
+ #include <ctype.h>
+ #include <stdlib.h>
++#include <stdio.h>
+ 
+ 
+ /*
+--- gutenprint-5.2.7.orig/src/cups/commandtoepson.c
++++ gutenprint-5.2.7/src/cups/commandtoepson.c
+@@ -32,6 +32,7 @@
+ #include <ctype.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <stdio.h>
+ 
+ /*
+  * Macros...
diff --git a/net-print/gutenprint/gutenprint-5.2.7-r1.ebuild b/net-print/gutenprint/gutenprint-5.2.7-r1.ebuild
index bc1c31756b8f..6b7f3fdc6e79 100644
--- a/net-print/gutenprint/gutenprint-5.2.7-r1.ebuild
+++ b/net-print/gutenprint/gutenprint-5.2.7-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/net-print/gutenprint/gutenprint-5.2.7-r1.ebuild,v 1.1 2011/09/15 21:30:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.7-r1.ebuild,v 1.2 2011/10/27 05:57:18 radhermit Exp $
 
 EAPI=4
 
@@ -32,9 +32,11 @@ RESTRICT="test"
 DOCS=( AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} )
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-5.2.4-CFLAGS.patch" \
-		"${FILESDIR}"/${P}-genppd.patch
+	epatch "${FILESDIR}"/${PN}-5.2.4-CFLAGS.patch
+	epatch "${FILESDIR}"/${P}-genppd.patch # bug 382927
+	epatch "${FILESDIR}"/${P}-stdio.patch # bug 385037
 	sed -i -e "s:m4local:m4extra:" Makefile.am || die
+
 	eautoreconf
 }