Compilation error fix (bug #118264).

Package-Manager: portage-2.1_pre3-r1

9 files changed, 47 insertions, 17 deletions

diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog
index c9e598ea3f5e..a703f58de96f 100644
--- a/app-text/tetex/ChangeLog
+++ b/app-text/tetex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/tetex
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.97 2006/01/13 19:52:31 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.98 2006/01/21 11:47:35 nattfodd Exp $
+
+  21 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org>
+  +files/tetex-2.0.2-dvi-draw-conflicting-types.patch,
+  tetex-2.0.2-r5.ebuild, tetex-2.0.2-r6.ebuild, tetex-2.0.2-r7.ebuild:
+  Added a patch to fix a compilation error in texk/xdvik/dvi-draw.c for
+  tetex-2.0.2, closing bug #118264. Credit goes to GerbilSoft.
 
 *tetex-3.0_p1 (13 Jan 2006)
 
diff --git a/app-text/tetex/Manifest b/app-text/tetex/Manifest
index 68a3479e615c..ec333f680a1e 100644
--- a/app-text/tetex/Manifest
+++ b/app-text/tetex/Manifest
@@ -1,12 +1,13 @@
-MD5 7ab32cd548bf79b4bdcc958354dae1b4 ChangeLog 17484
+MD5 3d91e872237f4dbc2a8fe6cac90e36ea ChangeLog 17800
 MD5 9179c455d1a594b0b06b670e0b051374 files/digest-tetex-1.0.7-r13 343
-MD5 ed2101fe2206c296c09f0d2b67759841 files/digest-tetex-2.0.2-r5 282
-MD5 ed2101fe2206c296c09f0d2b67759841 files/digest-tetex-2.0.2-r6 282
-MD5 ed2101fe2206c296c09f0d2b67759841 files/digest-tetex-2.0.2-r7 282
+MD5 d9e3971f8b0ed3b93c4c8db657fc3629 files/digest-tetex-2.0.2-r5 282
+MD5 d9e3971f8b0ed3b93c4c8db657fc3629 files/digest-tetex-2.0.2-r6 282
+MD5 d9e3971f8b0ed3b93c4c8db657fc3629 files/digest-tetex-2.0.2-r7 282
 MD5 7184c72f1e38b2f0ddb843687cf80832 files/digest-tetex-3.0-r3 202
 MD5 7184c72f1e38b2f0ddb843687cf80832 files/digest-tetex-3.0-r4 202
 MD5 ca5c96c960d2e8845588f273359e3dc9 files/digest-tetex-3.0_p1 207
 MD5 6f48f0b987b7ea33b02aea8ba198eeed files/iso-8859-7.def 4419
+MD5 912aea791088e715e491a7ccaa7eb25f files/tetex-2.0.2-dvi-draw-conflicting-types.patch 410
 MD5 ce3900d8a86ef6eb7c20dc2d445f16ff files/tetex-2.0.2-epstopdf-wrong-rotation.patch 525
 MD5 b15d18a85d673070c4b9ac48ebc586ed files/tetex-3.0-epstopdf-wrong-rotation.patch 521
 MD5 0e727f58dac2997f22e90f51b2d79da3 files/tetex-3.0-kpathsea-pic.patch 1590
@@ -22,9 +23,9 @@ MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
 MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/xpdf2-underflow.patch 2363
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 8f27cd5e7c06b0c37851607799f69316 tetex-1.0.7-r13.ebuild 4770
-MD5 0f8500396bced0f297604c1919883bc6 tetex-2.0.2-r5.ebuild 1162
-MD5 5ec3bbcf0526206f46edf6734f6305d6 tetex-2.0.2-r6.ebuild 1174
-MD5 d83cea94a74788901290e20dd375883e tetex-2.0.2-r7.ebuild 1272
+MD5 ac832dc2976c466da737908fafa9a30b tetex-2.0.2-r5.ebuild 1272
+MD5 6e15190448b2788a3fd3f57afdcd2120 tetex-2.0.2-r6.ebuild 1282
+MD5 2d83c92048930d3bf7a72999100f1a21 tetex-2.0.2-r7.ebuild 1378
 MD5 6d84991ef4fd00210a9eb68fdb393bd8 tetex-3.0-r3.ebuild 1272
 MD5 1fe71bbc946829906e955a0380bbbcef tetex-3.0-r4.ebuild 1345
 MD5 d140b2a9bcdb3c2b0776b12488a19065 tetex-3.0_p1.ebuild 1528
diff --git a/app-text/tetex/files/digest-tetex-2.0.2-r5 b/app-text/tetex/files/digest-tetex-2.0.2-r5
index e7e17c3b6698..fcad70744266 100644
--- a/app-text/tetex/files/digest-tetex-2.0.2-r5
+++ b/app-text/tetex/files/digest-tetex-2.0.2-r5
@@ -1,4 +1,4 @@
+MD5 0a0ba30552331663f496d41b8ca2a299 tetex-2.0.2-gentoo.tar.gz 1704
 MD5 a16f6bba227d55e79aeee46fbbd82d28 tetex-src-2.0.2.tar.gz 11745933
 MD5 d3bdb96f9077e43b2115d3cc471743b3 tetex-texmf-2.0.2.tar.gz 52424280
 MD5 40d4b2c5582eccbee4b6ec692c3cc253 tetex-texmfsrc-2.0.2.tar.gz 22909537
-MD5 0a0ba30552331663f496d41b8ca2a299 tetex-2.0.2-gentoo.tar.gz 1704
diff --git a/app-text/tetex/files/digest-tetex-2.0.2-r6 b/app-text/tetex/files/digest-tetex-2.0.2-r6
index e7e17c3b6698..fcad70744266 100644
--- a/app-text/tetex/files/digest-tetex-2.0.2-r6
+++ b/app-text/tetex/files/digest-tetex-2.0.2-r6
@@ -1,4 +1,4 @@
+MD5 0a0ba30552331663f496d41b8ca2a299 tetex-2.0.2-gentoo.tar.gz 1704
 MD5 a16f6bba227d55e79aeee46fbbd82d28 tetex-src-2.0.2.tar.gz 11745933
 MD5 d3bdb96f9077e43b2115d3cc471743b3 tetex-texmf-2.0.2.tar.gz 52424280
 MD5 40d4b2c5582eccbee4b6ec692c3cc253 tetex-texmfsrc-2.0.2.tar.gz 22909537
-MD5 0a0ba30552331663f496d41b8ca2a299 tetex-2.0.2-gentoo.tar.gz 1704
diff --git a/app-text/tetex/files/digest-tetex-2.0.2-r7 b/app-text/tetex/files/digest-tetex-2.0.2-r7
index e7e17c3b6698..fcad70744266 100644
--- a/app-text/tetex/files/digest-tetex-2.0.2-r7
+++ b/app-text/tetex/files/digest-tetex-2.0.2-r7
@@ -1,4 +1,4 @@
+MD5 0a0ba30552331663f496d41b8ca2a299 tetex-2.0.2-gentoo.tar.gz 1704
 MD5 a16f6bba227d55e79aeee46fbbd82d28 tetex-src-2.0.2.tar.gz 11745933
 MD5 d3bdb96f9077e43b2115d3cc471743b3 tetex-texmf-2.0.2.tar.gz 52424280
 MD5 40d4b2c5582eccbee4b6ec692c3cc253 tetex-texmfsrc-2.0.2.tar.gz 22909537
-MD5 0a0ba30552331663f496d41b8ca2a299 tetex-2.0.2-gentoo.tar.gz 1704
diff --git a/app-text/tetex/files/tetex-2.0.2-dvi-draw-conflicting-types.patch b/app-text/tetex/files/tetex-2.0.2-dvi-draw-conflicting-types.patch
new file mode 100644
index 000000000000..c38a8e01bc71
--- /dev/null
+++ b/app-text/tetex/files/tetex-2.0.2-dvi-draw-conflicting-types.patch
@@ -0,0 +1,11 @@
+--- tetex-src-2.0.2.old/texk/xdvik/dvi-draw.c      2003-01-25 05:16:33.000000000 -0500
++++ tetex-src-2.0.2/texk/xdvik/dvi-draw.c  2006-01-08 04:52:44.000000000 -0500
+@@ -518,7 +518,7 @@
+
+ #endif /* T1LIB */
+
+-extern void home();  /* from events.c */
++extern void home(wide_bool scrl);  /* from events.c */
+ extern int fallbacktfm; /* from tfmload.c */
+
+ static struct frame frame0;    /* dummy head of list */
diff --git a/app-text/tetex/tetex-2.0.2-r5.ebuild b/app-text/tetex/tetex-2.0.2-r5.ebuild
index 74906351ee7d..b3f8f40f0b4e 100644
--- a/app-text/tetex/tetex-2.0.2-r5.ebuild
+++ b/app-text/tetex/tetex-2.0.2-r5.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/app-text/tetex/tetex-2.0.2-r5.ebuild,v 1.13 2005/09/30 22:48:58 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r5.ebuild,v 1.14 2006/01/21 11:47:36 nattfodd Exp $
 
 inherit tetex-2 flag-o-matic
 
@@ -20,6 +20,10 @@ src_unpack() {
 	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl2-CAN-2004-1125.patch
 	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl3-CAN-2005-0064.patch
 	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xdvizilla.patch
+
+	# bug 118264
+	EPATCH_OPTS="-d ${WORKDIR} -p0" epatch \
+	${FILESDIR}/${P}-dvi-draw-conflicting-types.patch
 }
 
 src_compile() {
diff --git a/app-text/tetex/tetex-2.0.2-r6.ebuild b/app-text/tetex/tetex-2.0.2-r6.ebuild
index 5bc6c3cff1d4..8bede0d0bfbd 100644
--- a/app-text/tetex/tetex-2.0.2-r6.ebuild
+++ b/app-text/tetex/tetex-2.0.2-r6.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/app-text/tetex/tetex-2.0.2-r6.ebuild,v 1.3 2005/09/30 22:48:58 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r6.ebuild,v 1.4 2006/01/21 11:47:36 nattfodd Exp $
 
 inherit tetex-2 flag-o-matic
 
@@ -20,6 +20,10 @@ src_unpack() {
 	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl2-CAN-2004-1125.patch
 	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl3-CAN-2005-0064.patch
 	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xdvizilla.patch
+
+	# bug 118264
+	EPATCH_OPTS="-d ${WORKDIR} -p0" epatch ${FILESDIR}/${P}-dvi-draw-conflicting-types.patch
+
 }
 
 src_compile() {
diff --git a/app-text/tetex/tetex-2.0.2-r7.ebuild b/app-text/tetex/tetex-2.0.2-r7.ebuild
index afd978e7e6c7..d395600611b4 100644
--- a/app-text/tetex/tetex-2.0.2-r7.ebuild
+++ b/app-text/tetex/tetex-2.0.2-r7.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/app-text/tetex/tetex-2.0.2-r7.ebuild,v 1.1 2005/12/02 19:40:37 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r7.ebuild,v 1.2 2006/01/21 11:47:36 nattfodd Exp $
 
 inherit tetex-2 flag-o-matic
 
@@ -24,6 +24,10 @@ src_unpack() {
 
 	# bug 85404
 	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/${P}-epstopdf-wrong-rotation.patch
+
+	# bug 118264
+	EPATCH_OPTS="-d ${WORKDIR} -p0" epatch ${FILESDIR}/${P}-dvi-draw-conflicting-types.patch
+
 }
 
 src_compile() {