diff options
author | drochner <drochner> | 2005-08-19 15:51:48 +0000 |
---|---|---|
committer | drochner <drochner> | 2005-08-19 15:51:48 +0000 |
commit | 5a7d6bd193524f4998d3b917aaeaa3fa8f5de9ce (patch) | |
tree | d7aa7bae1294c91cc4af691908e081fb6771b1b5 /fonts/t1lib | |
parent | 18daa0dadfe1b9665700675457da5795d529be30 (diff) | |
download | pkgsrc-5a7d6bd193524f4998d3b917aaeaa3fa8f5de9ce.tar.gz |
this was completely broken due to some leftover patches
bump PKGREVISION
Diffstat (limited to 'fonts/t1lib')
-rw-r--r-- | fonts/t1lib/Makefile | 3 | ||||
-rw-r--r-- | fonts/t1lib/distinfo | 4 | ||||
-rw-r--r-- | fonts/t1lib/patches/patch-ab | 31 | ||||
-rw-r--r-- | fonts/t1lib/patches/patch-ae | 20 |
4 files changed, 3 insertions, 55 deletions
diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile index 53f0822142a..4edeaaaa9b4 100644 --- a/fonts/t1lib/Makefile +++ b/fonts/t1lib/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2005/08/04 09:57:17 adam Exp $ +# $NetBSD: Makefile,v 1.24 2005/08/19 15:51:48 drochner Exp $ DISTNAME= t1lib-5.1.0 +PKGREVISION= 1 CATEGORIES= fonts devel graphics MASTER_SITES= ${MASTER_SITE_SUNSITE:=libs/graphics/} diff --git a/fonts/t1lib/distinfo b/fonts/t1lib/distinfo index 2cf64e7d3b4..085dd25ab12 100644 --- a/fonts/t1lib/distinfo +++ b/fonts/t1lib/distinfo @@ -1,11 +1,9 @@ -$NetBSD: distinfo,v 1.10 2005/08/04 09:57:17 adam Exp $ +$NetBSD: distinfo,v 1.11 2005/08/19 15:51:48 drochner Exp $ SHA1 (t1lib-5.1.0.tar.gz) = 6866561027aa32b0efb1a1aad0aa38cb5e01a299 RMD160 (t1lib-5.1.0.tar.gz) = f12710159aa8a92e8feb5d934dc45875d198bb58 Size (t1lib-5.1.0.tar.gz) = 1838635 bytes SHA1 (patch-aa) = 068c25f733c3037faa5051b527b1e1637d706a20 -SHA1 (patch-ab) = 10f2c9d8b03fbcd38adb1693bd14ed6cdbe4dcbf SHA1 (patch-ac) = 14201794e29a2eeba22a9144726ed3e00322aa1d SHA1 (patch-ad) = 29c530f6d363de31777ad45823b55e72208c4ccb -SHA1 (patch-ae) = 2e9e1e5d1a7f505f509cdcfa03c2e210e6b364dd SHA1 (patch-af) = e89df0d94e0748e468c7c3d40ce2fc0ccdb0116c diff --git a/fonts/t1lib/patches/patch-ab b/fonts/t1lib/patches/patch-ab deleted file mode 100644 index 35a6f0a618a..00000000000 --- a/fonts/t1lib/patches/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2005/08/04 09:57:17 adam Exp $ - ---- lib/t1lib/t1base.c.orig 2005-05-18 03:08:01.000000000 +0000 -+++ lib/t1lib/t1base.c -@@ -286,12 +286,7 @@ void *T1_InitLib( int log) - T1LOG_WARNING); - } - -- /* Initialize builtin Standard Encoding */ -- if ( !(Init_BuiltInEncoding()) ) { -- T1_PrintLog( "T1_InitLib()", "Unable initialize internal StandardEncoding!", -- T1LOG_ERROR); -- } -- -+ - /* Set the default encoding to the fonts' internal encoding */ - pFontBase->default_enc=NULL; - -@@ -655,12 +650,6 @@ int T1_CloseLib( void) - else - error=1; - -- /* Get rid of internal StandardEncoding vector */ -- if ( StdEncArrayP != NULL ) { -- free( StdEncArrayP); -- StdEncArrayP = NULL; -- } -- - /* Free search paths */ - intT1_FreeSearchPaths(); - diff --git a/fonts/t1lib/patches/patch-ae b/fonts/t1lib/patches/patch-ae deleted file mode 100644 index ebd0daeca2c..00000000000 --- a/fonts/t1lib/patches/patch-ae +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2005/08/04 09:57:17 adam Exp $ - ---- lib/type1/fontfcn.c.orig 2004-12-12 01:18:20.000000000 +0000 -+++ lib/type1/fontfcn.c -@@ -66,6 +66,7 @@ extern int T1int_Type1QuerySEAC( unsigne - unsigned char* accent); - void objFormatName(psobj *objP, int length, char *valueP); - -+extern boolean Init_BuiltInEncoding(void); - extern void T1io_reset( void); - - #define BEZIERTYPE 0x10+0x02 -@@ -163,6 +164,7 @@ boolean initFont() - { - if (!(vm_init())) return(FALSE); - vm_base = vm_next_byte(); -+ if (!(Init_BuiltInEncoding())) return(FALSE); - strcpy(CurFontName, ""); /* iniitialize to none */ - FontP->vm_start = vm_next_byte(); - FontP->FontFileName.len = 0; |