[arch-commits] Commit in gimp/trunk (PKGBUILD uri-backend-libcurl.patch)

[Eric Bélanger]

    Date: Tuesday, July 5, 2011 @ 13:55:54
  Author: eric
Revision: 130354

upgpkg: gimp 2.6.11-6
Switched to curl for URI support (close FS#12321), Fixed license, Fixed compilation with python support (close FS#23817), Cleaned up depends and makedepends

Added:
  gimp/trunk/uri-backend-libcurl.patch
Modified:
  gimp/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   32 ++++++++++--------
 uri-backend-libcurl.patch |   77 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-05 17:37:45 UTC (rev 130353)
+++ PKGBUILD	2011-07-05 17:55:54 UTC (rev 130354)
@@ -3,40 +3,44 @@
 
 pkgname=gimp
 pkgver=2.6.11
-pkgrel=5
+pkgrel=6
 pkgdesc="GNU Image Manipulation Program"
 arch=('i686' 'x86_64')
 url="http://www.gimp.org/"
-license=('GPL')
-depends=('gtk2' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \
-         'libexif' 'pygtk' 'desktop-file-utils' 'gegl')
-makedepends=('gutenprint' 'intltool' 'libwebkit' 'gnome-python' 'poppler-glib' \
-             'pkg-config' 'alsa-lib' 'iso-codes')
+license=('GPL' 'LGPL')
+depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \
+         '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'
             'poppler-glib: for pdf support'
-            'alsa-lib: for MIDI event controller module')
+            'alsa-lib: for MIDI event controller module'
+            'curl: for URI support')
 options=('!libtool' '!makeflags')
 conflicts=('gimp-devel')
 install=gimp.install
-source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl)
+source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl 
+        uri-backend-libcurl.patch)
 md5sums=('bb2939fe13e54fc7255cef5d097bb5dd'
-         'bb27bc214261d36484093e857f015f38')
+         'bb27bc214261d36484093e857f015f38'
+         'e894f4b2ffa92c71448fdd350e9b78c6')
 sha1sums=('2f9d596e727bdbf304fa78257c1731d9faf3934c'
-          '110ce9798173b19a662d086ed7b882b4729f06cf')
+          '110ce9798173b19a662d086ed7b882b4729f06cf'
+          'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \
+  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 \
-    --without-aa --without-hal
+    --enable-python --with-gif-compression=lzw --with-libcurl \
+    --without-aa --without-hal --without-gvfs --without-gnomevfs
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install-strip
+  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"
 

Added: uri-backend-libcurl.patch
===================================================================
--- uri-backend-libcurl.patch	                        (rev 0)
+++ uri-backend-libcurl.patch	2011-07-05 17:55:54 UTC (rev 130354)
@@ -0,0 +1,77 @@
+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
+@@ -4,9 +4,9 @@
+  * libcurl backend for the URI plug-in
+  * Copyright (C) 2006 Mukund Sivaraman <muks at mukund.org>
+  *
+- * This program is free software; you can redistribute it and/or modify
++ * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
++ * the Free Software Foundation; either version 3 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+@@ -15,8 +15,7 @@
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #include "config.h"
+@@ -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;
+@@ -224,3 +222,10 @@
+ 
+   return FALSE;
+ }
++
++gchar *
++uri_backend_map_image (const gchar  *uri,
++                       GimpRunMode   run_mode)
++{
++  return NULL;
++}