Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/beye/PKGBUILD
	community/xmlrpc-c/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/libvpx/PKGBUILD
	extra/libxfce4menu/PKGBUILD
	extra/libxml2/PKGBUILD
	extra/pixman/PKGBUILD
	extra/thunar-archive-plugin/PKGBUILD
	extra/thunar-volman/PKGBUILD
	extra/vdpau-video/PKGBUILD
	extra/xfce4-appfinder/PKGBUILD
	extra/xfce4-battery-plugin/PKGBUILD
	extra/xfce4-cpufreq-plugin/PKGBUILD
	extra/xfce4-cpugraph-plugin/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	extra/xfce4-diskperf-plugin/PKGBUILD
	extra/xfce4-eyes-plugin/PKGBUILD
	extra/xfce4-fsguard-plugin/PKGBUILD
	extra/xfce4-mixer/PKGBUILD
	extra/xfce4-mount-plugin/PKGBUILD
	extra/xfce4-mpc-plugin/PKGBUILD
	extra/xfce4-power-manager/PKGBUILD
	extra/xfce4-systemload-plugin/PKGBUILD
	extra/xfce4-taskmanager/PKGBUILD
	extra/xfce4-time-out-plugin/PKGBUILD
	extra/xfce4-timer-plugin/PKGBUILD
	extra/xfce4-wavelan-plugin/PKGBUILD
	extra/xorg-luit/PKGBUILD
	extra/xorg-xfontsel/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/mplayer-vaapi-libre/PKGBUILD
	testing/systemd/PKGBUILD

3 files changed, 27 insertions, 10 deletions

diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index 81796c041..049eed1df 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 123066 2011-05-07 23:01:49Z stephane $
+# $Id: PKGBUILD 146976 2012-01-19 20:56:52Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer (Parabola): xihh
 
 pkgname=ghostscript-libre
 pkgver=9.04
-pkgrel=5
+_srcpkgrel=5
+pkgrel=6
 pkgdesc="An interpreter for the PostScript language without non-free files"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3') #non free files removed
-depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 'libtiff' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
 makedepends=('gtk2' 'gnutls')
 optdepends=('texlive-core:      needed for dvipdf'
             'gtk2:              needed for gsx')
@@ -16,9 +17,13 @@ conflicts=('ghostscript')
 replaces=('ghostscript-lrpng' 'ghostscript')
 provides=('ghostscript-lprng' "ghostscript=$pkgver")
 url="http://www.ghostscript.com/"
-source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz
-	ghostscript-cups-rgbw.patch)
+source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${_srcpkgrel}-any.src.tar.xz
+	ghostscript-cups-rgbw.patch
+	ghostscript-gpl-9.04-freetype-underlinking.patch)
 options=('!libtool' '!makeflags')
+md5sums=('ac8f77c94a6b5d5f0170c2e6db38c6bb'
+         'bc56eb8c5fef0ecf964f6b3e9b7e65ae'
+         'a1928c3e4459dcfee0aaa4b38fadba57')
 
 build() {
   cd ${srcdir}/ghostscript-${pkgver}
@@ -26,8 +31,11 @@ build() {
   # fix broken color printing https://bugs.archlinux.org/task/25519
   patch -Np1 -i ${srcdir}/ghostscript-cups-rgbw.patch
 
+  # fix a linking issue
+  patch -Np1 -i ${srcdir}/ghostscript-gpl-9.04-freetype-underlinking.patch
+
   # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat tiff freetype lcms
+  rm -rf jpeg libpng zlib jasper expat tiff lcms freetype 
 
   ./configure --prefix=/usr \
 	--enable-dynamic \
@@ -43,7 +51,7 @@ build() {
 	--without-luratech \
 	--disable-compile-inits #--help # needed for linking with system-zlib
   make
-  
+
   # Build IJS
   cd ${srcdir}/ghostscript-${pkgver}/ijs
   ./autogen.sh
@@ -70,5 +78,3 @@ package() {
   cd ${srcdir}/ghostscript-${pkgver}/ijs
   make DESTDIR=${pkgdir} install
 }
-md5sums=('ac8f77c94a6b5d5f0170c2e6db38c6bb'
-         'fd89baafac6589dc93ba71a48c2ba9b4')
diff --git a/libre/ghostscript-libre/ghostscript-cups-rgbw.patch b/libre/ghostscript-libre/ghostscript-cups-rgbw.patch
index 00f99c844..f6ae2dae7 100644
--- a/libre/ghostscript-libre/ghostscript-cups-rgbw.patch
+++ b/libre/ghostscript-libre/ghostscript-cups-rgbw.patch
@@ -261,4 +261,3 @@ diff -up ghostscript-9.04/cups/gdevcups.c.cups-rgbw ghostscript-9.04/cups/gdevcu
    }
  }
  
-
diff --git a/libre/ghostscript-libre/ghostscript-gpl-9.04-freetype-underlinking.patch b/libre/ghostscript-libre/ghostscript-gpl-9.04-freetype-underlinking.patch
new file mode 100644
index 000000000..1a81863be
--- /dev/null
+++ b/libre/ghostscript-libre/ghostscript-gpl-9.04-freetype-underlinking.patch
@@ -0,0 +1,12 @@
+diff -Naur ghostscript-9.04/base/Makefile.in ghostscript-9.04.new/base/Makefile.in
+--- ghostscript-9.04/base/Makefile.in	2011-08-05 13:12:20.000000000 +0200
++++ ghostscript-9.04.new/base/Makefile.in	2011-08-16 16:06:50.487377337 +0200
+@@ -375,7 +375,7 @@
+ # Solaris may need -lnsl -lsocket -lposix4.
+ # (Libraries required by individual drivers are handled automatically.)
+ 
+-EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@
++EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@
+ 
+ # Define the standard libraries to search at the end of linking.
+ # Most platforms require -lpthread for the POSIX threads library;