3 files changed, 17 insertions, 15 deletions
diff --git a/source/ap/ghostscript/ghostscript-pdf2dsc.patch b/source/ap/ghostscript/ghostscript-pdf2dsc.patch
deleted file mode 100644
index 31b6b5440..000000000
--- a/source/ap/ghostscript/ghostscript-pdf2dsc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ghostscript-8.71/lib/pdf2dsc.ps.pdf2dsc ghostscript-8.71/lib/pdf2dsc.ps
---- ghostscript-8.71/lib/pdf2dsc.ps.pdf2dsc	2010-02-20 15:50:51.287734970 +0000
-+++ ghostscript-8.71/lib/pdf2dsc.ps	2010-02-20 15:51:02.902609964 +0000
-@@ -116,7 +116,7 @@ systemdict /.setsafe known { .setsafe } 
-    DSCfile PDFname write==only
-    ( \(r\) file { DELAYSAFER { .setsafe } if } stopped pop\n) puts
-    ( pdfopen begin\n) puts
--   ( copy_trailer_attrs\n) puts
-+   ( process_trailer_attrs\n) puts
-    (%%EndSetup\n) puts
- 
-    /.hasPageLabels false def % see "Page Labels" in the PDF Reference
diff --git a/source/ap/ghostscript/ghostscript.SlackBuild b/source/ap/ghostscript/ghostscript.SlackBuild
index a17d34286..ff9fac9ef 100755
--- a/source/ap/ghostscript/ghostscript.SlackBuild
+++ b/source/ap/ghostscript/ghostscript.SlackBuild
@@ -22,7 +22,7 @@
 
 
 PKGNAM=ghostscript
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
@@ -57,10 +57,11 @@ fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION
 
-zcat $CWD/ghostscript-pdf2dsc.patch.gz | patch -p1 --verbose || exit 1
+# Bugfix:
+zcat $CWD/ghostscript.rev11948.diff.gz | patch -p1 --verbose || exit 1
 
 ## Regenerate ./configure:
 #sh autogen.sh
diff --git a/source/ap/ghostscript/ghostscript.rev11948.diff b/source/ap/ghostscript/ghostscript.rev11948.diff
new file mode 100644
index 000000000..cc45c1549
--- /dev/null
+++ b/source/ap/ghostscript/ghostscript.rev11948.diff
@@ -0,0 +1,13 @@
+--- ./base/gximag3x.c.orig	2010-08-10 11:20:19.000000000 -0500
++++ ./base/gximag3x.c	2010-12-28 13:24:54.000000000 -0600
+@@ -241,7 +241,9 @@
+ 	    const gs_image3x_mask_t *pixm =
+ 		(i == 0 ? &pim->Opacity : &pim->Shape);
+ 
+-	    *(gs_data_image_t *)&mask[i].image = pixm->MaskDict;
++            /* Use memcpy because direct assignment breaks ANSI aliasing */
++            /* rules and causes SEGV with gcc 4.5.1 */
++            memcpy(&mask[i].image, &pixm->MaskDict, sizeof(pixm->MaskDict));
+ 	    mask[i].image.type = type1;
+ 	    mask[i].image.BitsPerComponent = pixm->MaskDict.BitsPerComponent;
+ 	}