- Update to 8.61

PR:		ports/118608
Submitted by:	KATO Tsuguru <tkato432 at yahoo.com>
This commit is contained in:
Rong-En Fan 2008-02-29 05:55:11 +00:00
parent 7e5fec4f93
commit dff249b3e2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=208163
16 changed files with 478 additions and 116 deletions

View file

@ -98,13 +98,11 @@ MAKE_ENV+= SOC_LOADER="dxmain.c" \
SOC_CFLAGS="`pkg-config --cflags gtk+-2.0`" \ SOC_CFLAGS="`pkg-config --cflags gtk+-2.0`" \
SOC_LIBS="`pkg-config --libs gtk+-2.0`" SOC_LIBS="`pkg-config --libs gtk+-2.0`"
.endif .endif
ALL_TARGET= so pcl3opts ALL_TARGET= so
INSTALL_TARGET= soinstall INSTALL_TARGET= soinstall
USE_LDCONFIG= yes USE_LDCONFIG= yes
PLIST_SUB+= SHLIB="" SHLIB_VER="${GS_VERSION:R}" PLIST_SUB+= SHLIB="" SHLIB_VER="${GS_VERSION:R}"
INCLUDEDIR= ${PREFIX}/include/ghostscript
.else .else
ALL_TARGET= all pcl3opts
PLIST_SUB+= SHLIB="@comment " PLIST_SUB+= SHLIB="@comment "
.endif .endif
@ -167,10 +165,6 @@ pre-build:
${ECHO_MSG} ">>> creating directories for compilation ..." ${ECHO_MSG} ">>> creating directories for compilation ..."
${MKDIR} ${WRKSRC}/obj ${MKDIR} ${WRKSRC}/obj
${MKDIR} ${WRKSRC}/bin ${MKDIR} ${WRKSRC}/bin
# for EPAG driver
${ECHO_MSG} ">>> building EPAG utility ..."
cd ${WRKSRC}/${EPAG_NAME} ; \
${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
${ECHO_MSG} ">>> creating symlinks for EPAG ..." ${ECHO_MSG} ">>> creating symlinks for EPAG ..."
.for i in gdevepag.c .for i in gdevepag.c
${LN} -sf ${WRKSRC}/${EPAG_NAME}/${i} ${WRKSRC}/src ${LN} -sf ${WRKSRC}/${EPAG_NAME}/${i} ${WRKSRC}/src
@ -186,24 +180,28 @@ pre-build:
${WRKSRC}/freetype/objs/freetype214MT_D.a ${WRKSRC}/freetype/objs/freetype214MT_D.a
.endif .endif
post-build:
# for PCL3 driver
${ECHO_MSG} ">>> building PCL3 utility ..."
cd ${WRKSRC} ; \
${CC} ${CFLAGS} -I./obj -I./soobj -I./src \
-I./contrib/pcl3/eprn -o bin/pcl3opts \
contrib/pcl3/src/pcl3opts.c contrib/pcl3/src/pclscan.c \
contrib/pcl3/eprn/mediasize.c contrib/pcl3/src/pclsize.c
# for EPAG driver
${ECHO_MSG} ">>> building EPAG utility ..."
cd ${WRKSRC}/${EPAG_NAME} ; \
${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
pre-su-install: pre-su-install:
${ECHO_MSG} ">>> in pre-install ..." ${ECHO_MSG} ">>> in pre-install ..."
${ECHO_MSG} ">>> creating ghostscript destdir ..." ${ECHO_MSG} ">>> creating ghostscript destdir ..."
${MKDIR} ${DATADIR} ${MKDIR} ${DATADIR}
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
.if defined(WITH_SHLIB)
${MKDIR} ${INCLUDEDIR}
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INCLUDEDIR}
.endif
post-install: post-install:
${ECHO_MSG} ">>> in post-install ..." ${ECHO_MSG} ">>> in post-install ..."
${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont
.if defined(WITH_SHLIB)
.for i in iapi.h ierrors.h
${INSTALL_DATA} ${WRKSRC}/src/${i} ${INCLUDEDIR}
.endfor
.endif
${ECHO_MSG} ">>> stripping gs ..." ${ECHO_MSG} ">>> stripping gs ..."
.if defined(WITH_SHLIB) .if defined(WITH_SHLIB)
${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx ${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx

View file

@ -1,5 +1,5 @@
# $FreeBSD$ # $FreeBSD$
GS_VERSION= 8.60 GS_VERSION= 8.61
GS_REVISION= 0 GS_REVISION= 0
GS_EPOCH= 0 GS_EPOCH= 0

View file

@ -1,6 +1,6 @@
MD5 (ghostscript/ghostscript-8.60.tar.bz2) = 89fc0a90e67caf151a9d6855200c68ca MD5 (ghostscript/ghostscript-8.61.tar.bz2) = abff0506cd249cba3ad862d8fe4f6474
SHA256 (ghostscript/ghostscript-8.60.tar.bz2) = f615f936e38d2e7a6da588de6655f2b23207c0a906df1960b1d7e83c3241982a SHA256 (ghostscript/ghostscript-8.61.tar.bz2) = 8c3f62da38688c02442f9b94ac42c6ecefb01141c8319393e8216d8422f7aa33
SIZE (ghostscript/ghostscript-8.60.tar.bz2) = 12942029 SIZE (ghostscript/ghostscript-8.61.tar.bz2) = 13244754
MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3 MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b
SIZE (ghostscript/epag-3.09.tar.gz) = 12858 SIZE (ghostscript/epag-3.09.tar.gz) = 12858

View file

@ -1,5 +1,125 @@
--- epag/gdevepag.c.orig Sat Jul 8 13:33:09 2000 --- epag/gdevepag.c.orig Sat Jul 8 13:33:09 2000
+++ epag/gdevepag.c Mon May 14 01:22:31 2007 +++ epag/gdevepag.c Sat Nov 24 15:25:11 2007
@@ -102,30 +102,30 @@
} EpagBubble;
/* The device descriptors */
-private dev_proc_open_device(epag_open);
-private dev_proc_close_device(epag_close);
-private dev_proc_print_page(epag_print_page);
-private void epag_printer_initialize(gx_device_printer *pdev, FILE *fp,int);
-private dev_proc_print_page(epag_print_page);
-private dev_proc_get_params(epag_get_params);
-private dev_proc_put_params(epag_put_params);
-private void epag_paper_set(gx_device_printer *pdev, FILE *fp);
-private void epag_bubble_flush_all(EpagPageCont *cont);
-private void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,EpagPageCont *cont);
-private void epag_page_close(EpagPageCont *cont);
-private int epag_read_image(EpagPageCont *cont);
-private void epag_process_line(EpagPageCont *cont);
-private int epag_is_black(EpagPageCont *cont, int bx);
-private void epag_rect_add(EpagPageCont *cont,int start,int end);
-private void epag_bubble_gen(EpagPageCont *cont,
+static dev_proc_open_device(epag_open);
+static dev_proc_close_device(epag_close);
+static dev_proc_print_page(epag_print_page);
+static void epag_printer_initialize(gx_device_printer *pdev, FILE *fp,int);
+static dev_proc_print_page(epag_print_page);
+static dev_proc_get_params(epag_get_params);
+static dev_proc_put_params(epag_put_params);
+static void epag_paper_set(gx_device_printer *pdev, FILE *fp);
+static void epag_bubble_flush_all(EpagPageCont *cont);
+static void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,EpagPageCont *cont);
+static void epag_page_close(EpagPageCont *cont);
+static int epag_read_image(EpagPageCont *cont);
+static void epag_process_line(EpagPageCont *cont);
+static int epag_is_black(EpagPageCont *cont, int bx);
+static void epag_rect_add(EpagPageCont *cont,int start,int end);
+static void epag_bubble_gen(EpagPageCont *cont,
int x0, int x1, int y0, int y1);
-private void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl);
-private void epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl);
+static void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl);
+static void epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl);
/*
*
*/
-private gx_device_procs prn_epag_procs =
+static gx_device_procs prn_epag_procs =
prn_params_procs(epag_open, gdev_prn_output_page, epag_close,
epag_get_params, epag_put_params);
gx_device_printer far_data gs_epag_device =
@@ -140,13 +140,13 @@
static char *epson_remote_start = "\033\001@EJL \r\n";
/* Open the printer, adjusting the margins if necessary. */
-private int
+static int
epag_open(gx_device *pdev)
{
return gdev_prn_open(pdev);
}
-private int
+static int
epag_close(gx_device *pdev)
{
gdev_prn_open_printer(pdev, 1);
@@ -163,7 +163,7 @@
return gdev_prn_close(pdev);
}
-private int
+static int
epag_print_page(gx_device_printer *pdev, FILE *fp)
{
EpagPageCont cont;
@@ -205,7 +205,7 @@
GS, '2', 'a', 'b', 'P', /* イメージ描画後下へ */
};
-private void
+static void
epag_printer_initialize(gx_device_printer *pdev, FILE *fp, int copies)
{
double xDpi,yDpi;
@@ -260,7 +260,7 @@
fprintf(fp,"%c%dcoO",GS, copies < 256 ? copies : 255);
}
-private int
+static int
epag_get_params(gx_device *pdev, gs_param_list *plist)
{
int code;
@@ -286,7 +286,7 @@
}
/* Put properties. */
-private int
+static int
epag_put_params(gx_device *pdev, gs_param_list *plist)
{
param_read_int(plist, "cRowBuf", &epag_cont.cRowBuf);
@@ -380,7 +380,7 @@
/*
* epag_bubble_flush_all: bubbleを全て出力する
*/
-private void epag_bubble_flush_all(EpagPageCont *cont)
+static void epag_bubble_flush_all(EpagPageCont *cont)
{
int i;
@@ -392,7 +392,7 @@
/*
* epag_page_cont_init: EpagPageContの初期化
*/
-private void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,
+static void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,
EpagPageCont *cont)
{
int bpl;
@@ -417,15 +417,15 @@ @@ -417,15 +417,15 @@
cont->maxY = epag_cont.cRowBuf / cont->bh * cont->bh ; cont->maxY = epag_cont.cRowBuf / cont->bh * cont->bh ;
if(cont->maxY < cont->bh) cont->maxY = cont->bh; if(cont->maxY < cont->bh) cont->maxY = cont->bh;
@ -20,8 +140,12 @@
bbtbl = (EpagBubble *)cont->bubbleBuffer; bbtbl = (EpagBubble *)cont->bubbleBuffer;
for(i=0;i<cont->maxBx-1;i++) for(i=0;i<cont->maxBx-1;i++)
bbtbl[i].next = &bbtbl[i+1]; bbtbl[i].next = &bbtbl[i+1];
@@ -436,9 +436,9 @@ @@ -433,15 +433,15 @@
private void cont->freeBubbleList = &bbtbl[0];
}
-private void
+static void
epag_page_close(EpagPageCont *cont) epag_page_close(EpagPageCont *cont)
{ {
- gs_free(cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)"); - gs_free(cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)");
@ -32,4 +156,62 @@
+ gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer"); + gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer");
} }
private int -private int
+static int
epag_read_image(EpagPageCont *cont)
{
int bh = cont->bh;
@@ -473,7 +473,7 @@
/*
* bh行分のラスターデータを処理する
*/
-private void
+static void
epag_process_line(EpagPageCont *cont)
{
int bh = cont->bh;
@@ -502,7 +502,7 @@
else epag_rect_add(cont, 0, cont->maxBx-1);
}
-private int
+static int
epag_is_black(EpagPageCont *cont, int bx)
{
int bh = cont->bh;
@@ -520,7 +520,7 @@
return 0;
}
-private void
+static void
epag_rect_add(EpagPageCont *cont,int start,int end)
{
int x0 = start * cont->bw;
@@ -544,7 +544,7 @@
}
}
-private void
+static void
epag_bubble_gen(EpagPageCont *cont, int x0, int x1, int y0, int y1)
{
EpagBubble *bbl;
@@ -569,7 +569,7 @@
}
}
-private void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl)
+static void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl)
{
int bx,bx0,bx1;
@@ -588,7 +588,7 @@
/* イメージを出力 */
-private void
+static void
epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl)
{
FILE *fp = cont->fp;

View file

@ -1,9 +1,9 @@
--- src/gdevvglb.c.orig Mon Jun 4 01:15:47 2007 --- src/gdevvglb.c.orig Tue Sep 25 22:31:24 2007
+++ src/gdevvglb.c Mon Jun 4 01:18:45 2007 +++ src/gdevvglb.c Sat Nov 24 23:00:49 2007
@@ -149,10 +149,13 @@ @@ -149,10 +149,13 @@
} }
private gx_color_index static gx_color_index
-vgalib_map_rgb_color(gx_device * dev, gx_color_value red, -vgalib_map_rgb_color(gx_device * dev, gx_color_value red,
- gx_color_value green, gx_color_value blue) - gx_color_value green, gx_color_value blue)
+vgalib_map_rgb_color(gx_device * dev, const gx_color_value cv[]) +vgalib_map_rgb_color(gx_device * dev, const gx_color_value cv[])
@ -16,4 +16,4 @@
+ return pc_4bit_map_rgb_color(dev, cv); + return pc_4bit_map_rgb_color(dev, cv);
} }
private int static int

