SOURCES: ghostpcl-fonts_locations.patch, ghostpcl-make.patch - upd...

[pascalek]

Author: pascalek                     Date: Wed Jan 30 18:02:55 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.51

---- Files affected:
SOURCES:
   ghostpcl-fonts_locations.patch (1.2 -> 1.3) , ghostpcl-make.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/ghostpcl-fonts_locations.patch
diff -u SOURCES/ghostpcl-fonts_locations.patch:1.2 SOURCES/ghostpcl-fonts_locations.patch:1.3
--- SOURCES/ghostpcl-fonts_locations.patch:1.2	Thu Dec 25 23:45:09 2003
+++ SOURCES/ghostpcl-fonts_locations.patch	Wed Jan 30 19:02:49 2008
@@ -3,8 +3,8 @@
 @@ -107,7 +107,7 @@
     there is some unnecessary overlap in the factory default and font
     source table. */
- private const pjl_fontsource_t pjl_fontsource_table[] = {
--    { "I", "fonts/;/windows/system/;/windows/fonts/;/win95/fonts/;/winnt/fonts/" },
+ static const pjl_fontsource_t pjl_fontsource_table[] = {
+-    { "I", "fonts/;urwfonts/;/windows/fonts/;/win95/fonts/;/winnt/fonts/" },
 +    { "I", "/usr/share/ghostpcl/fonts/;/usr/share/fonts/TTF/" },
      { "C", "CART0/", "" },
      { "C1", "CART1/", "" },

================================================================
Index: SOURCES/ghostpcl-make.patch
diff -u SOURCES/ghostpcl-make.patch:1.1 SOURCES/ghostpcl-make.patch:1.2
--- SOURCES/ghostpcl-make.patch:1.1	Thu Dec 25 23:46:24 2003
+++ SOURCES/ghostpcl-make.patch	Wed Jan 30 19:02:49 2008
@@ -14,26 +14,30 @@
  EXTRALIBS=
 --- ghostpcl_1.38p1/main/pcl6_gcc.mak.orig	2002-11-22 22:20:25.000000000 +0100
 +++ ghostpcl_1.38p1/main/pcl6_gcc.mak	2003-12-25 18:28:49.802745512 +0100
-@@ -16,10 +16,11 @@
- MAINSRCDIR=../main
+@@ -16,7 +16,7 @@
+ ZSRCDIR?=../gs/zlib
+ ZGENDIR?=$(GENDIR)
+ ZOBJDIR?=$(GENDIR)
+-SHARE_ZLIB?=0
++SHARE_ZLIB?=1
+ SHARE_LIBPNG?=0
  
- # specify the location of zlib.  We use zlib for bandlist compression.
--ZSRCDIR=../gs/zlib
-+ZSRCDIR=../gs/zlib
- ZGENDIR=$(GENDIR)
- ZOBJDIR=$(GENDIR)
--SHARE_ZLIB=0
-+SHARE_ZLIB=1
-+ZLIB_NAME=z
+ PNGSRCDIR?=../gs/libpng
+@@ -99,7 +99,7 @@
  
+ GCFLAGS?=-Wall -Wpointer-arith -Wstrict-prototypes -Wwrite-strings -DNDEBUG  $(HAVE_STDINT_H_DEFINE) $(HAVE_MKSTEMP_DEFINE) $(GX_COLOR_INDEX_DEFINE)
+ # CFLAGS?=-g -O0 $(GCFLAGS) $(XCFLAGS)
+-CFLAGS?= $(GCFLAGS) $(XCFLAGS)
++CFLAGS?=$(OPTFLAGS) $(GCFLAGS) $(XCFLAGS)
  
- # specify the locate of the jpeg library.
-@@ -99,7 +99,7 @@
- # Note that the omission of -Dconst= rules out the use of gcc versions
- # between 2.7.0 and 2.7.2 inclusive.  (2.7.2.1 is OK.)
- GCFLAGS=-Wall -Wpointer-arith -Wstrict-prototypes -Wwrite-strings
--CFLAGS=-g -O0 $(GCFLAGS) $(XCFLAGS)
-+CFLAGS=$(OPTFLAGS) $(GCFLAGS) $(XCFLAGS)
+ XINCLUDE?=-I/usr/X11R6/include
+ XLIBDIRS?=-L/usr/X11R6/lib
+@@ -207,7 +207,7 @@
+ 
+ SYNC=posync
+ # some systems may need -ldl as well as pthread
+-STDLIBS=-lm -lpthread -ldl
++STDLIBS=-lm -lpthread -ldl -lz
+ DEVICE_DEVS=$(DD)x11.dev $(DD)x11alpha.dev $(DD)x11mono.dev $(DD)x11cmyk.dev $(DEVICES_DEVS) $(DD)bmpamono.dev $(DD)bmpa16m.dev
+ endif
  
- XINCLUDE=-I/usr/local/X/include
- XLIBDIRS=-L/usr/X11/lib -L/usr/X11R6/lib
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ghostpcl-fonts_locations.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ghostpcl-make.patch?r1=1.1&r2=1.2&f=u