OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 24-Nov-2003 11:51:45
Branch: HEAD Handle: 2003112410514302
Added files:
openpkg-src/ghostscript ghostscript.patch
Modified files:
openpkg-re/vcheck vc.ghostscript
openpkg-src/ghostscript ghostscript.spec
openpkg-web news.txt
Log:
create/add patch to make build work with zlib 1.2.1
Summary:
Revision Changes Path
1.7 +1 -1 openpkg-re/vcheck/vc.ghostscript
1.2 +33 -0 openpkg-src/ghostscript/ghostscript.patch
1.45 +6 -2 openpkg-src/ghostscript/ghostscript.spec
1.7518 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.ghostscript
============================================================================
$ cvs diff -u -r1.6 -r1.7 vc.ghostscript
--- openpkg-re/vcheck/vc.ghostscript 18 Aug 2003 06:11:52 -0000 1.6
+++ openpkg-re/vcheck/vc.ghostscript 24 Nov 2003 10:51:43 -0000 1.7
@@ -19,7 +19,7 @@
regex = libpng-(\d+\.\d+\.\d+)\.tar\.gz
}
prog ghostscript:zlib = {
- version = 1.1.4
+ version = 1.2.1
url = http://www.gzip.org/zlib/
regex = zlib-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ghostscript/ghostscript.patch
============================================================================
$ cvs diff -u -r0 -r1.2 ghostscript.patch
--- /dev/null 2003-11-24 11:51:45.000000000 +0100
+++ ghostscript.patch 2003-11-24 11:51:45.000000000 +0100
@@ -0,0 +1,33 @@
+Index: src/zlib.mak
+--- src/zlib.mak.orig 2002-05-09 18:29:16.000000000 +0200
++++ src/zlib.mak 2003-11-24 11:32:29.000000000 +0100
+@@ -84,7 +84,7 @@
+ $(ZGEN)zlibe_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE)
+ $(SETMOD) $(ZGEN)zlibe_1 -lib $(ZLIB_NAME)
+
+-zlibe_=$(ZOBJ)adler32.$(OBJ) $(ZOBJ)deflate.$(OBJ) $(ZOBJ)trees.$(OBJ)
++zlibe_=$(ZOBJ)adler32.$(OBJ) $(ZOBJ)deflate.$(OBJ) $(ZOBJ)compress.$(OBJ)
$(ZOBJ)trees.$(OBJ)
+ $(ZGEN)zlibe_0.dev : $(ZLIB_MAK) $(ECHOGS_XE) $(ZGEN)zlibc.dev $(zlibe_)
+ $(SETMOD) $(ZGEN)zlibe_0 $(zlibe_)
+ $(ADDMOD) $(ZGEN)zlibe_0 -include $(ZGEN)zlibc.dev
+@@ -95,6 +95,9 @@
+ $(ZOBJ)deflate.$(OBJ) : $(ZSRC)deflate.c $(ZDEP)
+ $(ZCC) $(ZO_)deflate.$(OBJ) $(C_) $(ZSRC)deflate.c
+
++$(ZOBJ)compress.$(OBJ) : $(ZSRC)compress.c $(ZDEP)
++ $(ZCC) $(ZO_)compress.$(OBJ) $(C_) $(ZSRC)compress.c
++
+ $(ZOBJ)trees.$(OBJ) : $(ZSRC)trees.c $(ZDEP)
+ $(ZCC) $(ZO_)trees.$(OBJ) $(C_) $(ZSRC)trees.c
+
+@@ -123,8 +126,8 @@
+ $(ZGEN)zlibd_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE)
+ $(SETMOD) $(ZGEN)zlibd_1 -lib $(ZLIB_NAME)
+
+-zlibd1_=$(ZOBJ)infblock.$(OBJ) $(ZOBJ)infcodes.$(OBJ) $(ZOBJ)inffast.$(OBJ)
+-zlibd2_=$(ZOBJ)inflate.$(OBJ) $(ZOBJ)inftrees.$(OBJ) $(ZOBJ)infutil.$(OBJ)
++zlibd1_=$(ZOBJ)inffast.$(OBJ)
++zlibd2_=$(ZOBJ)inflate.$(OBJ) $(ZOBJ)inftrees.$(OBJ)
+ zlibd_ = $(zlibd1_) $(zlibd2_)
+ $(ZGEN)zlibd_0.dev : $(ZLIB_MAK) $(ECHOGS_XE) $(ZGEN)zlibc.dev $(zlibd_)
+ $(SETMOD) $(ZGEN)zlibd_0 $(zlibd1_)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ghostscript/ghostscript.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 ghostscript.spec
--- openpkg-src/ghostscript/ghostscript.spec 11 Oct 2003 18:15:46 -0000 1.44
+++ openpkg-src/ghostscript/ghostscript.spec 24 Nov 2003 10:51:45 -0000 1.45
@@ -30,7 +30,7 @@
%define V_font_other 6.0
%define V_jpeg 6b
%define V_png 1.2.5
-%define V_zlib 1.1.4
+%define V_zlib 1.2.1
# package information
Name: ghostscript
@@ -42,7 +42,7 @@
Group: Graphics
License: Aladdin
Version: %{V_real}
-Release: 20031011
+Release: 20031124
# package options
%option with_x11 yes
@@ -55,6 +55,7 @@
Source3: http://www.gzip.org/zlib/zlib-%{V_zlib}.tar.gz
Source4:
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/ghostscript-fonts-std-%{V_font_std}.tar.gz
Source5:
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/ghostscript-fonts-other-%{V_font_other}.tar.gz
+Patch0: ghostscript.patch
# build information
Prefix: %{l_prefix}
@@ -83,6 +84,9 @@
%setup3 -q -T -D -a 3
%setup4 -q -T -D -a 4
%setup5 -q -T -D -a 5
+ ( cd ghostscript-%{version}
+ %patch0 -p0
+ ) || exit $?
mv jpeg-%{V_jpeg} ghostscript-%{version}/jpeg
mv libpng-%{V_png} ghostscript-%{version}/libpng
mv zlib-%{V_zlib} ghostscript-%{version}/zlib
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7517 -r1.7518 news.txt
--- openpkg-web/news.txt 24 Nov 2003 10:50:30 -0000 1.7517
+++ openpkg-web/news.txt 24 Nov 2003 10:51:44 -0000 1.7518
@@ -1,3 +1,4 @@
+24-Nov-2003: Upgraded package: P<ghostscript-8.11-20031124>
24-Nov-2003: Upgraded package: P<zlib-1.2.1-20031124>
24-Nov-2003: Upgraded package: P<gcc34-3.4s20031119-20031124>
24-Nov-2003: Upgraded package: P<bogofilter-0.15.9-20031124>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
