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

Conflicts:
	community/darkhttpd/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gpicview/PKGBUILD
	community/iftop/PKGBUILD
	community/lazarus/PKGBUILD
	community/netsurf/PKGBUILD
	community/polkit-gnome/PKGBUILD
	community/texvc/PKGBUILD
	community/unbound/PKGBUILD
	community/xfmedia/PKGBUILD
	core/glibc/PKGBUILD
	extra/arora/PKGBUILD
	extra/cairo/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/libmng/PKGBUILD
	extra/mesa/PKGBUILD
	extra/nx/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/sqlite/PKGBUILD
	libre/midori-libre/PKGBUILD
	~fauno/distccd-zeroconf/PKGBUILD
	~fauno/kyotocabinet/PKGBUILD
	~fauno/kyototycoon/PKGBUILD

8 files changed, 159 insertions, 21 deletions

diff --git a/pcr/idjc/PKGBUILD b/pcr/idjc/PKGBUILD
index 0de01f4e3..6834d64a6 100644
--- a/pcr/idjc/PKGBUILD
+++ b/pcr/idjc/PKGBUILD
@@ -1,35 +1,41 @@
+# Maintainer: M0Rf30
 # Contributor: Tobias Luther <tobias [at] tonstrom [dot] de>
 # Contributor: GraveDigger
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=idjc
-pkgver=0.8.8
-pkgrel=1
+pkgver=0.8.9
+pkgrel=2
 pkgdesc='Powerful yet easy-to-use source-client for individuals interested in streaming live radio shows over the Internet'
 url='http://idjc.sourceforge.net/'
 license=('GPL2')
 arch=('i686' 'x86_64')
-#depends=('python2' 'jack' 'pygtk' 'lame' 'mutagen' 'flac' 'faad2' 'libsamplerate' 'vorbis-tools' 'libsndfile' 'ffmpeg' 'libmad' 'speex' 'dbus-python' 'imagemagick' 'twolame' 'libshout-idjc-git' 'mpg123')
-depends=('desktop-file-utils' 'python2' 'dbus-python' 'mutagen' 'jack' 'pygtk' 'vorbis-tools' 'libsndfile' 'libsamplerate' 'glib2' 'lame' 'libmad' 'ffmpeg' 'flac' 'speex' 'libshout-idjc')
+depends=('desktop-file-utils' 'python2' 'dbus-python' 'mutagen' 'jack' 'pygtk' 'vorbis-tools' 'libsndfile' 'libsamplerate' 'glib2' 'lame' 'libmad' 'ffmpeg-compat' 'flac' 'speex' 'libshout-idjc')
 optdepends=('patchage' 'qjackctl')
 makedepends=('pkgconfig')
 install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a14ce4cc8c789fce55c7b98081743a4a')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
 
-    ./configure --prefix=/usr PYTHON="/usr/bin/python2" --disable-libav
-
-    make PYTHON="/usr/bin/python2"
-
+    export PYTHON=/usr/bin/python2
+    PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib \
+        --disable-static 
+#	--disable-libav
+  
+    make
 }
 
 package() {
     cd "${srcdir}/${pkgname}-${pkgver}"
 
-    make DESTDIR="${pkgdir}" PYTHON="/usr/bin/python2" install
+    make DESTDIR="${pkgdir}" install
 
     sed -i 's|#! /usr/bin/python22.7|#! /usr/bin/python2|' ${pkgdir}/usr/bin/idjc
 }
