diff --git a/.cvsignore b/.cvsignore index 93c3770..c7323aa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,16 +1,13 @@ -CIDFnmap-cjk-20030115.tar.gz acro5-cmaps-2001.tar.gz adobe-cmaps-200202.tar.gz eplaseren-1.0.2-550.tgz epson740.tgz gdevmd2k-0.2a.tar.gz -ghostscript-7.05.tar.bz2 -gnu-drivers.tar.gz +ghostscript-7.07.tar.bz2 gs550j1.tar.gz gs6.51-cjk-M2-R3.tar.gz gs704-j-vlib.zip -hpijs-1.3.tar.gz -jpegsrc.v6b.tar.gz +hpijs-1.4.tar.gz lexmarkgs990908.tar.gz lxm3200-0.4.1-gs5.50-src.tar.gz pcl3-3.3.tar.gz diff --git a/CIDFnmap b/CIDFnmap new file mode 100644 index 0000000..efb9a13 --- /dev/null +++ b/CIDFnmap @@ -0,0 +1,161 @@ +%! +% Copyright (C) 2001 Masatake YAMATO, Taiji Yamada and gs-cjk project +% +% This file is part of GNU Ghostscript. +% +% GNU Ghostscript is distributed in the hope that it will be useful, but +% WITHOUT ANY WARRANTY. No author or distributor accepts responsibility +% to anyone for the consequences of using it or for whether it serves any +% particular purpose or works at all, unless he says so in writing. Refer +% to the GNU General Public License for full details. +% +% Everyone is granted permission to copy, modify and redistribute GNU +% Ghostscript, but only under the conditions described in the GNU General +% Public License. A copy of this license is supposed to have been given +% to you along with GNU Ghostscript so you can know your rights and +% responsibilities. It should be in a file named COPYING. Among other +% things, the copyright notice and this notice must be preserved on all +% copies. + +% $Id: CIDFnmap,v 1.1 2004/09/09 05:18:04 cvsdist Exp $ +% CIDFnmap - sample CID-keyed font catalog for Ghostscript. + +% ---------------------------------------------------------------- + +% This file is a catalog of CID-keyed fonts, TrueType fonts (TTF), and also +% TrueType Collection fonts (TTC) known to Ghostscript. +% +% There are two ways to make a CID-keyed font loaded automatically when named: +% C1. Put the CID-keyed font as a resource file to /Resource/CIDFont(*1). +% (*1) A path concatenated with GenericResourceDir defined in +% gs_res.ps and "CIDFont". The default value of GenericResourceDir +% is "/Resource/". +% C2. Put the CID-keyed font file to Ghostscript's font path(*2) +% and write an entry for the CID-keyed font to this catalog. +% (*2) Somewhere in Ghostscript font search path, which is generally +% /usr/local/share/ghostscript/fonts. See output of `gs -h` or Use.htm, +% Ghostscript's document. +% +% There are two ways to make a TrueType font loaded automatically when named: +% T1. Write a wrapper script file for the TrueType font and put the +% wrapper file to /Resource/CIDFont. The wrapper has to translate a +% TrueType font file to Type 2 CID-keyed on demand. Some examples of the +% wrapper file named "CIDFontName" as follows: +% +% (e1) TTF translated to Type 2 CID-keyed font +% %!PS-Adobe-3.0 Resource-CIDFont +% %%BeginResource: CIDFont (CIDFontName) +% /CIDFontName (filename.ttf) .openttcidfont +% dup length dict begin {def} forall currentdict end +% /CIDFont defineresource pop +% %%EndResource +% %%EOF +% +% (e2) TTC with an index translated to Type 2 CID-keyed font +% %!PS-Adobe-3.0 Resource-CIDFont +% %%BeginResource: CIDFont (CIDFontName) +% /CIDFontName (filename.ttc) 2 .openttcidfont +% dup length dict begin {def} forall currentdict end +% /CIDFont defineresource pop +% %%EndResource +% %%EOF +% +% (e3) TTC with an index and a name of RO(Registry-Ordering)-Code +% %!PS-Adobe-3.0 Resource-CIDFont +% %%BeginResource: CIDFont (CIDFontName) +% /CIDFontName (filename.ttc) 2 /Adobe-GB1-Unicode .openttcidfont +% dup length dict begin {def} forall currentdict end +% /CIDFont defineresource pop +% %%EndResource +% %%EOF +% +% for details about the names of RO-Code written in (e3), see below. +% +% T2. Put the CID-keyed font file to Ghostscript's font path(*2) +% and write an entry for the TrueType font to this catalog. + +% The Syntax of CIDFnmap is very similar to Fontmap. +% Each CID-keyed font has an entry consisting of three items: +% +% i1. The name by which the CID-keyed font is known inside Ghostscript +% (a Ghostscript name preceded by a `/', or a string enclosed +% in parentheses). This is used to find the file from which +% a font of a given name should be loaded. +% +% i2. Information depending on whether this is a real CID-keyed font or a +% CID-keyed font alias: +% +% - For real CID-keyed fonts, the name of the CID-keyed font +% file (a Ghostscript string, enclosed in parentheses). +% The filename should include the extension if the CID-keyed font +% name has. +% +% - For CID-keyed font aliases, the name of the CID font +% which should be used when this one is requested, +% preceded by a `/'. Note that an alias name cannot be enclosed +% in parentheses. +% +% i3. At least one space or tab, and a terminating semicolon. +% +% Each CID-keyed font has an entry consisting of three essential items and +% two optional items. The three essential items are the same to the items of +% CID-keyed Font. Two optional items are put between i2 and i3. +% Two optional items are: +% +% i4. the number that specifies TTC font index +% +% i5. the name of CIDs mapping to Codes +% ``The kind of CIDs mapping to Codes'' is listed as follows: +% +% +% /Adobe-CNS1-Big5 Traditional Chinese, for Big5 TrueType fonts +% /Adobe-CNS1-Unicode Traditional Chinese, for Unicode TrueType fonts +% /Adobe-CNS1 Traditional Chinese, for TrueType fonts (*3) +% /Adobe-GB1-PRC Simplified Chinese, for PRC TrueType fonts +% /Adobe-GB1-Unicode Simplified Chinese, for Unicode TrueType fonts +% /Adobe-GB1 Simplified Chinese, for TrueType fonts (*3) +% /Adobe-Japan1-ShiftJIS Japanese, for ShiftJIS TrueType fonts +% /Adobe-Japan1-Unicode Japanese, for Unicode TrueType fonts +% /Adobe-Japan1 Japanese, for TrueType fonts (*3) +% /Adobe-Japan2-Unicode JIS Supplement, for Unicode TrueType fonts +% /Adobe-Japan2 JIS Supplement, for TrueType fonts (*3) +% /Adobe-Korea1-Johab Korean, for Johab TrueType fonts +% /Adobe-Korea1-Unicode Korean, for Unicode TrueType fonts +% /Adobe-Korea1-Wansung Korean, for Wansung TrueType fonts +% /Adobe-Korea1 Korean, for TrueType fonts (*3) +% (*3) Code is automatically detected by cmap table of a TrueType file. +% If an optional item for the kind of mapping is omitted, then +% Code of TTF and RO(Registry-Ordering) of CIDFont are automatically +% detected by OS/2 table and cmap table of TTF, respectively. + +% Like Fontmap, .runlibfile is used in CIDFnmap to include other CIDFnmaps. + +% The following table is actually a Ghostscript data structure. +% If you add new entries, be sure to copy the punctuation accurately; +% in particular, you must leave at least one space or tab between each +% field in the entry. + +(CIDFnmap.ja) .runlibfileifexists +(CIDFnmap.ko) .runlibfileifexists +(CIDFnmap.zh_CN) .runlibfileifexists +(CIDFnmap.zh_TW) .runlibfileifexists +%(CIDFnmap.Ore) .runlibfile +%(CIDFnmap.ARP) .runlibfile +%(CIDFnmap.Bae) .runlibfile +%(CIDFnmap.Koc) .runlibfile +%(CIDFnmap.Sol) .runlibfile +%(CIDFnmap.Win) .runlibfile + +%(CIDFnmap.CJK) .runlibfile + +% native CIDFontName (BIG5) in traditional Chinese +%(CIDFnmap.b5) .runlibfile + +% native CIDFontName (GB2312) in simplified Chinese +%(CIDFnmap.gb) .runlibfile + +% native CIDFontName (Shift_JIS) in Japanese +%(CIDFnmap.sj) .runlibfile + +% native CIDFontName (euc-kr) in Korean +%(CIDFnmap.ksx) .runlibfile diff --git a/ghostscript.spec b/ghostscript.spec index 13ce2d6..a18bddd 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -1,21 +1,23 @@ -%define gs_ver 7.05 +%define gs_ver 7.07 Summary: A PostScript(TM) interpreter and renderer. Name: ghostscript Version: %{gs_ver} BuildRequires: gimp-print-devel BuildRequires: patchutils >= 0.2.13 -Release: 32.1 -%define hpijs 1.3 -%define hpijs_release %{release} +# Set this to '1' if you want to build libgs.so and gsx. +%define build_libgs 0 + +Release: 11 +%define hpijs 1.4 +%define hpijs_release_offset 0 +%define hpijs_release %(echo $((%{hpijs_release_offset} + %{release})) ) License: GPL URL: http://www.ghostscript.com/doc/gnu/ Group: Applications/Publishing Source0: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs705/%{name}-%{gs_ver}.tar.bz2 -%define jpeg_ver 6b -Source1: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{jpeg_ver}.tar.gz %define pcl3_ver 3.3 Source2: http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/pcl3-%{pcl3_ver}.tar.gz %define md2k_ver 0.2a @@ -45,10 +47,7 @@ Source15: ftp://ftp.u-aizu.ac.jp/pub/tex/ptex-win32/gs/%{vflib_ver}-j-vlib.zip Source16: ftp://ftp.gyve.org/pub/gs-cjk/acro5-cmaps-2001.tar.gz Source17: gdevgdi.c Source18: http://www.epkowa.on.arena.ne.jp/pips/data/2050/eplaseren-1.0.2-550.tgz -Source20: CIDFnmap-cjk-20030115.tar.gz - -# Some drivers mistakenly got left out of 7.05. -Source21: gnu-drivers.tar.gz +Source20: CIDFnmap # CUPS device (from ESP gs 7.05.4). Source23: gdevcups.c @@ -70,22 +69,22 @@ Patch19: ghostscript-6.51-ia64_jmp_buf.patch Patch21: Omni-7.05-121002.patch Patch24: ghostscript-7.05-scripts.patch Patch25: ghostscript-7.05-gsj-fixups.patch -Patch26: ghostscript-7.05-dx6.patch Patch27: ghostscript-7.05-fPIC.patch -Patch28: ghostscript-7.05-gb18030.patch Patch29: ghostscript-7.05-x11.patch Patch30: ghostscript-7.05-ps1.patch Patch31: ghostscript-7.05-oob-66421.patch -Patch32: ghostscript-7.05-zfile.patch - -# I dont think this patch is needed anymore, so it is not applied. -# but I might be wrong, and dont really understand it, so it is still -# included. -Crutcher -Patch11: gs5.50-rth.patch +Patch33: ghostscript-7.05-73342.patch +Patch34: ghostscript-7.05-split-CIDFnmap.patch +Patch35: ghostscript-7.07-ps2epsi.patch +Patch36: ghostscript-7.07-bigposttable.patch +Patch37: ghostscript-7.07-gsublookuptable.patch +Patch38: ghostscript-7.07-coverage-glyphcount.patch +Patch39: hpijs-compile.patch +Patch40: ghostscript-7.05-lips4v-fix-pipe.patch +Patch41: ghostscript-7.05-cups.patch Requires: VFlib2, zlib, libpng, glib Requires: urw-fonts >= 1.1, ghostscript-fonts -Requires: Omni >= 0.6.1 BuildRequires: zlib, zlib-devel, libpng, libpng-devel, unzip, gtk+-devel BuildRequires: VFlib2-devel, glib-devel, XFree86-devel # Omni requires libxml @@ -94,8 +93,14 @@ BuildRequires: cups-devel >= 1.1.13 BuildPreReq: freetype-devel BuildRoot: %{_tmppath}/%{name}-%{gs_ver}-root +# See bug #83516. +Conflicts: ttfonts-ja < 1.2-23 +Conflicts: ttfonts-ko < 1.0.11-27 +Conflicts: ttfonts-zh_CN < 2.12-2 +Conflicts: ttfonts-zh_TW < 2.11-20 + # We shipped this in Red Hat Linux 8.0. -Obsoletes: ghostscript-gtk +Obsoletes: ghostscript-gtk < %{version}-%{release} %description Ghostscript is a set of software that provides a PostScript(TM) @@ -120,13 +125,15 @@ Group: Development/Libraries %description devel The header files for developing applications that use ghostscript. -#%package gtk -#Summary: A GTK-enabled PostScript(TM) interpreter and renderer. -#Requires: %{name} = %{version} -#Group: Applications/Publishing -# -#%description gtk -#A GTK-enabled version of Ghostscript, called 'gsx'. +%if %{build_libgs} +%package gtk +Summary: A GTK-enabled PostScript(TM) interpreter and renderer. +Requires: %{name} = %{version} +Group: Applications/Publishing + +%description gtk +A GTK-enabled version of Ghostscript, called 'gsx'. +%endif %package -n hpijs Version: %{hpijs} @@ -142,11 +149,7 @@ Apollo 2100, Apollo 2560, DeskJet 800C, DeskJet 825, DeskJet 900, PhotoSmart, DeskJet 990C and PhotoSmart 100 series. %prep -%setup -q -a 10 -a 21 - -# Set up the jpeg library - tar xzf %{SOURCE1} - ln -s jpeg-%{jpeg_ver} jpeg +%setup -q -a 10 # Apply the gs-cjk patches tar xzf %{SOURCE9} @@ -175,7 +178,7 @@ PhotoSmart, DeskJet 990C and PhotoSmart 100 series. tar xzf gs%{cjk_ver}/install-cid.tar.gz -C Resource # Replace CJK CIDFnmap files - tar xzf %{SOURCE20} -C lib + cp -f %{SOURCE20} lib/ # Add the VFlib/jpdf patch @@ -213,7 +216,7 @@ PhotoSmart, DeskJet 990C and PhotoSmart 100 series. GS_DEVS=$GS_DEVS'$(DD)bmpamono.dev $(DD)bmpasep1.dev $(DD)bmpasep8.dev ' GS_DEVS=$GS_DEVS'$(DD)ccr.dev $(DD)cdj1600.dev $(DD)cdj500.dev ' GS_DEVS=$GS_DEVS'$(DD)cdj670.dev $(DD)cdj850.dev ' - GS_DEVS=$GS_DEVS'$(DD)cdj890.dev $(DD)cdj970.dev $(DD)cfax.dev ' + GS_DEVS=$GS_DEVS'$(DD)cdj890.dev $(DD)cfax.dev ' GS_DEVS=$GS_DEVS'$(DD)cgm24.dev $(DD)cgm8.dev $(DD)cgmmono.dev ' GS_DEVS=$GS_DEVS'$(DD)cljet5pr.dev $(DD)coslw2p.dev $(DD)coslwxl.dev ' GS_DEVS=$GS_DEVS'$(DD)cp50.dev $(DD)declj250.dev $(DD)dfaxlow.dev ' @@ -456,21 +459,42 @@ $(GLOBJ)gdevcups.$(OBJ): $(GLSRC)gdevcups.c $(PDEVH) # Fix-up gdevdmpr.c %patch25 -p1 -b .gsj-fixups -# Fix gtk+ initial window size -%patch26 -p0 -b .dx6 - # Fix compilation with newer binutils %patch27 -p1 -b .fPIC -# Add CIDnmap for GB18030 font (bug #71135) -%patch28 -p1 -b .gb18030 - # Fix XLIBDIR %patch29 -p1 -b .x11 # Fix level 1 PostScript output (bug #78450). %patch30 -p1 -b .ps1 +%patch31 -p1 -b .oob + +# Add some missing font aliases (bug #73342). +%patch33 -p1 -b .73342 + +# CIDFnmap files are split out to ttfonts-* packages (bug #83516). +%patch34 -p1 -b .split-CIDFnmap + +# Fix sed usage in ps2epsi (bug #89300). +%patch35 -p1 -b .ps2epsi + +# Fix bug #100557. +%patch36 -p1 -b .bigposttable + +# Fix bug #100685. +%patch37 -p1 -b .gsublookuptable +%patch38 -p1 -b .coverage-glyphcount + +pushd hpijs-%{hpijs} +%patch39 -p1 -b .compile +popd + +%patch40 -p1 -b .lips4v-fix-pipe + +# Apply patch from CUPS for media attrs +%patch41 -p1 -b .cups + # Set up for a unix os, gcc compiler build, and replace our insertion string sed -e "s/_XXX_RPM_GS_DEVICES_XXX_/$GS_DEVS/;" src/unix-gcc.mak > Makefile @@ -488,24 +512,23 @@ IJSDEVS='\$(DD)ijs.dev' IJSEXECTYPE=unix EOF -%patch31 -p1 -b .oob - -%patch32 -p1 -b .zfile - %build # Build IJS cd ijs +autoconf # The shipped configure script is broken and needs remaking. %configure make cd .. make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} -# Don't build the shared object at the moment: it's big and nothing uses it. -#make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} + +%if %{build_libgs} +make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} +%endif # Build the HP IJS server cd hpijs-%{hpijs} -%configure +%configure --disable-cups-install --disable-foomatic-install make cd .. @@ -522,6 +545,17 @@ make install \ bindir=$RPM_BUILD_ROOT%{_bindir} \ libdir=$RPM_BUILD_ROOT%{_libdir} \ docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_ver} + +%if %{build_libgs} +make soinstall \ + prefix=$RPM_BUILD_ROOT%{_prefix} \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ + datadir=$RPM_BUILD_ROOT%{_datadir} \ + bindir=$RPM_BUILD_ROOT%{_bindir} \ + libdir=$RPM_BUILD_ROOT%{_libdir} \ + docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_ver} +%endif + cd hpijs-%{hpijs} make install DESTDIR=$RPM_BUILD_ROOT cd .. @@ -556,6 +590,9 @@ MAIN_PWD=`pwd` find .%{_bindir}/ | sed -e 's/\.//;' | \ grep -v '/$\|/hpijs$\|/gsx$\|/ijs-config$' \ >> $MAIN_PWD/rpm.sharelist) +%if %{build_libgs} +echo /usr/bin/gsx >> $MAIN_PWD/rpm.sharelist +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -572,13 +609,17 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ghostscript/%{gs_ver}/examples %{_mandir}/*/* %doc %{_docdir}/%{name}-%{gs_ver} -#%{_libdir}/libgs.so.* -#%{_libdir}/libgs.so +%if %{build_libgs} +%{_libdir}/libgs.so.* +%{_libdir}/libgs.so +%endif %{_libdir}/libijs.so* -#%files gtk -#%defattr(-,root,root) -#%{_bindir}/gsx +%if %{build_libgs} +%files gtk +%defattr(-,root,root) +%{_bindir}/gsx +%endif %files -n hpijs %defattr(-,root,root) @@ -595,8 +636,67 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libijs.a %changelog -* Sun May 18 2003 Tim Waugh 7.05-32.1 -- Added zfile.c security fixes from 7.07. +* Tue Sep 30 2003 Tim Waugh 7.07-11 +- Updated gdevcups.c from CUPS 1.1.19. +- Apply NOMEDIAATTRS patch from CUPS 1.1.19 (bug #105401). + +* Thu Aug 28 2003 Tim Waugh +- Fix lips4v driver (bug #92337). + +* Wed Aug 20 2003 Tim Waugh 7.07-10 +- Fix compilation problems in hpijs. + +* Mon Aug 4 2003 Tim Waugh 7.07-9 +- Further fix from bug #100685. + +* Thu Jul 31 2003 Tim Waugh 7.07-8 +- Further fix from bug #100685. + +* Tue Jul 29 2003 Tim Waugh 7.07-7 +- Further fix from bug #100685. + +* Fri Jul 25 2003 Tim Waugh 7.07-6 +- Further fix from bug #100557. + +* Thu Jul 24 2003 Tim Waugh 7.07-5 +- Further fix from bug #100557. +- Fix bug #100685. + +* Wed Jul 23 2003 Tim Waugh 7.07-4 +- Fix bug #100557. + +* Wed Jun 04 2003 Elliot Lee 7.07-3 +- rebuilt + +* Tue May 27 2003 Tim Waugh +- Fix sed usage in ps2epsi (bug #89300). + +* Tue May 20 2003 Tim Waugh 7.07-2 +- HPIJS 1.4 (bug #91219). + +* Sun May 18 2003 Tim Waugh 7.07-1 +- 7.07. +- Parametrize build_libgs. +- Remove Omni requirement (bug #88177). +- Fix ghostscript-gtk obsoletes: line (bug #88175). + +* Thu Apr 3 2003 Tim Waugh 7.06-1 +- 7.06. +- Updated config, vflib.fixup patches. +- No longer need dx6, jpeg patches. +- No longer need to add in missed GNU drivers. +- Turn off dj970 driver (hpijs drives that). + +* Mon Mar 31 2003 Tim Waugh 7.05-34 +- Apply fix for CJK font search method when the fonts are not available + (bug #83516). +- The gb18030 patch no longer applies here. + +* Thu Mar 27 2003 Tim Waugh 7.05-33 +- Add some missing font aliases (bug #73342). +- Use the system jpeg library. +- Update hpijs to 1.3.1. +- Update gdevcups.c from cups-1.1.18. * Mon Feb 24 2003 Elliot Lee 7.05-32 - debuginfo rebuild diff --git a/sources b/sources index c7d1710..18dfa95 100644 --- a/sources +++ b/sources @@ -1,16 +1,13 @@ -75fbe1a1c474d67fbc71cc4b1dbfb833 CIDFnmap-cjk-20030115.tar.gz 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz e8fbffadb8d70ce5f92708a699ae7765 adobe-cmaps-200202.tar.gz 911c7865a83a69135417989dee53f8fc eplaseren-1.0.2-550.tgz 2c6ebfe51cab34ee61e3dd524c8640cc epson740.tgz 5ed2b4218b8f77cb411f3d2e4509ed24 gdevmd2k-0.2a.tar.gz -821caada7e265ea5b698a78e6b029734 ghostscript-7.05.tar.bz2 -9b25d4dd54d3297f33a8f7609fba70dd gnu-drivers.tar.gz +85fd16cdc8232e5e3679a3a7e30a3359 ghostscript-7.07.tar.bz2 d202cd105c496b7f0eb5221316fb7b7f gs550j1.tar.gz 6f8e90effe12527a4c3b36ea4ce47b3c gs6.51-cjk-M2-R3.tar.gz b32da7d61421384a0874037576033861 gs704-j-vlib.zip -9d0b79d0fae39f3efc5b8db60f51a8fa hpijs-1.3.tar.gz -dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz +430f9b20bfe31e0f7f343fe9595904f3 hpijs-1.4.tar.gz aea08da4e37ab68ed6f1dc451f24b30b lexmarkgs990908.tar.gz ec11b9ef72ecaabb61eeba27e93f9f2b lxm3200-0.4.1-gs5.50-src.tar.gz 34e664c2a98b847598f8441f8cac7ab6 pcl3-3.3.tar.gz