View file

@ -1,5 +1,5 @@
--- src/unix-gcc.mak.orig Tue Jul 31 05:13:56 2007 --- src/unix-gcc.mak.orig Sat Nov 10 06:18:04 2007
+++ src/unix-gcc.mak Fri Aug 10 22:01:41 2007 +++ src/unix-gcc.mak Sat Nov 24 15:09:41 2007
@@ -21,15 +21,17 @@ @@ -21,15 +21,17 @@
# source, generated intermediate file, and object directories # source, generated intermediate file, and object directories
# for the graphics library (GL) and the PostScript/PDF interpreter (PS). # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@ -42,15 +42,7 @@
exec_prefix = $(prefix) exec_prefix = $(prefix)
bindir = $(exec_prefix)/bin bindir = $(exec_prefix)/bin
scriptdir = $(bindir) scriptdir = $(bindir)
@@ -62,6 +63,7 @@ @@ -107,7 +108,7 @@
datadir = $(prefix)/share
gsdir = $(datadir)/ghostscript
gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
+gssharedir = $(libdir)/ghostscript/$(GS_DOT_VERSION)
docdir=$(gsdatadir)/doc
exdir=$(gsdatadir)/examples
@@ -108,7 +110,7 @@
# -DHAVE_HYPOT # -DHAVE_HYPOT
# use the system hypot() call # use the system hypot() call
@ -59,7 +51,7 @@
# Define the name of the executable file. # Define the name of the executable file.
@@ -143,7 +145,7 @@ @@ -141,7 +142,7 @@
# some older JPEG streams that violate the standard. If the JPEG # some older JPEG streams that violate the standard. If the JPEG
# library built from local sources, the patch will be applied. # library built from local sources, the patch will be applied.
@ -68,7 +60,7 @@
JPEG_NAME=jpeg JPEG_NAME=jpeg
# Define the directory where the PNG library sources are stored, # Define the directory where the PNG library sources are stored,
@@ -158,7 +160,7 @@ @@ -155,7 +156,7 @@
# what its name is. # what its name is.
# See gs.mak and Make.htm for more information. # See gs.mak and Make.htm for more information.
@ -77,7 +69,7 @@
LIBPNG_NAME=png LIBPNG_NAME=png
# Define the directory where the zlib sources are stored. # Define the directory where the zlib sources are stored.
@@ -170,7 +172,7 @@ @@ -167,7 +168,7 @@
# what its name is (usually libz, but sometimes libgz). # what its name is (usually libz, but sometimes libgz).
# See gs.mak and Make.htm for more information. # See gs.mak and Make.htm for more information.
@ -86,7 +78,7 @@
#ZLIB_NAME=gz #ZLIB_NAME=gz
ZLIB_NAME=z ZLIB_NAME=z
@@ -179,6 +181,14 @@ @@ -176,6 +177,14 @@
JBIG2_LIB=jbig2dec JBIG2_LIB=jbig2dec
JBIG2SRCDIR=jbig2dec JBIG2SRCDIR=jbig2dec
@ -101,7 +93,7 @@
# Define the directory where the icclib source are stored. # Define the directory where the icclib source are stored.
# See icclib.mak for more information # See icclib.mak for more information
@@ -207,7 +217,7 @@ @@ -204,7 +213,7 @@
# Define the name of the C compiler. # Define the name of the C compiler.
@ -110,7 +102,7 @@
# Define the name of the linker for the final link step. # Define the name of the linker for the final link step.
# Normally this is the same as the C compiler. # Normally this is the same as the C compiler.
@@ -224,10 +234,10 @@ @@ -221,10 +230,10 @@
# Define the added flags for standard, debugging, profiling # Define the added flags for standard, debugging, profiling
# and shared object builds. # and shared object builds.
@ -123,7 +115,7 @@
# Define the other compilation flags. Add at most one of the following: # Define the other compilation flags. Add at most one of the following:
# -DBSD4_2 for 4.2bsd systems. # -DBSD4_2 for 4.2bsd systems.
@@ -240,7 +250,8 @@ @@ -237,7 +246,8 @@
# We don't include -ansi, because this gets in the way of the platform- # We don't include -ansi, because this gets in the way of the platform-
# specific stuff that <math.h> typically needs; nevertheless, we expect # specific stuff that <math.h> typically needs; nevertheless, we expect
# gcc to accept ANSI-style function prototypes and function definitions. # gcc to accept ANSI-style function prototypes and function definitions.
@ -133,7 +125,7 @@
CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
@@ -251,7 +262,7 @@ @@ -248,7 +258,7 @@
# -R /usr/local/xxx/lib:/usr/local/lib # -R /usr/local/xxx/lib:/usr/local/lib
# giving the full path names of the shared library directories. # giving the full path names of the shared library directories.
# XLDFLAGS can be set from the command line. # XLDFLAGS can be set from the command line.
@ -142,7 +134,7 @@
LDFLAGS=$(XLDFLAGS) LDFLAGS=$(XLDFLAGS)
@@ -262,7 +273,7 @@ @@ -259,7 +269,7 @@
# Solaris may need -lnsl -lsocket -lposix4. # Solaris may need -lnsl -lsocket -lposix4.
# (Libraries required by individual drivers are handled automatically.) # (Libraries required by individual drivers are handled automatically.)
@ -151,7 +143,7 @@
# Define the standard libraries to search at the end of linking. # Define the standard libraries to search at the end of linking.
# Most platforms require -lpthread for the POSIX threads library; # Most platforms require -lpthread for the POSIX threads library;
@@ -284,7 +295,7 @@ @@ -281,7 +291,7 @@
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11, # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
# not in $(XINCLUDE). # not in $(XINCLUDE).
@ -160,7 +152,7 @@
# Define the directory/ies and library names for the X11 library files. # Define the directory/ies and library names for the X11 library files.
# XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
@@ -296,12 +307,12 @@ @@ -293,12 +303,12 @@
# Solaris and other SVR4 systems with dynamic linking probably want # Solaris and other SVR4 systems with dynamic linking probably want
#XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
# X11R6 (on any platform) may need # X11R6 (on any platform) may need
@ -176,7 +168,7 @@
# Define whether this platform has floating point hardware: # Define whether this platform has floating point hardware:
# FPU_TYPE=2 means floating point is faster than fixed point. # FPU_TYPE=2 means floating point is faster than fixed point.
@@ -319,16 +330,16 @@ @@ -316,16 +326,16 @@
# If POSIX sync primitives are used, also change the STDLIBS to include # If POSIX sync primitives are used, also change the STDLIBS to include
# the pthread library. # the pthread library.
@ -196,7 +188,7 @@
#FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev
# The following is strictly for testing. # The following is strictly for testing.
FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev
@@ -418,7 +429,7 @@ @@ -415,7 +425,7 @@
DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev
# Shared library target to build. # Shared library target to build.
@ -205,7 +197,7 @@
#GS_SHARED_OBJS=$(GLOBJDIR)/X11.so #GS_SHARED_OBJS=$(GLOBJDIR)/X11.so
# ---------------------------- End of options --------------------------- # # ---------------------------- End of options --------------------------- #
@@ -457,6 +468,9 @@ @@ -454,6 +464,9 @@
include $(GLSRCDIR)/zlib.mak include $(GLSRCDIR)/zlib.mak
include $(GLSRCDIR)/libpng.mak include $(GLSRCDIR)/libpng.mak
include $(GLSRCDIR)/jbig2.mak include $(GLSRCDIR)/jbig2.mak
@ -215,7 +207,7 @@
include $(GLSRCDIR)/icclib.mak include $(GLSRCDIR)/icclib.mak
include $(GLSRCDIR)/ijs.mak include $(GLSRCDIR)/ijs.mak
include $(GLSRCDIR)/devs.mak include $(GLSRCDIR)/devs.mak
@@ -466,6 +480,7 @@ @@ -463,6 +476,7 @@
include $(GLSRCDIR)/unix-dll.mak include $(GLSRCDIR)/unix-dll.mak
include $(GLSRCDIR)/unix-end.mak include $(GLSRCDIR)/unix-end.mak
include $(GLSRCDIR)/unixinst.mak include $(GLSRCDIR)/unixinst.mak

View file

@ -1,9 +1,9 @@
--- src/gdevperm.c.orig Fri Jun 18 16:00:47 2004 --- src/gdevperm.c.orig Tue Sep 25 22:31:24 2007
+++ src/gdevperm.c Fri Dec 31 18:06:42 2004 +++ src/gdevperm.c Sat Nov 24 15:11:12 2007
@@ -289,7 +289,7 @@ @@ -286,7 +286,7 @@
(strncmp((const char *)name, (const char *)str, name_size) == 0)) (strncmp((const char *)name, (const char *)str, name_size) == 0))
private int static int
-perm_get_color_comp_index(const gx_device *pdev, const char *pname, -perm_get_color_comp_index(const gx_device *pdev, const char *pname,
+perm_get_color_comp_index(gx_device *pdev, const char *pname, +perm_get_color_comp_index(gx_device *pdev, const char *pname,
int name_size, int component_type) int name_size, int component_type)

View file

@ -295,11 +295,19 @@ bin/wftopfa
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF32-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF32-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-H %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF16-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF16-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF32-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF32-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF8-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF8-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-HW-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-HW-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UTF8-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UTF8-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-H %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX02132004-UTF32-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX02132004-UTF32-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-H %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF16-H %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF16-H
@ -557,6 +565,7 @@ bin/wftopfa
%%DATADIR%%/%%GS_VERSION%%/lib/pcharstr.ps %%DATADIR%%/%%GS_VERSION%%/lib/pcharstr.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf2dsc.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf2dsc.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf_base.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf_base.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf_cslayer.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf_draw.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf_draw.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf_font.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf_font.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf_main.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf_main.ps

View file

@ -98,13 +98,11 @@ MAKE_ENV+= SOC_LOADER="dxmain.c" \
SOC_CFLAGS="`pkg-config --cflags gtk+-2.0`" \ SOC_CFLAGS="`pkg-config --cflags gtk+-2.0`" \
SOC_LIBS="`pkg-config --libs gtk+-2.0`" SOC_LIBS="`pkg-config --libs gtk+-2.0`"
.endif .endif
ALL_TARGET= so pcl3opts ALL_TARGET= so
INSTALL_TARGET= soinstall INSTALL_TARGET= soinstall
USE_LDCONFIG= yes USE_LDCONFIG= yes
PLIST_SUB+= SHLIB="" SHLIB_VER="${GS_VERSION:R}" PLIST_SUB+= SHLIB="" SHLIB_VER="${GS_VERSION:R}"
INCLUDEDIR= ${PREFIX}/include/ghostscript
.else .else
ALL_TARGET= all pcl3opts
PLIST_SUB+= SHLIB="@comment " PLIST_SUB+= SHLIB="@comment "
.endif .endif
@ -167,10 +165,6 @@ pre-build:
${ECHO_MSG} ">>> creating directories for compilation ..." ${ECHO_MSG} ">>> creating directories for compilation ..."
${MKDIR} ${WRKSRC}/obj ${MKDIR} ${WRKSRC}/obj
${MKDIR} ${WRKSRC}/bin ${MKDIR} ${WRKSRC}/bin
# for EPAG driver
${ECHO_MSG} ">>> building EPAG utility ..."
cd ${WRKSRC}/${EPAG_NAME} ; \
${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
${ECHO_MSG} ">>> creating symlinks for EPAG ..." ${ECHO_MSG} ">>> creating symlinks for EPAG ..."
.for i in gdevepag.c .for i in gdevepag.c
${LN} -sf ${WRKSRC}/${EPAG_NAME}/${i} ${WRKSRC}/src ${LN} -sf ${WRKSRC}/${EPAG_NAME}/${i} ${WRKSRC}/src
@ -186,24 +180,28 @@ pre-build:
${WRKSRC}/freetype/objs/freetype214MT_D.a ${WRKSRC}/freetype/objs/freetype214MT_D.a
.endif .endif
post-build:
# for PCL3 driver
${ECHO_MSG} ">>> building PCL3 utility ..."
cd ${WRKSRC} ; \
${CC} ${CFLAGS} -I./obj -I./soobj -I./src \
-I./contrib/pcl3/eprn -o bin/pcl3opts \
contrib/pcl3/src/pcl3opts.c contrib/pcl3/src/pclscan.c \
contrib/pcl3/eprn/mediasize.c contrib/pcl3/src/pclsize.c
# for EPAG driver
${ECHO_MSG} ">>> building EPAG utility ..."
cd ${WRKSRC}/${EPAG_NAME} ; \
${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
pre-su-install: pre-su-install:
${ECHO_MSG} ">>> in pre-install ..." ${ECHO_MSG} ">>> in pre-install ..."
${ECHO_MSG} ">>> creating ghostscript destdir ..." ${ECHO_MSG} ">>> creating ghostscript destdir ..."
${MKDIR} ${DATADIR} ${MKDIR} ${DATADIR}
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
.if defined(WITH_SHLIB)
${MKDIR} ${INCLUDEDIR}
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INCLUDEDIR}
.endif
post-install: post-install:
${ECHO_MSG} ">>> in post-install ..." ${ECHO_MSG} ">>> in post-install ..."
${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont
.if defined(WITH_SHLIB)
.for i in iapi.h ierrors.h
${INSTALL_DATA} ${WRKSRC}/src/${i} ${INCLUDEDIR}
.endfor
.endif
${ECHO_MSG} ">>> stripping gs ..." ${ECHO_MSG} ">>> stripping gs ..."
.if defined(WITH_SHLIB) .if defined(WITH_SHLIB)
${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx ${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx

View file

@ -1,5 +1,5 @@
# $FreeBSD$ # $FreeBSD$
GS_VERSION= 8.60 GS_VERSION= 8.61
GS_REVISION= 0 GS_REVISION= 0
GS_EPOCH= 0 GS_EPOCH= 0

View file

@ -1,6 +1,6 @@
MD5 (ghostscript/ghostscript-8.60.tar.bz2) = 89fc0a90e67caf151a9d6855200c68ca MD5 (ghostscript/ghostscript-8.61.tar.bz2) = abff0506cd249cba3ad862d8fe4f6474
SHA256 (ghostscript/ghostscript-8.60.tar.bz2) = f615f936e38d2e7a6da588de6655f2b23207c0a906df1960b1d7e83c3241982a SHA256 (ghostscript/ghostscript-8.61.tar.bz2) = 8c3f62da38688c02442f9b94ac42c6ecefb01141c8319393e8216d8422f7aa33
SIZE (ghostscript/ghostscript-8.60.tar.bz2) = 12942029 SIZE (ghostscript/ghostscript-8.61.tar.bz2) = 13244754
MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3 MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b
SIZE (ghostscript/epag-3.09.tar.gz) = 12858 SIZE (ghostscript/epag-3.09.tar.gz) = 12858

View file

@ -1,5 +1,125 @@
--- epag/gdevepag.c.orig Sat Jul 8 13:33:09 2000 --- epag/gdevepag.c.orig Sat Jul 8 13:33:09 2000
+++ epag/gdevepag.c Mon May 14 01:22:31 2007 +++ epag/gdevepag.c Sat Nov 24 15:25:11 2007
@@ -102,30 +102,30 @@
} EpagBubble;
/* The device descriptors */
-private dev_proc_open_device(epag_open);
-private dev_proc_close_device(epag_close);
-private dev_proc_print_page(epag_print_page);
-private void epag_printer_initialize(gx_device_printer *pdev, FILE *fp,int);
-private dev_proc_print_page(epag_print_page);
-private dev_proc_get_params(epag_get_params);
-private dev_proc_put_params(epag_put_params);
-private void epag_paper_set(gx_device_printer *pdev, FILE *fp);
-private void epag_bubble_flush_all(EpagPageCont *cont);
-private void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,EpagPageCont *cont);
-private void epag_page_close(EpagPageCont *cont);
-private int epag_read_image(EpagPageCont *cont);
-private void epag_process_line(EpagPageCont *cont);
-private int epag_is_black(EpagPageCont *cont, int bx);
-private void epag_rect_add(EpagPageCont *cont,int start,int end);
-private void epag_bubble_gen(EpagPageCont *cont,
+static dev_proc_open_device(epag_open);
+static dev_proc_close_device(epag_close);
+static dev_proc_print_page(epag_print_page);
+static void epag_printer_initialize(gx_device_printer *pdev, FILE *fp,int);
+static dev_proc_print_page(epag_print_page);
+static dev_proc_get_params(epag_get_params);
+static dev_proc_put_params(epag_put_params);
+static void epag_paper_set(gx_device_printer *pdev, FILE *fp);
+static void epag_bubble_flush_all(EpagPageCont *cont);
+static void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,EpagPageCont *cont);
+static void epag_page_close(EpagPageCont *cont);
+static int epag_read_image(EpagPageCont *cont);
+static void epag_process_line(EpagPageCont *cont);
+static int epag_is_black(EpagPageCont *cont, int bx);
+static void epag_rect_add(EpagPageCont *cont,int start,int end);
+static void epag_bubble_gen(EpagPageCont *cont,
int x0, int x1, int y0, int y1);
-private void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl);
-private void epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl);
+static void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl);
+static void epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl);
/*
*
*/
-private gx_device_procs prn_epag_procs =
+static gx_device_procs prn_epag_procs =
prn_params_procs(epag_open, gdev_prn_output_page, epag_close,
epag_get_params, epag_put_params);
gx_device_printer far_data gs_epag_device =
@@ -140,13 +140,13 @@
static char *epson_remote_start = "\033\001@EJL \r\n";
/* Open the printer, adjusting the margins if necessary. */
-private int
+static int
epag_open(gx_device *pdev)
{
return gdev_prn_open(pdev);
}
-private int
+static int
epag_close(gx_device *pdev)
{
gdev_prn_open_printer(pdev, 1);
@@ -163,7 +163,7 @@
return gdev_prn_close(pdev);
}
-private int
+static int
epag_print_page(gx_device_printer *pdev, FILE *fp)
{
EpagPageCont cont;
@@ -205,7 +205,7 @@
GS, '2', 'a', 'b', 'P', /* イメージ描画後下へ */
};
-private void
+static void
epag_printer_initialize(gx_device_printer *pdev, FILE *fp, int copies)
{
double xDpi,yDpi;
@@ -260,7 +260,7 @@
fprintf(fp,"%c%dcoO",GS, copies < 256 ? copies : 255);
}
-private int
+static int
epag_get_params(gx_device *pdev, gs_param_list *plist)
{
int code;
@@ -286,7 +286,7 @@
}
/* Put properties. */
-private int
+static int
epag_put_params(gx_device *pdev, gs_param_list *plist)
{
param_read_int(plist, "cRowBuf", &epag_cont.cRowBuf);
@@ -380,7 +380,7 @@
/*
* epag_bubble_flush_all: bubbleを全て出力する
*/
-private void epag_bubble_flush_all(EpagPageCont *cont)
+static void epag_bubble_flush_all(EpagPageCont *cont)
{
int i;
@@ -392,7 +392,7 @@
/*
* epag_page_cont_init: EpagPageContの初期化
*/
-private void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,
+static void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,
EpagPageCont *cont)
{
int bpl;
@@ -417,15 +417,15 @@ @@ -417,15 +417,15 @@
cont->maxY = epag_cont.cRowBuf / cont->bh * cont->bh ; cont->maxY = epag_cont.cRowBuf / cont->bh * cont->bh ;
if(cont->maxY < cont->bh) cont->maxY = cont->bh; if(cont->maxY < cont->bh) cont->maxY = cont->bh;
@ -20,8 +140,12 @@
bbtbl = (EpagBubble *)cont->bubbleBuffer; bbtbl = (EpagBubble *)cont->bubbleBuffer;
for(i=0;i<cont->maxBx-1;i++) for(i=0;i<cont->maxBx-1;i++)
bbtbl[i].next = &bbtbl[i+1]; bbtbl[i].next = &bbtbl[i+1];
@@ -436,9 +436,9 @@ @@ -433,15 +433,15 @@
private void cont->freeBubbleList = &bbtbl[0];
}
-private void
+static void
epag_page_close(EpagPageCont *cont) epag_page_close(EpagPageCont *cont)
{ {
- gs_free(cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)"); - gs_free(cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)");
@ -32,4 +156,62 @@
+ gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer"); + gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer");
} }
private int -private int
+static int
epag_read_image(EpagPageCont *cont)
{
int bh = cont->bh;
@@ -473,7 +473,7 @@
/*
* bh行分のラスターデータを処理する
*/
-private void
+static void
epag_process_line(EpagPageCont *cont)
{
int bh = cont->bh;
@@ -502,7 +502,7 @@
else epag_rect_add(cont, 0, cont->maxBx-1);
}
-private int
+static int
epag_is_black(EpagPageCont *cont, int bx)
{
int bh = cont->bh;
@@ -520,7 +520,7 @@
return 0;
}
-private void
+static void
epag_rect_add(EpagPageCont *cont,int start,int end)
{
int x0 = start * cont->bw;
@@ -544,7 +544,7 @@
}
}
-private void
+static void
epag_bubble_gen(EpagPageCont *cont, int x0, int x1, int y0, int y1)
{
EpagBubble *bbl;
@@ -569,7 +569,7 @@
}
}
-private void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl)
+static void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl)
{
int bx,bx0,bx1;
@@ -588,7 +588,7 @@
/* イメージを出力 */
-private void
+static void
epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl)
{
FILE *fp = cont->fp;

View file

@ -1,9 +1,9 @@
--- src/gdevvglb.c.orig Mon Jun 4 01:15:47 2007 --- src/gdevvglb.c.orig Tue Sep 25 22:31:24 2007
+++ src/gdevvglb.c Mon Jun 4 01:18:45 2007 +++ src/gdevvglb.c Sat Nov 24 23:00:49 2007
@@ -149,10 +149,13 @@ @@ -149,10 +149,13 @@
} }
private gx_color_index static gx_color_index
-vgalib_map_rgb_color(gx_device * dev, gx_color_value red, -vgalib_map_rgb_color(gx_device * dev, gx_color_value red,
- gx_color_value green, gx_color_value blue) - gx_color_value green, gx_color_value blue)
+vgalib_map_rgb_color(gx_device * dev, const gx_color_value cv[]) +vgalib_map_rgb_color(gx_device * dev, const gx_color_value cv[])
@ -16,4 +16,4 @@
+ return pc_4bit_map_rgb_color(dev, cv); + return pc_4bit_map_rgb_color(dev, cv);
} }
private int static int

