fixed compilation with t1lib-5.0.0, closing #25798

4 files changed, 47 insertions, 5 deletions

diff --git a/media-gfx/grace/ChangeLog b/media-gfx/grace/ChangeLog
index 31f3c4ce9b10..b99c05d414db 100644
--- a/media-gfx/grace/ChangeLog
+++ b/media-gfx/grace/ChangeLog
@@ -1,9 +1,15 @@
 # ChangeLog for media-gfx/grace
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/ChangeLog,v 1.7 2003/03/30 00:49:42 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/ChangeLog,v 1.8 2003/08/09 08:34:56 usata Exp $
 
 *grace-5.1.10 (05 Nov 2002)
 
+  09 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> grace-5.1.10.ebuild,
+  files/grace-5.1.10-t1lib-fix-gentoo.patch:
+  Added t1lib DEPEND and a patch to compile grace against t1lib-5.0.0.
+  Patch submitted by Derek Dolney <dolney@astro.physics.upenn.edu>
+  in bug #25798
+
   30 Mar 2003; Alastair Tse <liquidx@gentoo.org> grace-5.1.10.ebuild,
   grace-5.1.7-r2.ebuild:
   update deps to virtual/motif
diff --git a/media-gfx/grace/Manifest b/media-gfx/grace/Manifest
index 5961965cb138..a038fc7e4212 100644
--- a/media-gfx/grace/Manifest
+++ b/media-gfx/grace/Manifest
@@ -1,6 +1,7 @@
-MD5 f6b55d607d21ee307302d23995fd58b3 ChangeLog 1346
-MD5 4ea349aea45a1fb181b0bcd0849adb34 grace-5.1.10.ebuild 2049
+MD5 dc046426cce2852ebc000815bfef8852 ChangeLog 1614
+MD5 9a0e201115f9b7e9bcd078a87ecc5804 grace-5.1.10.ebuild 2213
 MD5 07a6bd9ed6d0c4a79e67a651ef0b07f5 grace-5.1.7-r2.ebuild 2049
 MD5 79d4cd7b5bb6c28a0b393294202477cb files/10grace 28
 MD5 0a86071d232bac0c0725906f6bde21bb files/digest-grace-5.1.10 65
 MD5 3e377b216955ff939acf4b4e7ee6227c files/digest-grace-5.1.7-r2 64
+MD5 5061fe8c4ba85c767decf9e69a312bfe files/grace-5.1.10-t1lib-fix-gentoo.patch 836
diff --git a/media-gfx/grace/files/grace-5.1.10-t1lib-fix-gentoo.patch b/media-gfx/grace/files/grace-5.1.10-t1lib-fix-gentoo.patch
new file mode 100644
index 000000000000..1f651a2b5334
--- /dev/null
+++ b/media-gfx/grace/files/grace-5.1.10-t1lib-fix-gentoo.patch
@@ -0,0 +1,24 @@
+diff -urN grace-5.1.10.ORIG/src/fontwin.c grace-5.1.10/src/fontwin.c
+--- grace-5.1.10.ORIG/src/fontwin.c	2002-08-22 05:19:51.000000000 +0900
++++ grace-5.1.10/src/fontwin.c	2003-08-09 17:00:22.000000000 +0900
+@@ -320,7 +320,7 @@
+     Widget font_table = (Widget) data;
+     
+     FontID = value;
+-    switch (CheckForFontID(FontID)) {
++    switch (T1_CheckForFontID(FontID)) {
+     case 0:
+         T1_LoadFont(FontID);
+         break;
+diff -urN grace-5.1.10.ORIG/src/t1fonts.c grace-5.1.10/src/t1fonts.c
+--- grace-5.1.10.ORIG/src/t1fonts.c	2002-08-14 05:31:25.000000000 +0900
++++ grace-5.1.10/src/t1fonts.c	2003-08-09 17:01:24.000000000 +0900
+@@ -89,7 +89,7 @@
+         return (RETURN_FAILURE);
+     }
+     
+-    nfonts = T1_Get_no_fonts();
++    nfonts = T1_GetNoFonts();
+     if (nfonts < 1) {
+         return (RETURN_FAILURE);
+     }
diff --git a/media-gfx/grace/grace-5.1.10.ebuild b/media-gfx/grace/grace-5.1.10.ebuild
index 16974178d6b8..25fb909dd42f 100644
--- a/media-gfx/grace/grace-5.1.10.ebuild
+++ b/media-gfx/grace/grace-5.1.10.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.10.ebuild,v 1.4 2003/04/24 11:26:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.10.ebuild,v 1.5 2003/08/09 08:34:56 usata Exp $
+
+inherit eutils
 
 DESCRIPTION="WYSIWYG 2D plotting tool for the X Window System"
 SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/${P}.tar.gz"
@@ -14,9 +16,18 @@ IUSE="pdflib"
 DEPEND="virtual/x11
 	virtual/motif
 	media-libs/libpng
+	media-libs/t1lib
 	>=media-libs/tiff-3.5
 	pdflib? ( >=media-libs/pdflib-3.0.2 )"
 
+src_unpack() {
+	unpack ${A}
+
+	if has_version '>=media-libs/t1lib-5.0.0' ; then
+		epatch ${FILESDIR}/${P}-t1lib-fix-gentoo.patch
+	fi
+}
+
 src_compile() {
 	econf \
 		--with-grace-home=/usr/share/grace \
@@ -63,7 +74,7 @@ src_install() {
 	#mv ${D}/usr/share/doc/${PF}/html/*.1 ${D}/usr/share/man/man1
 	doman ${D}/usr/share/doc/${PF}/html/*.1
 	rm -f ${D}/usr/share/doc/${PF}/html/*.1
-    
+
 	insinto /etc/env.d
 	doins ${FILESDIR}/10grace
 }