+
+md5sums=('99abfe98f13170ab6b1ed17a8f1632e1')
diff --git a/pcr/imagemagick-srv/PKGBUILD b/pcr/imagemagick-srv/PKGBUILD
new file mode 100644
index 000000000..9dc9c4cb2
--- /dev/null
+++ b/pcr/imagemagick-srv/PKGBUILD
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgbase=imagemagick
+pkgname=imagemagick-srv
+pkgver=6.8.6.8
+pkgrel=1
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.imagemagick.org/"
+license=('custom')
+provides=("$pkgbase=$pkgver")
+conflicts=$pkgbase
+replaces=$pkgbase
+makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript-libre' \
+             'openexr-libre' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \
+             'libwebp') # libcl opencl-headers
+#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=('fe298492c6be08eb887d02b75efeb609fa6c4d61'
+          'e143cf9d530fabf3b58023899b5cc544ba93daec')
+
+prepare() {
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  sed '/AC_PATH_XTRA/d' -i configure.ac
+  autoreconf --force --install
+  patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
+}
+
+build() {
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
+    --disable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
+    --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
+    --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
+    --disable-opencl --without-gvc --without-djvu --without-autotrace \
+    --without-jbig --without-fpx --without-dps --without-fftw 
+  make
+}
+
+check() {
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  make check
+}
+
+package_imagemagick-srv() {
+  pkgdesc="An image viewing/manipulation program (for web servers)"
+  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr') # 'libcl')
+  optdepends=('ghostscript-libre: for Ghostscript support' 
+              'openexr-libre: for OpenEXR support' 
+              'libwmf: for WMF support' 
+              'librsvg: for SVG support' 
+              'libxml2: for XML support' 
+              'jasper: for JPEG-2000 support' 
+              'libpng: for PNG support' 
+	      'libwebp: for WEBP support')
+  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 ImageMagick-${pkgver%.*}-${pkgver##*.}
+  make -j1 DESTDIR="${pkgdir}" install
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
+  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
+
+#Cleaning
+  rm -f "${pkgdir}"/usr/lib/*.la
+}
diff --git a/pcr/imagemagick-srv/perlmagick.rpath.patch b/pcr/imagemagick-srv/perlmagick.rpath.patch
new file mode 100644
index 000000000..a5b1a82e2
--- /dev/null
+++ b/pcr/imagemagick-srv/perlmagick.rpath.patch
@@ -0,0 +1,11 @@
+--- 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 $(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: $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
diff --git a/pcr/quackle/PKGBUILD b/pcr/quackle/PKGBUILD
new file mode 100644
index 000000000..02f5ac568
--- /dev/null
+++ b/pcr/quackle/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Guillaume ALAUX <Guillaume at ALAUX dot net>
+pkgname=quackle
+pkgver=0.97
+pkgrel=2
+pkgdesc='Free crossword game (Scrabble-like) artificial intelligence and analysis tool'
+arch=('i686' 'x86_64')
+url='http://people.csail.mit.edu/jasonkb/quackle'
+license=('GPL')
+depends=('qt4')
+makedepends=('qt4')
+source=(http://people.csail.mit.edu/jasonkb/${pkgname}/downloads/${pkgname}-${pkgver}/${pkgname}-${pkgver}-source.tar.gz
+        quacker.sh)
+md5sums=('f744484e916f4cbbcffe6c13d772aee7'
+         '0c3cf80395db58959c8ae825b917a19f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  qmake-qt4
+  make clean
+  make
+
+  cd "${srcdir}/${pkgname}-${pkgver}/quackleio"
+  qmake-qt4
+  make clean
+  make
+
+  cd "${srcdir}/${pkgname}-${pkgver}/quacker"
+  qmake-qt4
+  make clean
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -dm755 ${pkgdir}/opt/${pkgname}
+  cp -r quacker/quacker data ${pkgdir}/opt/${pkgname}
+  install -Dm755 ${srcdir}/quacker.sh ${pkgdir}/usr/bin/quacker
+}
diff --git a/pcr/quackle/quacker.sh b/pcr/quackle/quacker.sh
new file mode 100755
index 000000000..702c262bf
--- /dev/null
+++ b/pcr/quackle/quacker.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /opt/quackle
+./quacker
diff --git a/pcr/tanglet/PKGBUILD b/pcr/tanglet/PKGBUILD
index 23e20cd6c..a8114ba62 100644
--- a/pcr/tanglet/PKGBUILD
+++ b/pcr/tanglet/PKGBUILD
@@ -1,23 +1,23 @@
-# Maintainer (Arch): Graeme Gott <graeme@gottcode.org>
-# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com>
+# Maintainer (AUR): Graeme Gott <graeme@gottcode.org>
+# Maintainer: Alon Ivtsan <alonivtsan@lavabit.com>
 # Based on https://aur.archlinux.org/packages.php?ID=32311
 
 pkgname=tanglet
-pkgver=1.2.1
-pkgrel=3
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="A single player word finding game based on Boggle."
 arch=('i686' 'x86_64')
 url="http://gottcode.org/${pkgname}/"
 license=('GPL3')
-depends=('qt4')
+depends=('qt5-base')
 install=${pkgname}.install
 source=(http://gottcode.org/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2)
-md5sums=('109ad08a03cc64808fa2caad6c3a4a7c')
-sha256sums=('94f4c5c76020ec1fe502ff076fbe5471e497d4b7bcabd1e9059e1022d1ce80c8')
+md5sums=('584e50d01323c0686ff094195eba4341')
+sha256sums=('c90d5c36b7e6cca54cdc001c7eecfb333795add16e6ae01f100026c61f4a84da')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  qmake-qt4 PREFIX=/usr
+  qmake-qt5 PREFIX=/usr
   make
 }
 
diff --git a/pcr/tanglet/tanglet.install b/pcr/tanglet/tanglet.install
index e70c054ec..81f2ba659 100644
--- a/pcr/tanglet/tanglet.install
+++ b/pcr/tanglet/tanglet.install
@@ -1,5 +1,5 @@
 post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index b6b7526e6..dfaba34cc 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.08.23
+pkgver=2013.08.30
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -14,7 +14,7 @@ license=('custom')
 depends=('python')
 makedepends=('python-distribute')
 source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('50c348f8dc28adff28d76420deff7297'
+md5sums=('f9e5574fe3b645892a7d814797b8a607'
           'SKIP')
 
 prepare() {