View file

@ -1,5 +1,5 @@
--- src/unix-gcc.mak.orig Tue Jul 31 05:13:56 2007 --- src/unix-gcc.mak.orig Sat Nov 10 06:18:04 2007
+++ src/unix-gcc.mak Fri Aug 10 22:01:41 2007 +++ src/unix-gcc.mak Sat Nov 24 15:09:41 2007
@@ -21,15 +21,17 @@ @@ -21,15 +21,17 @@
# source, generated intermediate file, and object directories # source, generated intermediate file, and object directories
# for the graphics library (GL) and the PostScript/PDF interpreter (PS). # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@ -42,15 +42,7 @@
exec_prefix = $(prefix) exec_prefix = $(prefix)
bindir = $(exec_prefix)/bin bindir = $(exec_prefix)/bin
scriptdir = $(bindir) scriptdir = $(bindir)
@@ -62,6 +63,7 @@ @@ -107,7 +108,7 @@
datadir = $(prefix)/share
gsdir = $(datadir)/ghostscript
gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
+gssharedir = $(libdir)/ghostscript/$(GS_DOT_VERSION)
docdir=$(gsdatadir)/doc
exdir=$(gsdatadir)/examples
@@ -108,7 +110,7 @@
# -DHAVE_HYPOT # -DHAVE_HYPOT
# use the system hypot() call # use the system hypot() call
@ -59,7 +51,7 @@
# Define the name of the executable file. # Define the name of the executable file.
@@ -143,7 +145,7 @@ @@ -141,7 +142,7 @@
# some older JPEG streams that violate the standard. If the JPEG # some older JPEG streams that violate the standard. If the JPEG
# library built from local sources, the patch will be applied. # library built from local sources, the patch will be applied.
@ -68,7 +60,7 @@
JPEG_NAME=jpeg JPEG_NAME=jpeg
# Define the directory where the PNG library sources are stored, # Define the directory where the PNG library sources are stored,
@@ -158,7 +160,7 @@ @@ -155,7 +156,7 @@
# what its name is. # what its name is.
# See gs.mak and Make.htm for more information. # See gs.mak and Make.htm for more information.
@ -77,7 +69,7 @@
LIBPNG_NAME=png LIBPNG_NAME=png
# Define the directory where the zlib sources are stored. # Define the directory where the zlib sources are stored.
@@ -170,7 +172,7 @@ @@ -167,7 +168,7 @@
# what its name is (usually libz, but sometimes libgz). # what its name is (usually libz, but sometimes libgz).
# See gs.mak and Make.htm for more information. # See gs.mak and Make.htm for more information.
@ -86,7 +78,7 @@
#ZLIB_NAME=gz #ZLIB_NAME=gz
ZLIB_NAME=z ZLIB_NAME=z
@@ -179,6 +181,14 @@ @@ -176,6 +177,14 @@
JBIG2_LIB=jbig2dec JBIG2_LIB=jbig2dec
JBIG2SRCDIR=jbig2dec JBIG2SRCDIR=jbig2dec
@ -101,7 +93,7 @@
# Define the directory where the icclib source are stored. # Define the directory where the icclib source are stored.
# See icclib.mak for more information # See icclib.mak for more information
@@ -207,7 +217,7 @@ @@ -204,7 +213,7 @@
# Define the name of the C compiler. # Define the name of the C compiler.
@ -110,7 +102,7 @@
# Define the name of the linker for the final link step. # Define the name of the linker for the final link step.
# Normally this is the same as the C compiler. # Normally this is the same as the C compiler.
@@ -224,10 +234,10 @@ @@ -221,10 +230,10 @@
# Define the added flags for standard, debugging, profiling # Define the added flags for standard, debugging, profiling
# and shared object builds. # and shared object builds.
@ -123,7 +115,7 @@
# Define the other compilation flags. Add at most one of the following: # Define the other compilation flags. Add at most one of the following:
# -DBSD4_2 for 4.2bsd systems. # -DBSD4_2 for 4.2bsd systems.
@@ -240,7 +250,8 @@ @@ -237,7 +246,8 @@
# We don't include -ansi, because this gets in the way of the platform- # We don't include -ansi, because this gets in the way of the platform-
# specific stuff that <math.h> typically needs; nevertheless, we expect # specific stuff that <math.h> typically needs; nevertheless, we expect
# gcc to accept ANSI-style function prototypes and function definitions. # gcc to accept ANSI-style function prototypes and function definitions.
@ -133,7 +125,7 @@
CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
@@ -251,7 +262,7 @@ @@ -248,7 +258,7 @@
# -R /usr/local/xxx/lib:/usr/local/lib # -R /usr/local/xxx/lib:/usr/local/lib
# giving the full path names of the shared library directories. # giving the full path names of the shared library directories.
# XLDFLAGS can be set from the command line. # XLDFLAGS can be set from the command line.
@ -142,7 +134,7 @@
LDFLAGS=$(XLDFLAGS) LDFLAGS=$(XLDFLAGS)
@@ -262,7 +273,7 @@ @@ -259,7 +269,7 @@
# Solaris may need -lnsl -lsocket -lposix4. # Solaris may need -lnsl -lsocket -lposix4.
# (Libraries required by individual drivers are handled automatically.) # (Libraries required by individual drivers are handled automatically.)
@ -151,7 +143,7 @@
# Define the standard libraries to search at the end of linking. # Define the standard libraries to search at the end of linking.
# Most platforms require -lpthread for the POSIX threads library; # Most platforms require -lpthread for the POSIX threads library;
@@ -284,7 +295,7 @@ @@ -281,7 +291,7 @@
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11, # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
# not in $(XINCLUDE). # not in $(XINCLUDE).
@ -160,7 +152,7 @@
# Define the directory/ies and library names for the X11 library files. # Define the directory/ies and library names for the X11 library files.
# XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
@@ -296,12 +307,12 @@ @@ -293,12 +303,12 @@
# Solaris and other SVR4 systems with dynamic linking probably want # Solaris and other SVR4 systems with dynamic linking probably want
#XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
# X11R6 (on any platform) may need # X11R6 (on any platform) may need
@ -176,7 +168,7 @@
# Define whether this platform has floating point hardware: # Define whether this platform has floating point hardware:
# FPU_TYPE=2 means floating point is faster than fixed point. # FPU_TYPE=2 means floating point is faster than fixed point.
@@ -319,16 +330,16 @@ @@ -316,16 +326,16 @@
# If POSIX sync primitives are used, also change the STDLIBS to include # If POSIX sync primitives are used, also change the STDLIBS to include
# the pthread library. # the pthread library.
@ -196,7 +188,7 @@
#FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev
# The following is strictly for testing. # The following is strictly for testing.
FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev
@@ -418,7 +429,7 @@ @@ -415,7 +425,7 @@
DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev
# Shared library target to build. # Shared library target to build.
@ -205,7 +197,7 @@
#GS_SHARED_OBJS=$(GLOBJDIR)/X11.so #GS_SHARED_OBJS=$(GLOBJDIR)/X11.so
# ---------------------------- End of options --------------------------- # # ---------------------------- End of options --------------------------- #
@@ -457,6 +468,9 @@ @@ -454,6 +464,9 @@
include $(GLSRCDIR)/zlib.mak include $(GLSRCDIR)/zlib.mak
include $(GLSRCDIR)/libpng.mak include $(GLSRCDIR)/libpng.mak
include $(GLSRCDIR)/jbig2.mak include $(GLSRCDIR)/jbig2.mak
@ -215,7 +207,7 @@
include $(GLSRCDIR)/icclib.mak include $(GLSRCDIR)/icclib.mak
include $(GLSRCDIR)/ijs.mak include $(GLSRCDIR)/ijs.mak
include $(GLSRCDIR)/devs.mak include $(GLSRCDIR)/devs.mak
@@ -466,6 +480,7 @@ @@ -463,6 +476,7 @@
include $(GLSRCDIR)/unix-dll.mak include $(GLSRCDIR)/unix-dll.mak
include $(GLSRCDIR)/unix-end.mak include $(GLSRCDIR)/unix-end.mak
include $(GLSRCDIR)/unixinst.mak include $(GLSRCDIR)/unixinst.mak

