[arch-commits] Commit in ghostscript/trunk (2 files)

[Andreas Radke]

    Date: Friday, January 8, 2016 @ 19:25:04
  Author: andyrtr
Revision: 257646

upgpkg: ghostscript 9.18-6

fix use of system freetype to solve wrong glyphs; FS#46744

Added:
  ghostscript/trunk/fix_check_for_using_shared_freetype_lib.diff
Modified:
  ghostscript/trunk/PKGBUILD

----------------------------------------------+
 PKGBUILD                                     |   14 +++++++----
 fix_check_for_using_shared_freetype_lib.diff |   30 +++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-08 18:12:03 UTC (rev 257645)
+++ PKGBUILD	2016-01-08 18:25:04 UTC (rev 257646)
@@ -5,7 +5,7 @@
 
 pkgname=ghostscript
 pkgver=9.18
-pkgrel=5
+pkgrel=6
 pkgdesc="An interpreter for the PostScript language"
 arch=('i686' 'x86_64')
 license=('AGPL' 'custom')
@@ -18,13 +18,15 @@
 source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2
         ghostscript-sys-zlib.patch
         bug_696246.diff
-        add_gserrors_h.diff)
+        add_gserrors_h.diff
+        fix_check_for_using_shared_freetype_lib.diff)
 #options=('!makeflags')
 # http://downloads.ghostscript.com/public/SHA1SUMS
 sha1sums=('388fea50a38e422a4c6ff27c184491bf5ecb96e1'
           'e054caf753df4d67221b29a2eac66130653f7556'
           'f259eaac3beb0ec346bb2d4d2455e4e3baddecd4'
-          'ca686fed1af36d1f9fa866b47ff129c71d6a19ff')
+          'ca686fed1af36d1f9fa866b47ff129c71d6a19ff'
+          '8258043b111832fe52989ccb00d6d87285fcad81')
 
 prepare() {
   cd ghostscript-${pkgver}
@@ -34,6 +36,9 @@
   patch -Np1 -i ${srcdir}/bug_696246.diff
   # add a missing header; FS#46928
   patch -Np1 -i ${srcdir}/add_gserrors_h.diff
+  # fix use system freetype - FS#46744
+  # http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=8f5d28536e4518716fdfe974e580194c8f57871d
+  patch -Np1 -i ${srcdir}/fix_check_for_using_shared_freetype_lib.diff
 }
 
 build() {
@@ -42,8 +47,7 @@
   # force it to use system-libs
   # keep heavily patched included openjpeg, leads to segfault with system openjpeg
   # https://bugs.archlinux.org/task/38226
-  #freetype # use internal one - FS#46744
-  rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 cups/libs # jbig2dec is in community
+  rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community
 
   autoconf --force
 

Added: fix_check_for_using_shared_freetype_lib.diff
===================================================================
--- fix_check_for_using_shared_freetype_lib.diff	                        (rev 0)
+++ fix_check_for_using_shared_freetype_lib.diff	2016-01-08 18:25:04 UTC (rev 257646)
@@ -0,0 +1,30 @@
+From 8f5d28536e4518716fdfe974e580194c8f57871d Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell at artifex.com>
+Date: Thu, 7 Jan 2016 09:03:10 +0000
+Subject: [PATCH] Bug 696281: fix check for using shared freetype lib
+
+When I changed the initial value of the Freetype source path variable (to reduce
+the risk of header search path problems), I neglected to fix the logic for
+falling back to the system's libfreetype2.
+
+Credit to Rodrigo Rivas Costa for spotting the problem.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0c97fcc..f533e46 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -811,7 +811,7 @@ if test x"$enable_fapi" != xno; then
+       fi
+     done
+ 
+-    if test -z $FTSRCDIR; then
++    if test x"$FTSRCDIR" = x"src"; then
+       AC_MSG_RESULT([no])
+       if test "x$PKGCONFIG" != x; then
+         AC_MSG_CHECKING(for system freetype2 >= 2.4.2 with pkg-config)
+-- 
+2.6.3
+