Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

gimp: Update to 2.8.12

Browse Source
This commit is contained in:
Alexpux
2014-08-30 20:15:56 +04:00
parent ce7f975456
commit b5bd7960b8
6 changed files with 7 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mingw-w64-gimp/PKGBUILD
View File

@@ -1,10 +1,9 @@
# Maintainer: Alexey Pavlov <Alexpux@gmail.com>
_realname=gimp
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2.8.10
pkgrel=7
pkgver=2.8.12
pkgrel=1
pkgdesc="GNU Image Manipulation Program (mingw-w64)"
arch=('any')
groups=("${MINGW_PACKAGE_PREFIX}")
@@ -37,31 +36,19 @@ makedepends=('intltool'
options=('strip' 'makeflags')
install=gimp-${CARCH}.install
source=(http://download.gimp.org/pub/gimp/v${pkgver%.*}/${_realname}-${pkgver}.tar.bz2{,.md5}
uri-backend-libcurl.patch
patch_CVE197.patch
patch_CVE1913.patch
freetype_location.patch
gegl-0.3-fix.patch
find-directx-fix.patch
python-m4.patch
mingw-add-ModuleFileName-dir-to-PATH.patch)
md5sums=('84c964aab7044489af69f7319bb59b47'
'c80070bf99005917b0d35263bfedc3f2'
'e894f4b2ffa92c71448fdd350e9b78c6'
'901643efc82fae57af466d8a0a8991ff'
'dcc2acc9f9962a7c83ffb4243c08c469'
'ca0f32cb329ddad8079f8e2c0fc75b29'
md5sums=('47fefa240c38cfb1016b57ad6324378d'
'0c35aa4b2964911cbc8a1c329cc324f8'
'd1e19159164cac7b39578a6b0bb02cbb'
'0df0c9c5f55012023894ed8b959c2fa9'
'34aba5cb94d368627bf17eb5aedee556'
'460f010cfb789608d2045a4a936f47b2'
'0d5c523e91fbfbab43c2f12447ccfebc')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
#patch -p1 -i ${srcdir}/uri-backend-libcurl.patch
patch -p1 -i ${srcdir}/patch_CVE1913.patch
patch -p1 -i ${srcdir}/patch_CVE197.patch
patch -p1 -i ${srcdir}/freetype_location.patch
patch -p1 -i ${srcdir}/gegl-0.3-fix.patch
patch -p1 -i ${srcdir}/find-directx-fix.patch
patch -p1 -i ${srcdir}/python-m4.patch
@@ -80,9 +67,6 @@ prepare() {
build() {
cd "${srcdir}/${_realname}-${pkgver}"
CPPFLAGS+=" -I${MINGW_PREFIX}/include/noX"
CFLAGS+=" -D__USE_MINGW_ANSI_STDIO=1 -I${MINGW_PREFIX}/include/noX"
CXXFLAGS+=" -D__USE_MINGW_ANSI_STDIO=1 -I${MINGW_PREFIX}/include/noX"
PYTHON=${MINGW_PREFIX}/bin/python2 \
./configure --prefix=${MINGW_PREFIX} \
--build=${MINGW_CHOST} \

25
mingw-w64-gimp/freetype_location.patch
View File

@@ -1,25 +0,0 @@
From 6c73f28b6d87a2afd11974552a075bffec52347f Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Fri, 29 Nov 2013 20:57:46 +0000
Subject: Bug 719560 - Build failure with freetype 2.5.1
Apply patch from su-v that fixes the freetype include to
the madness devised and recommended by freetype.
---
diff --git a/app/text/gimpfont.c b/app/text/gimpfont.c
index 4045ca9..66c6e52 100644
--- a/app/text/gimpfont.c
+++ b/app/text/gimpfont.c
@@ -28,7 +28,9 @@
#define PANGO_ENABLE_ENGINE 1 /* Argh */
#include <pango/pango-ot.h>
-#include <freetype/tttables.h>
+
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
#include "text-types.h"
--
cgit v0.9.2

30
mingw-w64-gimp/patch_CVE1913.patch
View File

@@ -1,30 +0,0 @@
From 32ae0f83e5748299641cceaabe3f80f1b3afd03e Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Thu, 14 Nov 2013 13:29:01 +0000
Subject: file-xwd: sanity check colormap size (CVE-2013-1913)
---
diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c
index c8e1a6e..343129a 100644
--- a/plug-ins/common/file-xwd.c
+++ b/plug-ins/common/file-xwd.c
@@ -466,6 +466,17 @@ load_image (const gchar *filename,
/* Position to start of XWDColor structures */
fseek (ifp, (long)xwdhdr.l_header_size, SEEK_SET);
+ /* Guard against insanely huge color maps -- gimp_image_set_colormap() only
+ * accepts colormaps with 0..256 colors anyway. */
+ if (xwdhdr.l_colormap_entries > 256)
+ {
+ g_message (_("'%s':\nIllegal number of colormap entries: %ld"),
+ gimp_filename_to_utf8 (filename),
+ (long)xwdhdr.l_colormap_entries);
+ fclose (ifp);
+ return -1;
+ }
+
if (xwdhdr.l_colormap_entries > 0)
{
xwdcolmap = g_new (L_XWDCOLOR, xwdhdr.l_colormap_entries);
--
cgit v0.9.2

150
mingw-w64-gimp/patch_CVE197.patch
View File

@@ -1,150 +0,0 @@
From 23f685931e5f000dd033a45c60c1e60d7f78caf4 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Tue, 26 Nov 2013 09:49:42 +0000
Subject: file-xwd: sanity check # of colors and map entries (CVE-2013-1978)
The number of colors in an image shouldn't be higher than the number of
colormap entries. Additionally, consolidate post error cleanup in
load_image().
---
diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c
index 343129a..4df9ce8 100644
--- a/plug-ins/common/file-xwd.c
+++ b/plug-ins/common/file-xwd.c
@@ -429,9 +429,9 @@ static gint32
load_image (const gchar *filename,
GError **error)
{
- FILE *ifp;
+ FILE *ifp = NULL;
gint depth, bpp;
- gint32 image_ID;
+ gint32 image_ID = -1;
L_XWDFILEHEADER xwdhdr;
L_XWDCOLOR *xwdcolmap = NULL;
@@ -441,7 +441,7 @@ load_image (const gchar *filename,
g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
_("Could not open '%s' for reading: %s"),
gimp_filename_to_utf8 (filename), g_strerror (errno));
- return -1;
+ goto out;
}
read_xwd_header (ifp, &xwdhdr);
@@ -450,8 +450,7 @@ load_image (const gchar *filename,
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Could not read XWD header from '%s'"),
gimp_filename_to_utf8 (filename));
- fclose (ifp);
- return -1;
+ goto out;
}
#ifdef XWD_COL_WAIT_DEBUG
@@ -473,12 +472,18 @@ load_image (const gchar *filename,
g_message (_("'%s':\nIllegal number of colormap entries: %ld"),
gimp_filename_to_utf8 (filename),
(long)xwdhdr.l_colormap_entries);
- fclose (ifp);
- return -1;
+ goto out;
}
if (xwdhdr.l_colormap_entries > 0)
{
+ if (xwdhdr.l_colormap_entries < xwdhdr.l_ncolors)
+ {
+ g_message (_("'%s':\nNumber of colormap entries < number of colors"),
+ gimp_filename_to_utf8 (filename));
+ goto out;
+ }
+
xwdcolmap = g_new (L_XWDCOLOR, xwdhdr.l_colormap_entries);
read_xwd_cols (ifp, &xwdhdr, xwdcolmap);
@@ -498,9 +503,7 @@ load_image (const gchar *filename,
if (xwdhdr.l_file_version != 7)
{
g_message (_("Can't read color entries"));
- g_free (xwdcolmap);
- fclose (ifp);
- return (-1);
+ goto out;
}
}
@@ -508,9 +511,7 @@ load_image (const gchar *filename,
{
g_message (_("'%s':\nNo image width specified"),
gimp_filename_to_utf8 (filename));
- g_free (xwdcolmap);
- fclose (ifp);
- return (-1);
+ goto out;
}
if (xwdhdr.l_pixmap_width > GIMP_MAX_IMAGE_SIZE
@@ -518,27 +519,21 @@ load_image (const gchar *filename,
{
g_message (_("'%s':\nImage width is larger than GIMP can handle"),
gimp_filename_to_utf8 (filename));
- g_free (xwdcolmap);
- fclose (ifp);
- return (-1);
+ goto out;
}
if (xwdhdr.l_pixmap_height <= 0)
{
g_message (_("'%s':\nNo image height specified"),
gimp_filename_to_utf8 (filename));
- g_free (xwdcolmap);
- fclose (ifp);
- return (-1);
+ goto out;
}
if (xwdhdr.l_pixmap_height > GIMP_MAX_IMAGE_SIZE)
{
g_message (_("'%s':\nImage height is larger than GIMP can handle"),
gimp_filename_to_utf8 (filename));
- g_free (xwdcolmap);
- fclose (ifp);
- return (-1);
+ goto out;
}
gimp_progress_init_printf (_("Opening '%s'"),
@@ -591,11 +586,6 @@ load_image (const gchar *filename,
}
gimp_progress_update (1.0);
- fclose (ifp);
-
- if (xwdcolmap)
- g_free (xwdcolmap);
-
if (image_ID == -1 && ! (error && *error))
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("XWD-file %s has format %d, depth %d and bits per pixel %d. "
@@ -603,6 +593,17 @@ load_image (const gchar *filename,
gimp_filename_to_utf8 (filename),
(gint) xwdhdr.l_pixmap_format, depth, bpp);
+out:
+ if (ifp)
+ {
+ fclose (ifp);
+ }
+
+ if (xwdcolmap)
+ {
+ g_free (xwdcolmap);
+ }
+
return image_ID;
}
--
cgit v0.9.2

4
mingw-w64-gimp/python-m4.patch
View File

@@ -1,9 +1,9 @@
--- gimp-2.8.10/configure.ac.orig 2014-02-25 22:03:04.931800000 +0400
+++ gimp-2.8.10/configure.ac 2014-02-25 22:20:04.452800000 +0400
@@ -1805,6 +1805,12 @@
[AC_MSG_ERROR([pycheck_error([Python 2.5.0 or newer], [it])])])
[AC_MSG_ERROR([pycheck_error([Python 2 (python2_required_version or newer)], [it])])])
AM_CHECK_PYTHON_HEADERS(,
[AC_MSG_ERROR([pycheck_error([Python headers], [them])])])
[AC_MSG_ERROR([pycheck_error([Python 2 headers], [them])])])
+ if test "x$platform_win32" = "xyes"; then
+ AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows requires Python modules to be explicitly linked to libpython.]))
+ fi

77
mingw-w64-gimp/uri-backend-libcurl.patch
View File

@@ -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 <muks@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;
+}