View file

@ -1,9 +1,9 @@
--- src/gdevperm.c.orig Fri Jun 18 16:00:47 2004 --- src/gdevperm.c.orig Tue Sep 25 22:31:24 2007
+++ src/gdevperm.c Fri Dec 31 18:06:42 2004 +++ src/gdevperm.c Sat Nov 24 15:11:12 2007
@@ -289,7 +289,7 @@ @@ -286,7 +286,7 @@
(strncmp((const char *)name, (const char *)str, name_size) == 0)) (strncmp((const char *)name, (const char *)str, name_size) == 0))
private int static int
-perm_get_color_comp_index(const gx_device *pdev, const char *pname, -perm_get_color_comp_index(const gx_device *pdev, const char *pname,
+perm_get_color_comp_index(gx_device *pdev, const char *pname, +perm_get_color_comp_index(gx_device *pdev, const char *pname,
int name_size, int component_type) int name_size, int component_type)

View file

@ -295,11 +295,19 @@ bin/wftopfa
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF32-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF32-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-H %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF16-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF16-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF32-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF32-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF8-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF8-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-HW-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-HW-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UTF8-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UTF8-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-H %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX02132004-UTF32-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX02132004-UTF32-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-H %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF16-H %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF16-H
@ -557,6 +565,7 @@ bin/wftopfa
%%DATADIR%%/%%GS_VERSION%%/lib/pcharstr.ps %%DATADIR%%/%%GS_VERSION%%/lib/pcharstr.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf2dsc.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf2dsc.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf_base.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf_base.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf_cslayer.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf_draw.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf_draw.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf_font.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf_font.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf_main.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf_main.ps