Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/perl-package-stash-xs/PKGBUILD
	extra/mesa/PKGBUILD

2 files changed, 25 insertions, 26 deletions

diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 31f133add..2d71171e1 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177003 2013-02-03 18:51:00Z eric $
+# $Id: PKGBUILD 180320 2013-03-20 04:16:52Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.2.3
+pkgver=6.8.3.10
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
@@ -13,15 +13,15 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
 #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
 source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('93c8ee2bf982c7c148c4872cd16f85f1073ec869'
-          '23405f80904b1de94ebd7bd6fe2a332471b8c283')
+sha1sums=('2a80effb525ea87e6eef96d30def680175ff3222'
+          'e143cf9d530fabf3b58023899b5cc544ba93daec')
 
 build() {
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
 
   sed '/AC_PATH_XTRA/d' -i configure.ac
   autoreconf --force --install
-  patch -p0 -i ../perlmagick.rpath.patch
+  patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
     --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
@@ -47,29 +47,27 @@ package_imagemagick() {
               'libxml2: for XML support' 
               'jasper: for JPEG-2000 support' 
               'libpng: for PNG support')
-  backup=('etc/ImageMagick/coder.xml'
-          'etc/ImageMagick/colors.xml'
-          'etc/ImageMagick/delegates.xml'
-          'etc/ImageMagick/log.xml'
-          'etc/ImageMagick/magic.xml'
-          'etc/ImageMagick/mime.xml'
-          'etc/ImageMagick/policy.xml'
-          'etc/ImageMagick/quantization-table.xml'
-          'etc/ImageMagick/thresholds.xml'
-          'etc/ImageMagick/type.xml'
-          'etc/ImageMagick/type-dejavu.xml'
-          'etc/ImageMagick/type-ghostscript.xml'
-          'etc/ImageMagick/type-windows.xml')
+  backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
+          "etc/ImageMagick-${pkgver%%.*}/colors.xml"
+          "etc/ImageMagick-${pkgver%%.*}/delegates.xml"
+          "etc/ImageMagick-${pkgver%%.*}/log.xml"
+          "etc/ImageMagick-${pkgver%%.*}/magic.xml"
+          "etc/ImageMagick-${pkgver%%.*}/mime.xml"
+          "etc/ImageMagick-${pkgver%%.*}/policy.xml"
+          "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml"
+          "etc/ImageMagick-${pkgver%%.*}/thresholds.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-windows.xml")
   options=('!docs' 'libtool' '!emptydirs')
 
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
   make DESTDIR="${pkgdir}" install
-  chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" 
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
   install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
 
 #Cleaning
-  find "${pkgdir}" -name '*.bs' -delete
   rm -f "${pkgdir}"/usr/lib/*.la
 }
 
diff --git a/extra/imagemagick/perlmagick.rpath.patch b/extra/imagemagick/perlmagick.rpath.patch
index 958c0f2ee..a5b1a82e2 100644
--- a/extra/imagemagick/perlmagick.rpath.patch
+++ b/extra/imagemagick/perlmagick.rpath.patch
@@ -1,10 +1,11 @@
---- Makefile.in.orig	2009-05-26 16:22:11.000000000 -0300
-+++ Makefile.in	2009-05-26 16:23:27.000000000 -0300
-@@ -10067,6 +10067,7 @@
+--- Makefile.in.orig	2013-02-21 03:26:56.785156600 -0500
++++ Makefile.in	2013-02-21 03:39:03.102411457 -0500
+@@ -10469,6 +10469,8 @@
  
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
  @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
 +@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile
  
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \