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

Conflicts:
	community/perl-file-path-expand/PKGBUILD
	community/perl-file-slurp/PKGBUILD
	community/perl-getopt-argvfile/PKGBUILD
	community/perl-graphics-colornames/PKGBUILD
	community/perl-html-tableextract/PKGBUILD
	community/perl-xml-regexp/PKGBUILD
	community/perlio-eol/PKGBUILD
	community/virtualbox/PKGBUILD
	community/xemacs/PKGBUILD
	core/gawk/PKGBUILD
	extra/bogofilter/PKGBUILD
	extra/feh/PKGBUILD
	extra/gnome-phone-manager/PKGBUILD
	extra/redland/PKGBUILD
	extra/ruby/PKGBUILD
	extra/samba/PKGBUILD
	extra/squirrelmail/PKGBUILD
	extra/subversion/PKGBUILD
	extra/vsftpd/PKGBUILD
	extra/xawtv/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	testing/mesa/PKGBUILD

4 files changed, 133 insertions, 0 deletions

diff --git a/testing/gimp-devel/PKGBUILD b/testing/gimp-devel/PKGBUILD
new file mode 100644
index 000000000..a7667f16d
--- /dev/null
+++ b/testing/gimp-devel/PKGBUILD
@@ -0,0 +1,58 @@
+# $Id: PKGBUILD 130357 2011-07-05 18:03:52Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=gimp-devel
+pkgver=2.7.2
+pkgrel=2
+pkgdesc="GNU Image Manipulation Program (Development Version)"
+arch=('i686' 'x86_64')
+url="http://www.gimp.org/"
+license=('GPL3' 'LGPL3')
+depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' \
+         'jasper' 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl')
+optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
+            'libwebkit: for the help browser or web-page plug-ins'
+            'poppler-glib: for pdf support'
+            'alsa-lib: for MIDI event controller module'
+            'curl: for URI support')
+options=('!libtool' '!makeflags')
+conflicts=('gimp')
+provides=("gimp=${pkgver}")
+install=gimp-devel.install
+source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl 
+        uri-backend-libcurl.patch)
+md5sums=('6996138ab70b0bfebfe9f563284e5f78'
+         'bb27bc214261d36484093e857f015f38'
+         'b3f8faa246e5794b0d63583059f54698')
+sha1sums=('4690420961d110f99448c32fe61aae7d4869a863'
+          '110ce9798173b19a662d086ed7b882b4729f06cf'
+          '8a87adc11ee13d5fce79ea4226f04e682a2af97d')
+
+build() {
+  cd "${srcdir}/gimp-${pkgver}"
+  patch -p1 < ../uri-backend-libcurl.patch
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+    --enable-mp --enable-gimp-console --enable-gimp-remote \
+    --enable-python --with-gif-compression=lzw --with-libcurl \
+    --without-aa --without-hal --without-gvfs
+  make
+}
+
+package() {
+  cd "${srcdir}/gimp-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
+  install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
+
+  ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
+  ln -sf gimp-remote-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-remote.1.gz"
+  ln -sf gimprc-${pkgver%.*}.5.gz "${pkgdir}/usr/share/man/man5/gimprc.5.gz"
+  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
+  ln -s gimp-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp.1.gz"
+
+  ln -s gimp-${pkgver%.*} "${pkgdir}/usr/bin/gimp"
+  ln -s gimp-console-${pkgver%.*} "${pkgdir}/usr/bin/gimp-console"
+  ln -s gimp-remote-${pkgver%.*} "${pkgdir}/usr/bin/gimp-remote"
+  ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
+}
diff --git a/testing/gimp-devel/gimp-devel.install b/testing/gimp-devel/gimp-devel.install
new file mode 100644
index 000000000..c317fbaca
--- /dev/null
+++ b/testing/gimp-devel/gimp-devel.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/testing/gimp-devel/linux.gpl b/testing/gimp-devel/linux.gpl
new file mode 100644
index 000000000..0a73d8979
--- /dev/null
+++ b/testing/gimp-devel/linux.gpl
@@ -0,0 +1,19 @@
+GIMP Palette
+Name: linux
+#
+  0   0   0
+  0   0 170
+  0 170   0
+  0 170 170
+170   0   0
+170   0 170
+170  85   0
+170 170 170
+ 85  85  85
+ 85  85 255
+ 85 255  85
+ 85 255 255
+255  85  85
+255  85 255
+255 255  85
+255 255 255
diff --git a/testing/gimp-devel/uri-backend-libcurl.patch b/testing/gimp-devel/uri-backend-libcurl.patch
new file mode 100644
index 000000000..d3217a292
--- /dev/null
+++ b/testing/gimp-devel/uri-backend-libcurl.patch
@@ -0,0 +1,44 @@
+diff -aur gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c
+--- gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c	2010-07-03 00:51:59.000000000 +0200
++++ gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c	2011-06-23 19:15:30.000000000 +0200
+@@ -24,7 +23,6 @@
+ #include <errno.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <glib/gstdio.h>
+@@ -63,7 +61,7 @@
+ 
+   vinfo = curl_version_info (CURLVERSION_NOW);
+ 
+-  protocols = g_string_new ("http:,ftp:");
++  protocols = g_string_new ("http:,ftp:,gopher:");
+ 
+   if (vinfo->features & CURL_VERSION_SSL)
+     {
+@@ -153,7 +151,7 @@
+   FILE      *out_file;
+   CURL      *curl_handle;
+   CURLcode   result;
+-  gint       response_code;
++  glong      response_code;
+ 
+   gimp_progress_init (_("Connecting to server"));
+ 
+@@ -195,12 +193,12 @@
+ 
+   curl_easy_getinfo (curl_handle, CURLINFO_RESPONSE_CODE, &response_code);
+ 
+-  if (response_code != 200)
++  if (response_code != 200 && response_code != 226 && response_code != 0)
+     {
+       fclose (out_file);
+       g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                    _("Opening '%s' for reading resulted in HTTP "
+-                     "response code: %d"),
++                     "response code: %ld"),
+                    uri, response_code);
+       curl_easy_cleanup (curl_handle);
+       return FALSE;