[patch] patch to define __GETOPT_PREFIX earlier in pfbtops.c

gbug211507.patch (text/plain), 3.83 KB, created by Michael Haubenwallner (RETIRED) on 2009-07-17 11:57:10 UTC

Index: files/groff-1.19.2-early-getopt-inclusion.patch
===================================================================
--- files/groff-1.19.2-early-getopt-inclusion.patch	(revision 0)
+++ files/groff-1.19.2-early-getopt-inclusion.patch	(revision 0)
@@ -0,0 +1,21 @@
+--- src/utils/pfbtops/pfbtops.c.orig	2009-07-17 13:42:50.000000000 +0200
++++ src/utils/pfbtops/pfbtops.c	2009-07-17 13:44:55.000000000 +0200
+@@ -19,6 +19,10 @@
+ 
+ /* This translates ps fonts in .pfb format to ASCII ps files. */
+ 
++/* define early in case getopt.h gets included
++ * by system headers already (seen on IRIX). */
++#define __GETOPT_PREFIX groff_
++
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+@@ -27,7 +31,6 @@
+ #include <stdlib.h>
+ #include <limits.h>
+ 
+-#define __GETOPT_PREFIX groff_
+ #include <getopt.h>
+ 
+ #include "nonposix.h"
Index: Manifest
===================================================================
--- Manifest	(revision 48556)
+++ Manifest	(working copy)
@@ -1,3 +1,4 @@
+AUX groff-1.19.2-early-getopt-inclusion.patch 552 RMD160 c7507c4591274630bc87e471b0d2258f462fbac6 SHA1 64fda917653aab45cd590ea121fb3a0bbc4ff7d5 SHA256 7667202908762de96205bd48e4f4c66bbe6aae5741022e1dafb3ba1d105c6915
 AUX groff-1.19.2-infoext.patch 2779 RMD160 1f88f4ae40128b8496f7de47a91917dea777aee5 SHA1 013f1f36b868235d4a583bda62517a1b577ade98 SHA256 f6bcf74c010c187d8518dbe03918facdedad93b06fcf126fc4a3a58115778d22
 AUX groff-1.19.2-man-unicode-dashes.patch 574 RMD160 759b9822f6950eeaac78ac16cfc8ebf58a77be38 SHA1 a7859ebef38fc0e2d73c1bc500e716c77ce8dc47 SHA256 e8fa93d3536bb6053ec104b567444cec7da8f101e24923dc4003efc8b7bf5bbe
 AUX groff-1.19.2-no-g-nameprefix.patch 434 RMD160 0469c39b671683695bce9e7ae2ef8495554b08c3 SHA1 db0513b39dd6a8cfeb95682fc2eed4f7738d5ea4 SHA256 46f6c07bf529e272b798dfacb3c80437417dd3c303ada8f5dd2095f4ea0fb730
@@ -6,7 +7,7 @@
 DIST groff-1.19.2.tar.gz 2903263 RMD160 d5e57fa1d71dbff2c59a40a5a68c7417ffe211c9 SHA1 cfad99a5c52933a6a9180e394bd94fbaec0ac956 SHA256 d864fbd0bf6dea24e4f71736da9902a1cae86d0a1a893b5fe17118927257ec3e
 DIST groff-1.20.1-japanese.patch.bz2 52503 RMD160 6b07ac62c5bb8bff99ef31619b434015081f6df7 SHA1 b335de765f8a5b1d34396457d19430ce04ca3e5b SHA256 a07fe0fcb8f10ba6f992797546c795eecd4347128cef79d9bc7cc1ea87fe795b
 DIST groff-1.20.1.tar.gz 3594658 RMD160 ec311727206d183fb04f1b4bd01c1284142fdb52 SHA1 3066587d73df73c2bda235034f4515cf52d22549 SHA256 b645878135cb620c6c417c5601bfe96172245af12045540d7344938b4c2cd805
-EBUILD groff-1.19.2-r3.ebuild 2704 RMD160 c3993405a631c70b147fb730be5b987f69bbf593 SHA1 34ad010464008b533452a45516bda17f49884aab SHA256 f9d653038c64d723dbdf2e0cf559445fd387372d576c74aaf04b52a0ac20011a
+EBUILD groff-1.19.2-r3.ebuild 2768 RMD160 dd8b030ba37d2b770610bd253b2f8337d8811ad8 SHA1 a854c5a707fd48a4d113532346cbd465ed07e051 SHA256 00b4f2bc2dccf74de0be4c7e609443f16ab77e53c511bc34133ec6d1c846c00e
 EBUILD groff-1.20.1-r1.ebuild 2230 RMD160 17ed8c781ceb4e62b528ce9700c9e540de103d23 SHA1 01ac9d296f6d562d6b87534aa303eaaaaf52c7af SHA256 210ff09eb18432fc373a0d4ced63482e51dc46bf37328c93eb79d46ecdbb3eb6
 MISC ChangeLog 13759 RMD160 7ffb180e0d1b748373c5da04edf3466097775d46 SHA1 72d174c5e1d8be80ab81bd61bdc08cb51f46c993 SHA256 ba61eda01352b5a4d9a38dd09ab80feb0369995223d40d9f2441a31645f97436
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
Index: groff-1.19.2-r3.ebuild
===================================================================
--- groff-1.19.2-r3.ebuild	(revision 48556)
+++ groff-1.19.2-r3.ebuild	(working copy)
@@ -34,6 +34,7 @@
 
 	epatch "${FILESDIR}"/${P}-man-unicode-dashes.patch #16108 #17580 #121502
 	epatch "${FILESDIR}"/${P}-parallel-make.patch
+	epatch "${FILESDIR}"/${P}-early-getopt-inclusion.patch #211507
 
 	# Make sure we can cross-compile this puppy
 	if tc-is-cross-compiler ; then