Added a patch allow compilation with gcc-4.1.0.

(Portage version: 2.1_pre6-r2)

3 files changed, 60 insertions, 3 deletions

diff --git a/sys-apps/groff/ChangeLog b/sys-apps/groff/ChangeLog
index 0b22d61c8a9a..c7eb30b3780b 100644
--- a/sys-apps/groff/ChangeLog
+++ b/sys-apps/groff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/groff
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.61 2006/03/03 01:57:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.62 2006/03/15 22:55:05 kugelfang Exp $
+
+  15 Mar 2006; Danny van Dyk <kugelfang@gentoo.org>
+  +files/groff-1.19.1-gcc-4.1.patch, groff-1.19.1-r2.ebuild:
+  Added a patch allow compilation with gcc-4.1.0.
 
 *groff-1.19.2-r1 (03 Mar 2006)
 
diff --git a/sys-apps/groff/files/groff-1.19.1-gcc-4.1.patch b/sys-apps/groff/files/groff-1.19.1-gcc-4.1.patch
new file mode 100644
index 000000000000..c67f42e6f1ef
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.19.1-gcc-4.1.patch
@@ -0,0 +1,50 @@
+diff -ur ../groff-1.19.1.orig/src/preproc/eqn/box.h src/preproc/eqn/box.h
+--- ../groff-1.19.1.orig/src/preproc/eqn/box.h	2004-04-17 07:23:30.000000000 +0200
++++ src/preproc/eqn/box.h	2006-03-15 23:23:28.000000000 +0100
+@@ -82,6 +82,10 @@
+   friend box *make_lineup_box(box *);
+ };
+ 
++extern box *make_script_box(box *, box *, box *);
++extern box *make_mark_box(box *);
++extern box *make_lineup_box(box *);
++
+ enum alignment { LEFT_ALIGN, RIGHT_ALIGN, CENTER_ALIGN };
+ 
+ class column : public box_list {
+diff -ur ../groff-1.19.1.orig/src/roff/troff/div.h src/roff/troff/div.h
+--- ../groff-1.19.1.orig/src/roff/troff/div.h	2006-03-15 23:19:12.000000000 +0100
++++ src/roff/troff/div.h	2006-03-15 23:15:11.000000000 +0100
+@@ -56,6 +56,8 @@
+   virtual void copy_file(const char *filename) = 0;
+ };
+ 
++extern void end_diversions();
++
+ class macro;
+ 
+ class macro_diversion : public diversion {
+diff -ur ../groff-1.19.1.orig/src/roff/troff/env.h src/roff/troff/env.h
+--- ../groff-1.19.1.orig/src/roff/troff/env.h	2006-03-15 23:19:04.000000000 +0100
++++ src/roff/troff/env.h	2006-03-15 23:15:40.000000000 +0100
+@@ -353,6 +353,8 @@
+   friend void do_divert(int append, int boxing);
+ };
+ 	
++extern void title();
++
+ extern environment *curenv;
+ extern void pop_env();
+ extern void push_env(int);
+diff -ur ../groff-1.19.1.orig/src/roff/troff/token.h src/roff/troff/token.h
+--- ../groff-1.19.1.orig/src/roff/troff/token.h	2006-03-15 23:19:19.000000000 +0100
++++ src/roff/troff/token.h	2006-03-15 23:16:02.000000000 +0100
+@@ -102,6 +102,8 @@
+   friend void process_input_stack();
+ };
+ 
++extern void process_input_stack();
++
+ extern token tok;		// the current token
+ 
+ extern symbol get_name(int required = 0);
diff --git a/sys-apps/groff/groff-1.19.1-r2.ebuild b/sys-apps/groff/groff-1.19.1-r2.ebuild
index 6298a331f0db..654f59d2b334 100644
--- a/sys-apps/groff/groff-1.19.1-r2.ebuild
+++ b/sys-apps/groff/groff-1.19.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.19.1-r2.ebuild,v 1.16 2005/09/29 07:57:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.19.1-r2.ebuild,v 1.17 2006/03/15 22:55:05 kugelfang Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -44,6 +44,9 @@ src_unpack() {
 	# Fix make dependencies so we can build in parallel
 	epatch "${FILESDIR}"/${P}-parallel-make.patch
 
+	# Fix some headers to be compatible with gcc-4.1.0
+	epatch "${FILESDIR}"/${P}-gcc-4.1.patch
+
 	# Make sure we can cross-compile this puppy
 	if tc-is-cross-compiler ; then
 		sed -i \