Date: Monday, May 14, 2018 @ 07:27:15 Author: eworm Revision: 324251 upgpkg: gimp 2.10.0-6
* drop unused patch * do not install to /usr/libexec (FS#58569) Modified: gimp/trunk/PKGBUILD Deleted: gimp/trunk/uri-backend-libcurl.patch ---------------------------+ PKGBUILD | 9 ++--- uri-backend-libcurl.patch | 77 -------------------------------------------- 2 files changed, 4 insertions(+), 82 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-14 06:56:09 UTC (rev 324250) +++ PKGBUILD 2018-05-14 07:27:15 UTC (rev 324251) @@ -3,7 +3,7 @@ pkgname=gimp pkgver=2.10.0 -pkgrel=5 +pkgrel=6 pkgdesc='GNU Image Manipulation Program' url='https://www.gimp.org/' arch=('x86_64') @@ -19,12 +19,10 @@ 'ghostscript: for postscript support') source=(https://download.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 0001-do-not-hardcode-gegl-version.patch - linux.gpl - uri-backend-libcurl.patch) + linux.gpl) sha256sums=('7fcc96fb88cb0a0595d2610f63a15dec245bb37bf9db527d37a24fb75e547de2' '99e8c8957dd0d3f6b090cc4dc22deebdd4f9ed299df1f79e2ece41c96f18f8cd' - '1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3' - '0708a971455fba6406bfa190652797c6620c789a9d21012c57249d2d4878bd55') + '1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3') prepare() { cd ${pkgname}-${pkgver} @@ -39,6 +37,7 @@ PYTHON=/usr/bin/python2 ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --libexecdir=/usr/bin \ --enable-mp \ --enable-gimp-console \ --enable-gimp-remote \ Deleted: uri-backend-libcurl.patch =================================================================== --- uri-backend-libcurl.patch 2018-05-14 06:56:09 UTC (rev 324250) +++ uri-backend-libcurl.patch 2018-05-14 07:27:15 UTC (rev 324251) @@ -1,77 +0,0 @@ -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 <[email protected]> - * -- * 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; -+}
