- 8.63. No longer need r8591 or incomplete-ccittfax patches.

- Compile without strict aliasing opts due to warnings across several
    files.
- Don't run autogen.sh for main package, just for ijs which doesn't ship
    with a configure script.

.cvsignore

@@ -22,3 +22,4 @@ ghostscript-8.60-r8117.tar.bz2
 ghostscript-8.60.tar.bz2
 ghostscript-8.61.tar.bz2
 ghostscript-8.62.tar.bz2
+ghostscript-8.63.tar.bz2

ghostscript-incomplete-ccittfax.patch

@@ -1,12 +0,0 @@
-diff -up ghostscript-8.62/src/scfd.c.incomplete-ccittfax ghostscript-8.62/src/scfd.c
---- ghostscript-8.62/src/scfd.c.incomplete-ccittfax	2007-09-25 14:31:24.000000000 +0100
-+++ ghostscript-8.62/src/scfd.c	2008-06-23 14:58:17.000000000 +0100
-@@ -161,7 +161,7 @@ s_CFD_release(stream_state * st)
- /* makeup codes efficiently, since these are always a multiple of 64. */
- #define invert_data(rlen, black_byte, makeup_action, d)\
- 	if ( rlen > qbit )\
--	{	*q++ ^= (1 << qbit) - 1;\
-+	{	if (q >= ss->lbuf) *q++ ^= (1 << qbit) - 1; else q++;\
- 		rlen -= qbit;\
- 		switch ( rlen >> 3 )\
- 		{\

ghostscript-r8591.patch

@@ -1,26 +0,0 @@
-diff -up ghostscript-8.62/src/gdevbbox.c.r8591 ghostscript-8.62/src/gdevbbox.c
---- ghostscript-8.62/src/gdevbbox.c.r8591	2007-09-25 14:31:24.000000000 +0100
-+++ ghostscript-8.62/src/gdevbbox.c	2008-06-23 12:56:33.000000000 +0100
-@@ -755,7 +755,21 @@ bbox_fill_path(gx_device * dev, const gs
- 	 dev_proc(tdev, fill_path));
-     int code;
- 
--    if (!GX_DC_IS_TRANSPARENT(pdevc, bdev) && !gx_path_is_void(ppath)) {
-+    if (ppath == NULL) {
-+	/* A special handling of shfill with no path. */
-+	gs_fixed_rect ibox;
-+	gs_fixed_point adjust;
-+
-+	if (pcpath == NULL)
-+	    return 0;
-+	gx_cpath_inner_box(pcpath, &ibox);
-+	adjust = params->adjust;
-+	if (params->fill_zero_width)
-+	    gx_adjust_if_empty(&ibox, &adjust);
-+	adjust_box(&ibox, adjust);
-+	BBOX_ADD_RECT(bdev, ibox.p.x, ibox.p.y, ibox.q.x, ibox.q.y);
-+	return 0;
-+    } else if (!GX_DC_IS_TRANSPARENT(pdevc, bdev) && !gx_path_is_void(ppath)) {
- 	gs_fixed_rect ibox;
- 	gs_fixed_point adjust;
- 

ghostscript.spec

@@ -1,11 +1,11 @@
-%define gs_ver 8.62
+%define gs_ver 8.63
-%define gs_dot_ver 8.62
+%define gs_dot_ver 8.63
 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
 Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 4%{?dist}
+Release: 1%{?dist}
 
 License: GPLv2
 URL: http://www.ghostscript.com/
@@ -21,8 +21,6 @@ Patch4: ghostscript-fPIC.patch
 Patch5: ghostscript-runlibfileifexists.patch
 Patch6: ghostscript-system-jasper.patch
 Patch7: ghostscript-pksmraw.patch
-Patch8: ghostscript-r8591.patch
-Patch9: ghostscript-incomplete-ccittfax.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -95,15 +93,9 @@ rm -rf libpng zlib jpeg jasper
 
 %patch6 -p1 -b .system-jasper
 
-# Fix pksmraw output (bug #308211).
+# Fix pksmraw output (bug #308211).  Still needed in 8.63.
 %patch7 -p1 -b .pksmraw
 
-# Applied patch from upstream to fix box_fill_path for shfill (bug #452348).
-%patch8 -p1 -b .r8591
-
-# Applied patch to work around bug #229174.
-%patch9 -p1 -b .incomplete-ccittfax
-
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -111,14 +103,18 @@ from8859_1() {
 }
 for i in man/de/*.1; do from8859_1 "$i"; done
 
-if [ -x autogen.sh ]; then
-  ./autogen.sh
-  pushd ijs
-  ./autogen.sh
-  popd
-fi
-
 %build
+# Compile without strict aliasing opts due to these files:
+# gdevescv.c gdevl4v.c gdevopvp.c gdevbbox.c gdevdbit.c gdevddrw.c 
+# gdevp14.c gdevpdfd.c gdevpdfi.c gdevpdfo.c gdevpdft.c gdevpdfv.c 
+# gdevpdte.c gdevpdtt.c gdevps.c gdevpx.c gscoord.c gscparam.c gscrd.c 
+# gsdps1.c gsimage.c gspath1.c gsptype1.c gsptype2.c gstype2.c 
+# gstype42.c gxccache.c gxchar.c gxclimag.c gxclpath.c gxfcopy.c 
+# gximag3x.c gximage3.c gxipixel.c gxshade1.c gxstroke.c gxtype1.c 
+# ibnum.c iscanbin.c zchar1.c zchar.c zcharx.c zfapi.c zfont32.c 
+# zfunc0.c zfunc3.c zfunc4.c zpcolor.c zshade.c
+EXTRACFLAGS="-fno-strict-aliasing"
+
 FONTPATH=
 for path in \
 	%{_datadir}/fonts/default/%{name} \
@@ -133,24 +129,25 @@ do
   FONTPATH="$FONTPATH${FONTPATH:+:}$path"
 done
 %configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" \
-	--with-drivers=ALL --disable-compile-inits
+	--with-drivers=ALL --disable-compile-inits \
+	CFLAGS="$CFLAGS $EXTRACFLAGS"
 
 # Build IJS
 cd ijs
-automake --add-missing --copy || : # Ships with broken symlinks
+./autogen.sh
 %configure --enable-shared --enable-static
 make
 cd ..
 
 %if %{build_with_freetype}
 FT_CFLAGS=$(pkg-config --cflags freetype2)
-make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} \
+make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix} \
 	FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} \
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix} \
 	FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
 %else
-make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
+make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix}
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix}
 %endif
 
 %install
@@ -277,6 +274,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Mon Aug  4 2008 Tim Waugh <twaugh@redhat.com> 8.63-1
+- 8.63.  No longer need r8591 or incomplete-ccittfax patches.
+- Compile without strict aliasing opts due to warnings across several
+  files.
+- Don't run autogen.sh for main package, just for ijs which doesn't
+  ship with a configure script.
+
 * Mon Jun 23 2008 Tim Waugh <twaugh@redhat.com> 8.62-4
 - Applied patch to work around bug #229174.
 - Applied patch from upstream to fix box_fill_path for shfill (bug #452348).

sources

@@ -1,3 +1,3 @@
 2fbae60417d42779f6488ab897dcaaf6  acro5-cmaps-2001.tar.gz
 dfc93dd2aaaf2b86d2fd55f654c13261  adobe-cmaps-200406.tar.gz
-40d673a3c6e11d2bf14f972b84551104  ghostscript-8.62.tar.bz2
+c770eedfdd846a53e211e3ba5339de21  ghostscript-8.63.tar.bz2