diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2013-12-10 09:12:09 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2013-12-10 09:12:09 +0000 |
| commit | 5a7b777a40f602bfb7cf4eb43d2644e325bfee0a (patch) | |
| tree | f60c139f38124432a4021e9d61f62019b2f41e9a /media-gfx | |
| parent | Bump blaze-builder to 0.3.3.2 (diff) | |
| download | gentoo-2-5a7b777a40f602bfb7cf4eb43d2644e325bfee0a.tar.gz gentoo-2-5a7b777a40f602bfb7cf4eb43d2644e325bfee0a.tar.bz2 gentoo-2-5a7b777a40f602bfb7cf4eb43d2644e325bfee0a.zip | |
Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493466). Bumped ebuild to EAPI-5. Use new python framework. Removed old versions
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/gimp/ChangeLog | 15 | ||||
| -rw-r--r-- | media-gfx/gimp/files/gimp-2.6.11-cve-2011-2896.patch | 61 | ||||
| -rw-r--r-- | media-gfx/gimp/files/gimp-2.6.11-poppler-0.17.patch | 477 | ||||
| -rw-r--r-- | media-gfx/gimp/files/gimp-2.7.3-glib-2.29.patch | 13 | ||||
| -rw-r--r-- | media-gfx/gimp/files/gimp-2.7.3-libm.patch | 21 | ||||
| -rw-r--r-- | media-gfx/gimp/files/gimp-2.7.5-configure-gs-bzip2.patch | 66 | ||||
| -rw-r--r-- | media-gfx/gimp/files/gimp-2.8.0-bzip2.patch | 25 | ||||
| -rw-r--r-- | media-gfx/gimp/files/gimp-2.8.2-xwd-file-security.patch | 173 | ||||
| -rw-r--r-- | media-gfx/gimp/files/gimp-2.8.4-valid-desktop-file.patch | 35 | ||||
| -rw-r--r-- | media-gfx/gimp/files/gimp-CVE-2010-4540-to-4543.diff | 132 | ||||
| -rw-r--r-- | media-gfx/gimp/files/gimp-libpng15-v2.diff | 499 | ||||
| -rw-r--r-- | media-gfx/gimp/files/gimp-libpng15.diff | 489 | ||||
| -rw-r--r-- | media-gfx/gimp/gimp-2.8.10-r1.ebuild (renamed from media-gfx/gimp/gimp-2.8.8.ebuild) | 38 | ||||
| -rw-r--r-- | media-gfx/gimp/gimp-2.8.2-r1.ebuild | 168 | ||||
| -rw-r--r-- | media-gfx/gimp/gimp-2.8.2.ebuild | 165 | ||||
| -rw-r--r-- | media-gfx/gimp/gimp-2.8.4.ebuild | 166 |
16 files changed, 32 insertions, 2511 deletions
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog index 197382ad232c..e4a59df23710 100644 --- a/media-gfx/gimp/ChangeLog +++ b/media-gfx/gimp/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for media-gfx/gimp # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.419 2013/12/02 23:29:10 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.420 2013/12/10 09:12:09 polynomial-c Exp $ + +*gimp-2.8.10-r1 (10 Dec 2013) + + 10 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> -gimp-2.8.2.ebuild, + -gimp-2.8.2-r1.ebuild, -gimp-2.8.4.ebuild, -gimp-2.8.8.ebuild, + +gimp-2.8.10-r1.ebuild, -files/gimp-2.6.11-cve-2011-2896.patch, + -files/gimp-2.6.11-poppler-0.17.patch, -files/gimp-2.7.3-glib-2.29.patch, + -files/gimp-2.7.3-libm.patch, -files/gimp-2.7.5-configure-gs-bzip2.patch, + -files/gimp-2.8.0-bzip2.patch, -files/gimp-2.8.2-xwd-file-security.patch, + -files/gimp-libpng15.diff, -files/gimp-2.8.4-valid-desktop-file.patch, + -files/gimp-CVE-2010-4540-to-4543.diff, -files/gimp-libpng15-v2.diff: + Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493466). Bumped + ebuild to EAPI-5. Use new python framework. Removed old versions. *gimp-2.8.10 (02 Dec 2013) diff --git a/media-gfx/gimp/files/gimp-2.6.11-cve-2011-2896.patch b/media-gfx/gimp/files/gimp-2.6.11-cve-2011-2896.patch deleted file mode 100644 index 735d771750d6..000000000000 --- a/media-gfx/gimp/files/gimp-2.6.11-cve-2011-2896.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 376ad788c1a1c31d40f18494889c383f6909ebfc Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils@redhat.com> -Date: Thu, 04 Aug 2011 10:51:42 +0000 -Subject: file-gif-load: fix heap corruption and buffer overflow (CVE-2011-2896) - ---- -(limited to 'plug-ins/common/file-gif-load.c') - -diff --git a/plug-ins/common/file-gif-load.c b/plug-ins/common/file-gif-load.c -index 81f3bd0..c91e7aa 100644 ---- a/plug-ins/common/file-gif-load.c -+++ b/plug-ins/common/file-gif-load.c -@@ -713,7 +713,8 @@ LZWReadByte (FILE *fd, - static gint firstcode, oldcode; - static gint clear_code, end_code; - static gint table[2][(1 << MAX_LZW_BITS)]; -- static gint stack[(1 << (MAX_LZW_BITS)) * 2], *sp; -+#define STACK_SIZE ((1 << (MAX_LZW_BITS)) * 2) -+ static gint stack[STACK_SIZE], *sp; - gint i; - - if (just_reset_LZW) -@@ -788,7 +789,7 @@ LZWReadByte (FILE *fd, - - return firstcode & 255; - } -- else if (code == end_code) -+ else if (code == end_code || code > max_code) - { - gint count; - guchar buf[260]; -@@ -807,13 +808,14 @@ LZWReadByte (FILE *fd, - - incode = code; - -- if (code >= max_code) -+ if (code == max_code) - { -- *sp++ = firstcode; -+ if (sp < &(stack[STACK_SIZE])) -+ *sp++ = firstcode; - code = oldcode; - } - -- while (code >= clear_code) -+ while (code >= clear_code && sp < &(stack[STACK_SIZE])) - { - *sp++ = table[1][code]; - if (code == table[0][code]) -@@ -824,7 +826,8 @@ LZWReadByte (FILE *fd, - code = table[0][code]; - } - -- *sp++ = firstcode = table[1][code]; -+ if (sp < &(stack[STACK_SIZE])) -+ *sp++ = firstcode = table[1][code]; - - if ((code = max_code) < (1 << MAX_LZW_BITS)) - { --- -cgit v0.9.0.2 diff --git a/media-gfx/gimp/files/gimp-2.6.11-poppler-0.17.patch b/media-gfx/gimp/files/gimp-2.6.11-poppler-0.17.patch deleted file mode 100644 index 86630897ae25..000000000000 --- a/media-gfx/gimp/files/gimp-2.6.11-poppler-0.17.patch +++ /dev/null @@ -1,477 +0,0 @@ -From 69f69eed816b89be9a01a48a1f0643d1fd496118 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils@redhat.com> -Date: Fri, 6 May 2011 11:58:44 +0200 -Subject: [PATCH] patch: poppler-0.17 - -Squashed commit of the following: - -commit 529d940222dfc352d41fbf72de29134421aa4002 -Author: Nils Philippsen <nils@redhat.com> -Date: Fri May 6 11:50:30 2011 +0200 - - use code based on pixbufs instead of cairo surfaces - - this is done to avoid adding to libgimp, thanks to Mukund Sivaraman for - hints how to do this - -commit f8671d8767d4cdab830dc06310e96c63a88ec0fd -Author: Mukund Sivaraman <muks@banu.com> -Date: Thu Apr 21 13:57:13 2011 +0530 - - file-pdf-load: Update attribution, removing bogus copyright - (cherry picked from commit e999122e0b20b6ccd6bde3ce039bb64068fc0019) - -commit 89a78f2590d298dac2f42e6d9a3016fc5d672c70 -Author: Nils Philippsen <nils@redhat.com> -Date: Thu Apr 21 13:52:18 2011 +0200 - - file-pdf-load: Use better API + cleanups - - * fixes issues with poppler 0.17 completely - * uses new libgimp API to pass surfaces instead of pixbufs - * uses GTK+ 3 API to convert surfaces to pixbufs where available - (backported from commit 7bdadd80ba479d6ff904e276d805e16f6b940ee2) - -commit 4e92302c4a14a961f112587a0ad86696c88da2f8 -Author: Nils Philippsen <nils@redhat.com> -Date: Thu Apr 21 13:38:08 2011 +0200 - - file-pdf-load: Don't use deprecated API (bug #646947) - - (cherry picked from commit 9b3e1c91fd2eac69da6947ec9c7fbf10096ba237) - - Conflicts: - - plug-ins/common/file-pdf.c ---- - plug-ins/common/file-pdf.c | 323 ++++++++++++++++++++++++++++++++++++++------ - 1 files changed, 283 insertions(+), 40 deletions(-) - -diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c -index a43b459..43c2b7d 100644 ---- a/plug-ins/common/file-pdf.c -+++ b/plug-ins/common/file-pdf.c -@@ -4,6 +4,9 @@ - * - * Copyright (C) 2005 Nathan Summers - * -+ * Some code in render_page_to_surface() borrowed from -+ * poppler.git/glib/poppler-page.cc. -+ * - * 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 -@@ -80,16 +83,20 @@ static gboolean load_dialog (PopplerDocument *doc, - static PopplerDocument * open_document (const gchar *filename, - GError **error); - --static GdkPixbuf * get_thumbnail (PopplerDocument *doc, -+static cairo_surface_t * get_thumb_surface (PopplerDocument *doc, -+ gint page, -+ gint preferred_size); -+ -+static GdkPixbuf * get_thumb_pixbuf (PopplerDocument *doc, - gint page, - gint preferred_size); - - static gint32 layer_from_pixbuf (gint32 image, -- const gchar *layer_name, -- gint position, -- GdkPixbuf *buf, -- gdouble progress_start, -- gdouble progress_scale); -+ const gchar *layer_name, -+ gint position, -+ GdkPixbuf *pixbuf, -+ gdouble progress_start, -+ gdouble progress_scale); - - /** - ** the following was formerly part of -@@ -433,11 +440,12 @@ run (const gchar *name, - } - else - { -- gdouble width = 0; -- gdouble height = 0; -- gdouble scale; -- gint32 image = -1; -- GdkPixbuf *pixbuf = NULL; -+ gdouble width = 0; -+ gdouble height = 0; -+ gdouble scale; -+ gint32 image = -1; -+ gint num_pages = 0; -+ GdkPixbuf *pixbuf = NULL; - - /* Possibly retrieve last settings */ - gimp_get_data (LOAD_PROC, &loadvals); -@@ -455,7 +463,10 @@ run (const gchar *name, - g_object_unref (page); - } - -- pixbuf = get_thumbnail (doc, 0, param[1].data.d_int32); -+ num_pages = poppler_document_get_n_pages (doc); -+ -+ pixbuf = get_thumb_pixbuf (doc, 0, param[1].data.d_int32); -+ - g_object_unref (doc); - } - -@@ -548,6 +559,187 @@ open_document (const gchar *filename, - return doc; - } - -+/* FIXME: Remove this someday when we depend fully on GTK+ >= 3 */ -+ -+#if (!GTK_CHECK_VERSION (3, 0, 0)) -+ -+static cairo_format_t -+gdk_cairo_format_for_content (cairo_content_t content) -+{ -+ switch (content) -+ { -+ case CAIRO_CONTENT_COLOR: -+ return CAIRO_FORMAT_RGB24; -+ case CAIRO_CONTENT_ALPHA: -+ return CAIRO_FORMAT_A8; -+ case CAIRO_CONTENT_COLOR_ALPHA: -+ default: -+ return CAIRO_FORMAT_ARGB32; -+ } -+} -+ -+static cairo_surface_t * -+gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface, -+ cairo_content_t content, -+ int src_x, -+ int src_y, -+ int width, -+ int height) -+{ -+ cairo_surface_t *copy; -+ cairo_t *cr; -+ -+ copy = cairo_image_surface_create (gdk_cairo_format_for_content (content), -+ width, -+ height); -+ -+ cr = cairo_create (copy); -+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); -+ cairo_set_source_surface (cr, surface, -src_x, -src_y); -+ cairo_paint (cr); -+ cairo_destroy (cr); -+ -+ return copy; -+} -+ -+static void -+convert_alpha (guchar *dest_data, -+ int dest_stride, -+ guchar *src_data, -+ int src_stride, -+ int src_x, -+ int src_y, -+ int width, -+ int height) -+{ -+ int x, y; -+ -+ src_data += src_stride * src_y + src_x * 4; -+ -+ for (y = 0; y < height; y++) { -+ guint32 *src = (guint32 *) src_data; -+ -+ for (x = 0; x < width; x++) { -+ guint alpha = src[x] >> 24; -+ -+ if (alpha == 0) -+ { -+ dest_data[x * 4 + 0] = 0; -+ dest_data[x * 4 + 1] = 0; -+ dest_data[x * 4 + 2] = 0; -+ } -+ else -+ { -+ dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha; -+ dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >> 8) * 255 + alpha / 2) / alpha; -+ dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >> 0) * 255 + alpha / 2) / alpha; -+ } -+ dest_data[x * 4 + 3] = alpha; -+ } -+ -+ src_data += src_stride; -+ dest_data += dest_stride; -+ } -+} -+ -+static void -+convert_no_alpha (guchar *dest_data, -+ int dest_stride, -+ guchar *src_data, -+ int src_stride, -+ int src_x, -+ int src_y, -+ int width, -+ int height) -+{ -+ int x, y; -+ -+ src_data += src_stride * src_y + src_x * 4; -+ -+ for (y = 0; y < height; y++) { -+ guint32 *src = (guint32 *) src_data; -+ -+ for (x = 0; x < width; x++) { -+ dest_data[x * 3 + 0] = src[x] >> 16; -+ dest_data[x * 3 + 1] = src[x] >> 8; -+ dest_data[x * 3 + 2] = src[x]; -+ } -+ -+ src_data += src_stride; -+ dest_data += dest_stride; -+ } -+} -+ -+/** -+ * gdk_pixbuf_get_from_surface: -+ * @surface: surface to copy from -+ * @src_x: Source X coordinate within @surface -+ * @src_y: Source Y coordinate within @surface -+ * @width: Width in pixels of region to get -+ * @height: Height in pixels of region to get -+ * -+ * Transfers image data from a #cairo_surface_t and converts it to an RGB(A) -+ * representation inside a #GdkPixbuf. This allows you to efficiently read -+ * individual pixels from cairo surfaces. For #GdkWindows, use -+ * gdk_pixbuf_get_from_window() instead. -+ * -+ * This function will create an RGB pixbuf with 8 bits per channel. -+ * The pixbuf will contain an alpha channel if the @surface contains one. -+ * -+ * Return value: (transfer full): A newly-created pixbuf with a reference -+ * count of 1, or %NULL on error -+ */ -+static GdkPixbuf * -+gdk_pixbuf_get_from_surface (cairo_surface_t *surface, -+ gint src_x, -+ gint src_y, -+ gint width, -+ gint height) -+{ -+ cairo_content_t content; -+ GdkPixbuf *dest; -+ -+ /* General sanity checks */ -+ g_return_val_if_fail (surface != NULL, NULL); -+ g_return_val_if_fail (width > 0 && height > 0, NULL); -+ -+ content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR; -+ dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, -+ !!(content & CAIRO_CONTENT_ALPHA), -+ 8, -+ width, height); -+ -+ surface = gdk_cairo_surface_coerce_to_image (surface, content, -+ src_x, src_y, -+ width, height); -+ cairo_surface_flush (surface); -+ if (cairo_surface_status (surface) || dest == NULL) -+ { -+ cairo_surface_destroy (surface); -+ return NULL; -+ } -+ -+ if (gdk_pixbuf_get_has_alpha (dest)) -+ convert_alpha (gdk_pixbuf_get_pixels (dest), -+ gdk_pixbuf_get_rowstride (dest), -+ cairo_image_surface_get_data (surface), -+ cairo_image_surface_get_stride (surface), -+ 0, 0, -+ width, height); -+ else -+ convert_no_alpha (gdk_pixbuf_get_pixels (dest), -+ gdk_pixbuf_get_rowstride (dest), -+ cairo_image_surface_get_data (surface), -+ cairo_image_surface_get_stride (surface), -+ 0, 0, -+ width, height); -+ -+ cairo_surface_destroy (surface); -+ return dest; -+} -+ -+#endif -+ - static gint32 - layer_from_pixbuf (gint32 image, - const gchar *layer_name, -@@ -566,6 +758,54 @@ layer_from_pixbuf (gint32 image, - return layer; - } - -+static cairo_surface_t * -+render_page_to_surface (PopplerPage *page, -+ int width, -+ int height, -+ double scale) -+{ -+ cairo_surface_t *surface; -+ cairo_t *cr; -+ -+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); -+ cr = cairo_create (surface); -+ -+ cairo_save (cr); -+ cairo_translate (cr, 0.0, 0.0); -+ -+ if (scale != 1.0) -+ cairo_scale (cr, scale, scale); -+ -+ poppler_page_render (page, cr); -+ cairo_restore (cr); -+ -+ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); -+ cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); -+ cairo_paint (cr); -+ -+ cairo_destroy (cr); -+ -+ return surface; -+} -+ -+static GdkPixbuf * -+render_page_to_pixbuf (PopplerPage *page, -+ int width, -+ int height, -+ double scale) -+{ -+ GdkPixbuf *pixbuf; -+ cairo_surface_t *surface; -+ -+ surface = render_page_to_surface (page, width, height, scale); -+ pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, -+ cairo_image_surface_get_width (surface), -+ cairo_image_surface_get_height (surface)); -+ cairo_surface_destroy (surface); -+ -+ return pixbuf; -+} -+ - static gint32 - load_image (PopplerDocument *doc, - const gchar *filename, -@@ -597,7 +837,7 @@ load_image (PopplerDocument *doc, - gdouble page_width; - gdouble page_height; - -- GdkPixbuf *buf; -+ GdkPixbuf *pixbuf; - gint width; - gint height; - -@@ -627,15 +867,13 @@ load_image (PopplerDocument *doc, - gimp_image_set_resolution (image_ID, resolution, resolution); - } - -- buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height); -- -- poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0, buf); -+ pixbuf = render_page_to_pixbuf (page, width, height, scale); - -- layer_from_pixbuf (image_ID, page_label, i, buf, -+ layer_from_pixbuf (image_ID, page_label, i, pixbuf, - doc_progress, 1.0 / pages->n_pages); - - g_free (page_label); -- g_object_unref (buf); -+ g_object_unref(pixbuf); - - doc_progress = (double) (i + 1) / pages->n_pages; - gimp_progress_update (doc_progress); -@@ -676,30 +914,22 @@ load_image (PopplerDocument *doc, - return image_ID; - } - --static GdkPixbuf * --get_thumbnail (PopplerDocument *doc, -- gint page_num, -- gint preferred_size) -+static cairo_surface_t * -+get_thumb_surface (PopplerDocument *doc, -+ gint page_num, -+ gint preferred_size) - { - PopplerPage *page; -- GdkPixbuf *pixbuf; -+ cairo_surface_t *surface; - - page = poppler_document_get_page (doc, page_num); - - if (! page) - return NULL; - -- /* XXX: Remove conditional when we depend on poppler 0.8.0, but also -- * add configure check to make sure POPPLER_WITH_GDK is enabled! -- */ --#ifdef POPPLER_WITH_GDK -- pixbuf = poppler_page_get_thumbnail_pixbuf (page); --#else -- pixbuf = poppler_page_get_thumbnail (page); --#endif -- -+ surface = poppler_page_get_thumbnail (page); - -- if (! pixbuf) -+ if (! surface) - { - gdouble width; - gdouble height; -@@ -712,15 +942,28 @@ get_thumbnail (PopplerDocument *doc, - width *= scale; - height *= scale; - -- pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, -- width, height); -- -- poppler_page_render_to_pixbuf (page, -- 0, 0, width, height, scale, 0, pixbuf); -+ surface = render_page_to_surface (page, width, height, scale); - } - - g_object_unref (page); - -+ return surface; -+} -+ -+static GdkPixbuf * -+get_thumb_pixbuf (PopplerDocument *doc, -+ gint page_num, -+ gint preferred_size) -+{ -+ cairo_surface_t *surface; -+ GdkPixbuf *pixbuf; -+ -+ surface = get_thumb_surface (doc, page_num, preferred_size); -+ pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, -+ cairo_image_surface_get_width (surface), -+ cairo_image_surface_get_height (surface)); -+ cairo_surface_destroy (surface); -+ - return pixbuf; - } - -@@ -769,8 +1012,8 @@ thumbnail_thread (gpointer data) - idle_data->page_no = i; - - /* FIXME get preferred size from somewhere? */ -- idle_data->pixbuf = get_thumbnail (thread_data->document, i, -- THUMBNAIL_SIZE); -+ idle_data->pixbuf = get_thumb_pixbuf (thread_data->document, i, -+ THUMBNAIL_SIZE); - - g_idle_add (idle_set_thumbnail, idle_data); - --- -1.7.5 - diff --git a/media-gfx/gimp/files/gimp-2.7.3-glib-2.29.patch b/media-gfx/gimp/files/gimp-2.7.3-glib-2.29.patch deleted file mode 100644 index fc1e8db16702..000000000000 --- a/media-gfx/gimp/files/gimp-2.7.3-glib-2.29.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.ac 2011-08-31 15:44:57.123536234 +0200 -+++ configure.ac 2011-08-31 15:45:38.693016544 +0200 -@@ -1940,10 +1940,6 @@ - # We must build without problems with future releases of libraries - # and disabling deprecated API risks breaking the build - --if test "x$have_glib_2_32" != "xyes"; then -- CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED" --fi -- - if test "x$have_gtk_2_26" != "xyes"; then - CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" - fi diff --git a/media-gfx/gimp/files/gimp-2.7.3-libm.patch b/media-gfx/gimp/files/gimp-2.7.3-libm.patch deleted file mode 100644 index df9f3cf35b96..000000000000 --- a/media-gfx/gimp/files/gimp-2.7.3-libm.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- plug-ins/script-fu/Makefile.am 2011-11-30 00:33:18.503293635 +0100 -+++ plug-ins/script-fu/Makefile.am 2011-11-30 00:36:41.479756076 +0100 -@@ -1,14 +1,16 @@ - ## Process this file with automake to produce Makefile.in - -+libm = -lm -+ - libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la - libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la - libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la - libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la - libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la - libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la --libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la -+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm) - --libtinyscheme=tinyscheme/libtinyscheme.a -+libtinyscheme=tinyscheme/libtinyscheme.a $(libm) - libftx=ftx/libftx.a - - if OS_WIN32 diff --git a/media-gfx/gimp/files/gimp-2.7.5-configure-gs-bzip2.patch b/media-gfx/gimp/files/gimp-2.7.5-configure-gs-bzip2.patch deleted file mode 100644 index 2a8c127d0e8a..000000000000 --- a/media-gfx/gimp/files/gimp-2.7.5-configure-gs-bzip2.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b5731b01541ebc345bffd9b57c08981196f1ad1d Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Wed, 14 Mar 2012 13:40:19 +0100 -Subject: [PATCH] Introduce configure options --with[out]-gs and - --with[out]-bzip2 to allow bypassing gs/bzip2 - auto-detection - ---- - configure.ac | 24 ++++++++++++++++++++---- - 1 files changed, 20 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index bb60d2f..e2f154d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1154,13 +1154,21 @@ AC_SUBST(Z_LIBS) - # Check for libbzip2 - #################### - --have_libbzip2=yes --if test -z "$BZIP2_LIBS"; then -+AC_ARG_WITH(gs, [ --without-bzip2 build without bzip2 support]) -+ -+have_libbzip2=no -+if test "x$with_bzip2" != xno; then -+ have_libbzip2=yes - AC_CHECK_LIB(bz2, BZ2_bzCompress, - [AC_CHECK_HEADER(bzlib.h, - BZIP2_LIBS='-lbz2', - [have_libbzip2="no (libbzip2 header files not found)"])], - [have_libbzip2="no (libbzip2 library not found)"]) -+ if test "x$have_libbzip2" != xyes -a "x$with_bzip2" = xyes; then -+ AC_MSG_ERROR([ -+*** Checks for bzip2 library failed. You can build without it by passing -+*** --without-bzip2 to configure but you won't be able to use compressed files then.]) -+ fi - fi - - AM_CONDITIONAL(HAVE_BZIP2, test "x$have_libbzip2" = xyes) -@@ -1176,13 +1184,21 @@ fi - # Check for Ghostscript library - ############################### - --have_gs=yes --if test -z "$GS_LIBS"; then -+AC_ARG_WITH(gs, [ --without-gs build without Ghostscript support]) -+ -+have_gs=no -+if test "x$with_gs" != xno; then -+ have_gs=yes - AC_CHECK_LIB(gs, gsapi_new_instance, - [AC_CHECK_HEADER(ghostscript/iapi.h, - FILE_PS='file-ps$(EXEEXT)'; GS_LIBS='-lgs', - [have_gs="no (Ghostscript header files not found)"])], - [have_gs="no (Ghostscript library not found)"]) -+ if test "x$have_gs" != xyes -a "x$with_gs" = xyes; then -+ AC_MSG_ERROR([ -+*** Checks for Ghostscript library failed. You can build without it by passing -+*** --without-gs to configure but you won't be able to use Postscript files then.]) -+ fi - fi - - AC_SUBST(FILE_PS) --- -1.7.8.5 - diff --git a/media-gfx/gimp/files/gimp-2.8.0-bzip2.patch b/media-gfx/gimp/files/gimp-2.8.0-bzip2.patch deleted file mode 100644 index b5c4e4023981..000000000000 --- a/media-gfx/gimp/files/gimp-2.8.0-bzip2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fa9afae051cf2f8512765df8b3d385b360df03e9 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Fri, 4 May 2012 23:10:30 +0200 -Subject: [PATCH] Fix configure option --with[out]-bzip2 - ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6013f0b..8e50170 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1154,7 +1154,7 @@ AC_SUBST(Z_LIBS) - # Check for libbzip2 - #################### - --AC_ARG_WITH(gs, [ --without-bzip2 build without bzip2 support]) -+AC_ARG_WITH(bzip2, [ --without-bzip2 build without bzip2 support]) - - have_libbzip2=no - if test "x$with_bzip2" != xno; then --- -1.7.8.5 - diff --git a/media-gfx/gimp/files/gimp-2.8.2-xwd-file-security.patch b/media-gfx/gimp/files/gimp-2.8.2-xwd-file-security.patch deleted file mode 100644 index da69ec6a0b58..000000000000 --- a/media-gfx/gimp/files/gimp-2.8.2-xwd-file-security.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 2873262fccba12af144ed96ed91be144d92ff2e1 Mon Sep 17 00:00:00 2001 -From: Michael Natterer <mitch@gimp.org> -Date: Wed, 07 Nov 2012 23:16:31 +0000 -Subject: Bug 687392 - Memory corruption vulnerability when reading XWD files - -Applied and enhanced patch from andres which makes file-xwd detect -this kind of file corruption and abort loading with an error message. -(cherry picked from commit 0b35f6a082a0b3c372c568ea6bde39a4796acde2) ---- -diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c -index 4e8a95e..f91d757 100644 ---- a/plug-ins/common/file-xwd.c -+++ b/plug-ins/common/file-xwd.c -@@ -186,11 +186,13 @@ static gint32 load_xwd_f2_d16_b16 (const gchar *, - static gint32 load_xwd_f2_d24_b32 (const gchar *, - FILE *, - L_XWDFILEHEADER *, -- L_XWDCOLOR *); -+ L_XWDCOLOR *, -+ GError **); - static gint32 load_xwd_f1_d24_b1 (const gchar *, - FILE *, - L_XWDFILEHEADER *, -- L_XWDCOLOR *); -+ L_XWDCOLOR *, -+ GError **); - - static L_CARD32 read_card32 (FILE *, - gint *); -@@ -540,7 +542,8 @@ load_image (const gchar *filename, - case 1: /* Single plane pixmap */ - if ((depth <= 24) && (bpp == 1)) - { -- image_ID = load_xwd_f1_d24_b1 (filename, ifp, &xwdhdr, xwdcolmap); -+ image_ID = load_xwd_f1_d24_b1 (filename, ifp, &xwdhdr, xwdcolmap, -+ error); - } - break; - -@@ -559,7 +562,8 @@ load_image (const gchar *filename, - } - else if ((depth <= 24) && ((bpp == 24) || (bpp == 32))) - { -- image_ID = load_xwd_f2_d24_b32 (filename, ifp, &xwdhdr, xwdcolmap); -+ image_ID = load_xwd_f2_d24_b32 (filename, ifp, &xwdhdr, xwdcolmap, -+ error); - } - break; - } -@@ -570,7 +574,7 @@ load_image (const gchar *filename, - if (xwdcolmap) - g_free (xwdcolmap); - -- if (image_ID == -1) -+ 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. " - "Currently this is not supported."), -@@ -1624,10 +1628,11 @@ load_xwd_f2_d16_b16 (const gchar *filename, - /* Load XWD with pixmap_format 2, pixmap_depth up to 24, bits_per_pixel 24/32 */ - - static gint32 --load_xwd_f2_d24_b32 (const gchar *filename, -- FILE *ifp, -- L_XWDFILEHEADER *xwdhdr, -- L_XWDCOLOR *xwdcolmap) -+load_xwd_f2_d24_b32 (const gchar *filename, -+ FILE *ifp, -+ L_XWDFILEHEADER *xwdhdr, -+ L_XWDCOLOR *xwdcolmap, -+ GError **error) - { - register guchar *dest, lsbyte_first; - gint width, height, linepad, i, j, c0, c1, c2, c3; -@@ -1652,12 +1657,6 @@ load_xwd_f2_d24_b32 (const gchar *filename, - width = xwdhdr->l_pixmap_width; - height = xwdhdr->l_pixmap_height; - -- image_ID = create_new_image (filename, width, height, GIMP_RGB, -- &layer_ID, &drawable, &pixel_rgn); -- -- tile_height = gimp_tile_height (); -- data = g_malloc (tile_height * width * 3); -- - redmask = xwdhdr->l_red_mask; - greenmask = xwdhdr->l_green_mask; - bluemask = xwdhdr->l_blue_mask; -@@ -1685,6 +1684,22 @@ load_xwd_f2_d24_b32 (const gchar *filename, - maxblue = 0; while (bluemask >> (blueshift + maxblue)) maxblue++; - maxblue = (1 << maxblue) - 1; - -+ if (maxred > sizeof (redmap) || -+ maxgreen > sizeof (greenmap) || -+ maxblue > sizeof (bluemap)) -+ { -+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, -+ _("XWD-file %s is corrupt."), -+ gimp_filename_to_utf8 (filename)); -+ return -1; -+ } -+ -+ image_ID = create_new_image (filename, width, height, GIMP_RGB, -+ &layer_ID, &drawable, &pixel_rgn); -+ -+ tile_height = gimp_tile_height (); -+ data = g_malloc (tile_height * width * 3); -+ - /* Set map-arrays for red, green, blue */ - for (red = 0; red <= maxred; red++) - redmap[red] = (red * 255) / maxred; -@@ -1825,10 +1840,11 @@ load_xwd_f2_d24_b32 (const gchar *filename, - /* Load XWD with pixmap_format 1, pixmap_depth up to 24, bits_per_pixel 1 */ - - static gint32 --load_xwd_f1_d24_b1 (const gchar *filename, -- FILE *ifp, -- L_XWDFILEHEADER *xwdhdr, -- L_XWDCOLOR *xwdcolmap) -+load_xwd_f1_d24_b1 (const gchar *filename, -+ FILE *ifp, -+ L_XWDFILEHEADER *xwdhdr, -+ L_XWDCOLOR *xwdcolmap, -+ GError **error) - { - register guchar *dest, outmask, inmask, do_reverse; - gint width, height, i, j, plane, fromright; -@@ -1863,13 +1879,6 @@ load_xwd_f1_d24_b1 (const gchar *filename, - indexed = (xwdhdr->l_pixmap_depth <= 8); - bytes_per_pixel = (indexed ? 1 : 3); - -- image_ID = create_new_image (filename, width, height, -- indexed ? GIMP_INDEXED : GIMP_RGB, -- &layer_ID, &drawable, &pixel_rgn); -- -- tile_height = gimp_tile_height (); -- data = g_malloc (tile_height * width * bytes_per_pixel); -- - for (j = 0; j < 256; j++) /* Create an array for reversing bits */ - { - inmask = 0; -@@ -1913,6 +1922,16 @@ load_xwd_f1_d24_b1 (const gchar *filename, - maxblue = 0; while (bluemask >> (blueshift + maxblue)) maxblue++; - maxblue = (1 << maxblue) - 1; - -+ if (maxred > sizeof (redmap) || -+ maxgreen > sizeof (greenmap) || -+ maxblue > sizeof (bluemap)) -+ { -+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, -+ _("XWD-file %s is corrupt."), -+ gimp_filename_to_utf8 (filename)); -+ return -1; -+ } -+ - /* Set map-arrays for red, green, blue */ - for (red = 0; red <= maxred; red++) - redmap[red] = (red * 255) / maxred; -@@ -1922,6 +1941,13 @@ load_xwd_f1_d24_b1 (const gchar *filename, - bluemap[blue] = (blue * 255) / maxblue; - } - -+ image_ID = create_new_image (filename, width, height, -+ indexed ? GIMP_INDEXED : GIMP_RGB, -+ &layer_ID, &drawable, &pixel_rgn); -+ -+ tile_height = gimp_tile_height (); -+ data = g_malloc (tile_height * width * bytes_per_pixel); -+ - ncols = xwdhdr->l_colormap_entries; - if (xwdhdr->l_ncolors < ncols) - ncols = xwdhdr->l_ncolors; --- -cgit v0.9.0.2 diff --git a/media-gfx/gimp/files/gimp-2.8.4-valid-desktop-file.patch b/media-gfx/gimp/files/gimp-2.8.4-valid-desktop-file.patch deleted file mode 100644 index ab5662fcfcdd..000000000000 --- a/media-gfx/gimp/files/gimp-2.8.4-valid-desktop-file.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0ed3b482a422ff684c8921b7de9f44ea7b20345c Mon Sep 17 00:00:00 2001 -From: Kevin Cozens <kcozens@svn.gnome.org> -Date: Sun, 30 Dec 2012 15:43:50 +0000 -Subject: Fixed MIME_TYPES. Postscript and PDF are compiled conditionally. Fixes #690882. - -(cherry picked from commit d17622dce6228bebd646ed1eb3063fc952905cfd) ---- -(limited to 'configure.ac') - -diff --git a/configure.ac b/configure.ac -index 9db3696..8523aeb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1024,7 +1024,7 @@ AC_SUBST(GIMP_COMMAND) - - # The list of MIME types that are supported by plug-ins that are compiled - # unconditionally: --MIME_TYPES="application/postscript;application/pdf;image/bmp;image/g3fax;image/gif;image/x-fits;image/x-pcx;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-tga;image/x-xbitmap;image/x-xwindowdump;image/x-xcf;image/x-compressed-xcf;image/x-gimp-gbr;image/x-gimp-pat;image/x-gimp-gih" -+MIME_TYPES="image/bmp;image/g3fax;image/gif;image/x-fits;image/x-pcx;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-tga;image/x-xbitmap;image/x-xwindowdump;image/x-xcf;image/x-compressed-xcf;image/x-gimp-gbr;image/x-gimp-pat;image/x-gimp-gih" - - - ################### -@@ -1201,6 +1201,10 @@ if test "x$with_gs" != xno; then - fi - fi - -+if test "x$have_gs" = xyes; then -+ MIME_TYPES="$MIME_TYPES;application/postscript" -+fi -+ - AC_SUBST(FILE_PS) - AM_CONDITIONAL(HAVE_GS, test "x$have_gs" = xyes) - AC_SUBST(GS_LIBS) --- -cgit v0.9.2 diff --git a/media-gfx/gimp/files/gimp-CVE-2010-4540-to-4543.diff b/media-gfx/gimp/files/gimp-CVE-2010-4540-to-4543.diff deleted file mode 100644 index 111b20dc05b5..000000000000 --- a/media-gfx/gimp/files/gimp-CVE-2010-4540-to-4543.diff +++ /dev/null @@ -1,132 +0,0 @@ -diff -Naur gimp-2.6.11/plug-ins/common/file-psp.c gimp-2.6.11-sec//plug-ins/common/file-psp.c ---- gimp-2.6.11/plug-ins/common/file-psp.c 2010-07-03 00:51:56.000000000 +0200 -+++ gimp-2.6.11-sec//plug-ins/common/file-psp.c 2011-02-16 11:58:38.195883063 +0100 -@@ -1244,6 +1244,10 @@ - } - else - fread (buf, runcount, 1, f); -+ -+ /* prevent buffer overflow for bogus data */ -+ runcount = MIN (runcount, endq - q); -+ - if (bytespp == 1) - { - memmove (q, buf, runcount); -diff -Naur gimp-2.6.11/plug-ins/common/sphere-designer.c gimp-2.6.11-sec//plug-ins/common/sphere-designer.c ---- gimp-2.6.11/plug-ins/common/sphere-designer.c 2010-07-03 00:51:56.000000000 +0200 -+++ gimp-2.6.11-sec//plug-ins/common/sphere-designer.c 2011-02-16 11:58:32.967912810 +0100 -@@ -1992,6 +1992,7 @@ - gchar endbuf[21 * (G_ASCII_DTOSTR_BUF_SIZE + 1)]; - gchar *end = endbuf; - gchar line[1024]; -+ gchar fmt_str[16]; - gint i; - texture *t; - gint majtype, type; -@@ -2016,6 +2017,8 @@ - - s.com.numtexture = 0; - -+ snprintf (fmt_str, sizeof (fmt_str), "%%d %%d %%%lds", sizeof (endbuf) - 1); -+ - while (!feof (f)) - { - -@@ -2026,7 +2029,7 @@ - t = &s.com.texture[i]; - setdefaults (t); - -- if (sscanf (line, "%d %d %s", &t->majtype, &t->type, end) != 3) -+ if (sscanf (line, fmt_str, &t->majtype, &t->type, end) != 3) - t->color1.x = g_ascii_strtod (end, &end); - if (end && errno != ERANGE) - t->color1.y = g_ascii_strtod (end, &end); -diff -Naur gimp-2.6.11/plug-ins/gfig/gfig-style.c gimp-2.6.11-sec//plug-ins/gfig/gfig-style.c ---- gimp-2.6.11/plug-ins/gfig/gfig-style.c 2010-07-03 00:51:59.000000000 +0200 -+++ gimp-2.6.11-sec//plug-ins/gfig/gfig-style.c 2011-02-16 11:58:32.967912810 +0100 -@@ -165,6 +165,7 @@ - gchar *ptr; - gchar *tmpstr; - gchar *endptr; -+ gchar fmt_str[32]; - gchar colorstr_r[G_ASCII_DTOSTR_BUF_SIZE]; - gchar colorstr_g[G_ASCII_DTOSTR_BUF_SIZE]; - gchar colorstr_b[G_ASCII_DTOSTR_BUF_SIZE]; -@@ -172,6 +173,10 @@ - - style_entry->r = style_entry->g = style_entry->b = style_entry->a = 0.; - -+ snprintf (fmt_str, sizeof (fmt_str), "%%%lds %%%lds %%%lds %%%lds", -+ sizeof (colorstr_r) - 1, sizeof (colorstr_g) - 1, -+ sizeof (colorstr_b) - 1, sizeof (colorstr_a) - 1); -+ - while (n < nitems) - { - ptr = strchr (text[n], ':'); -@@ -181,7 +186,8 @@ - ptr++; - if (!strcmp (tmpstr, name)) - { -- sscanf (ptr, "%s %s %s %s", colorstr_r, colorstr_g, colorstr_b, colorstr_a); -+ sscanf (ptr, fmt_str, -+ colorstr_r, colorstr_g, colorstr_b, colorstr_a); - style_entry->r = g_ascii_strtod (colorstr_r, &endptr); - style_entry->g = g_ascii_strtod (colorstr_g, &endptr); - style_entry->b = g_ascii_strtod (colorstr_b, &endptr); -diff -Naur gimp-2.6.11/plug-ins/lighting/lighting-ui.c gimp-2.6.11-sec//plug-ins/lighting/lighting-ui.c ---- gimp-2.6.11/plug-ins/lighting/lighting-ui.c 2010-07-03 00:51:59.000000000 +0200 -+++ gimp-2.6.11-sec//plug-ins/lighting/lighting-ui.c 2011-02-16 11:58:32.968912815 +0100 -@@ -1342,6 +1342,7 @@ - gchar buffer3[G_ASCII_DTOSTR_BUF_SIZE]; - gchar type_label[21]; - gchar *endptr; -+ gchar fmt_str[32]; - - if (response_id == GTK_RESPONSE_OK) - { -@@ -1381,23 +1382,41 @@ - return; - } - -- fscanf (fp, " Position: %s %s %s", buffer1, buffer2, buffer3); -+ snprintf (fmt_str, sizeof (fmt_str), -+ " Position: %%%lds %%%lds %%%lds", -+ sizeof (buffer1) - 1, -+ sizeof (buffer2) - 1, -+ sizeof (buffer3) - 1); -+ fscanf (fp, fmt_str, buffer1, buffer2, buffer3); - source->position.x = g_ascii_strtod (buffer1, &endptr); - source->position.y = g_ascii_strtod (buffer2, &endptr); - source->position.z = g_ascii_strtod (buffer3, &endptr); - -- fscanf (fp, " Direction: %s %s %s", buffer1, buffer2, buffer3); -+ snprintf (fmt_str, sizeof (fmt_str), -+ " Direction: %%%lds %%%lds %%%lds", -+ sizeof (buffer1) - 1, -+ sizeof (buffer2) - 1, -+ sizeof (buffer3) - 1); -+ fscanf (fp, fmt_str, buffer1, buffer2, buffer3); - source->direction.x = g_ascii_strtod (buffer1, &endptr); - source->direction.y = g_ascii_strtod (buffer2, &endptr); - source->direction.z = g_ascii_strtod (buffer3, &endptr); - -- fscanf (fp, " Color: %s %s %s", buffer1, buffer2, buffer3); -+ snprintf (fmt_str, sizeof (fmt_str), -+ " Color: %%%lds %%%lds %%%lds", -+ sizeof (buffer1) - 1, -+ sizeof (buffer2) - 1, -+ sizeof (buffer3) - 1); -+ fscanf (fp, fmt_str, buffer1, buffer2, buffer3); - source->color.r = g_ascii_strtod (buffer1, &endptr); - source->color.g = g_ascii_strtod (buffer2, &endptr); - source->color.b = g_ascii_strtod (buffer3, &endptr); - source->color.a = 1.0; - -- fscanf (fp, " Intensity: %s", buffer1); -+ snprintf (fmt_str, sizeof (fmt_str), -+ " Intensity: %%%lds", -+ sizeof (buffer1) - 1); -+ fscanf (fp, fmt_str, buffer1); - source->intensity = g_ascii_strtod (buffer1, &endptr); - - } diff --git a/media-gfx/gimp/files/gimp-libpng15-v2.diff b/media-gfx/gimp/files/gimp-libpng15-v2.diff deleted file mode 100644 index 30c3778f75b6..000000000000 --- a/media-gfx/gimp/files/gimp-libpng15-v2.diff +++ /dev/null @@ -1,499 +0,0 @@ -$NetBSD: patch-ae,v 1.13 2011/04/19 10:28:31 wiz Exp $ - -Fix build with png-1.5. -https://bugzilla.gnome.org/show_bug.cgi?id=640409 - ---- plug-ins/common/file-mng.c.orig 2010-07-02 22:51:56.000000000 +0000 -+++ plug-ins/common/file-mng.c -@@ -799,6 +799,13 @@ mng_save_image (const gchar *filename, - png_infop png_info_ptr; - FILE *infile, *outfile; - int num_passes; -+ int color_type; -+ png_colorp palette; -+ int num_palette; -+ int bit_depth; -+ png_bytep trans_alpha; -+ int num_trans; -+ png_color_16p trans_color; - int tile_height; - guchar **layer_pixels, *layer_pixel; - int pass, j, k, begin, end, num; -@@ -969,7 +976,7 @@ mng_save_image (const gchar *filename, - goto err3; - } - -- if (setjmp (png_ptr->jmpbuf) != 0) -+ if (setjmp (png_jmpbuf(png_ptr)) != 0) - { - g_warning ("HRM saving PNG in mng_save_image()"); - png_destroy_write_struct (&png_ptr, &png_info_ptr); -@@ -981,37 +988,31 @@ mng_save_image (const gchar *filename, - png_init_io (png_ptr, outfile); - png_set_compression_level (png_ptr, mng_data.compression_level); - -- png_info_ptr->width = layer_cols; -- png_info_ptr->height = layer_rows; -- png_info_ptr->interlace_type = (mng_data.interlaced == 0 ? 0 : 1); -- png_info_ptr->bit_depth = 8; -- -+ bit_depth = 8; - switch (layer_drawable_type) - { - case GIMP_RGB_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_RGB; -+ color_type = PNG_COLOR_TYPE_RGB; - break; - case GIMP_RGBA_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; - break; - case GIMP_GRAY_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_GRAY; -+ color_type = PNG_COLOR_TYPE_GRAY; - break; - case GIMP_GRAYA_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; - break; - case GIMP_INDEXED_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; -- png_info_ptr->valid |= PNG_INFO_PLTE; -- png_info_ptr->palette = -- (png_colorp) gimp_image_get_colormap (image_id, &num_colors); -- png_info_ptr->num_palette = num_colors; -- break; - case GIMP_INDEXEDA_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; -- layer_has_unique_palette = -- respin_cmap (png_ptr, png_info_ptr, layer_remap, -- image_id, layer_drawable); -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ gimp_image_get_colormap (image_id, &num_colors); -+ if (num_palette <= 2) -+ bit_depth = 1; -+ else if (num_palette <= 4) -+ bit_depth = 2; -+ else if (num_palette <= 16) -+ bit_depth = 4; - break; - default: - g_warning ("This can't be!\n"); -@@ -1021,16 +1022,14 @@ mng_save_image (const gchar *filename, - goto err3; - } - -- if ((png_info_ptr->valid & PNG_INFO_PLTE) == PNG_INFO_PLTE) -- { -- if (png_info_ptr->num_palette <= 2) -- png_info_ptr->bit_depth = 1; -- else if (png_info_ptr->num_palette <= 4) -- png_info_ptr->bit_depth = 2; -- else if (png_info_ptr->num_palette <= 16) -- png_info_ptr->bit_depth = 4; -- } -+ png_set_IHDR(png_ptr, png_info_ptr, layer_cols, layer_rows, bit_depth, color_type, (mng_data.interlaced == 0 ? PNG_INTERLACE_NONE : PNG_INTERLACE_ADAM7), PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); - -+ if (layer_drawable_type == GIMP_INDEXED_IMAGE) -+ png_set_PLTE(png_ptr, png_info_ptr, (png_colorp) gimp_image_get_colormap (image_id, &num_colors), num_colors); -+ else if (layer_drawable_type == GIMP_INDEXEDA_IMAGE) -+ layer_has_unique_palette = -+ respin_cmap (png_ptr, png_info_ptr, layer_remap, -+ image_id, layer_drawable); - png_write_info (png_ptr, png_info_ptr); - - if (mng_data.interlaced != 0) -@@ -1038,8 +1037,8 @@ mng_save_image (const gchar *filename, - else - num_passes = 1; - -- if ((png_info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) && -- (png_info_ptr->bit_depth < 8)) -+ if ((png_get_color_type(png_ptr, png_info_ptr) == PNG_COLOR_TYPE_PALETTE) && -+ (png_get_bit_depth(png_ptr, png_info_ptr) < 8)) - png_set_packing (png_ptr); - - tile_height = gimp_tile_height (); -@@ -1065,7 +1064,7 @@ mng_save_image (const gchar *filename, - gimp_pixel_rgn_get_rect (&layer_pixel_rgn, layer_pixel, 0, - begin, layer_cols, num); - -- if ((png_info_ptr->valid & PNG_INFO_tRNS) == PNG_INFO_tRNS) -+ if (png_get_tRNS(png_ptr, png_info_ptr, &trans_alpha, &num_trans, &trans_color) != 0) - { - for (j = 0; j < num; j++) - { -@@ -1077,7 +1076,7 @@ mng_save_image (const gchar *filename, - } - } - else -- if (((png_info_ptr->valid & PNG_INFO_PLTE) == PNG_INFO_PLTE) -+ if ((png_get_PLTE(png_ptr, png_info_ptr, &palette, &num_palette) != 0) - && (layer_bpp == 2)) - { - for (j = 0; j < num; j++) -$NetBSD: patch-af,v 1.8 2011/04/19 10:28:31 wiz Exp $ - -Fix build with png-1.5. -https://bugzilla.gnome.org/show_bug.cgi?id=640409 - ---- plug-ins/common/file-png.c.orig 2010-07-13 20:22:27.000000000 +0000 -+++ plug-ins/common/file-png.c -@@ -653,7 +653,11 @@ on_read_error (png_structp png_ptr, png_ - error_data->drawable->width, num); - } - -+#if (PNG_LIBPNG_VER < 10500) - longjmp (png_ptr->jmpbuf, 1); -+#else -+ png_longjmp (png_ptr, 1); -+#endif - } - - /* -@@ -697,7 +701,7 @@ load_image (const gchar *filename, - pp = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - info = png_create_info_struct (pp); - -- if (setjmp (pp->jmpbuf)) -+ if (setjmp (png_jmpbuf(pp))) - { - g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Error while reading '%s'. File corrupted?"), -@@ -738,17 +742,17 @@ load_image (const gchar *filename, - * Latest attempt, this should be my best yet :) - */ - -- if (info->bit_depth == 16) -+ if (png_get_bit_depth(pp, info) == 16) - { - png_set_strip_16 (pp); - } - -- if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) -+ if (png_get_color_type(pp, info) == PNG_COLOR_TYPE_GRAY && png_get_bit_depth(pp, info) < 8) - { - png_set_expand (pp); - } - -- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) -+ if (png_get_color_type(pp, info) == PNG_COLOR_TYPE_PALETTE && png_get_bit_depth(pp, info) < 8) - { - png_set_packing (pp); - } -@@ -757,8 +761,8 @@ load_image (const gchar *filename, - * Expand G+tRNS to GA, RGB+tRNS to RGBA - */ - -- if (info->color_type != PNG_COLOR_TYPE_PALETTE && -- (info->valid & PNG_INFO_tRNS)) -+ if (png_get_color_type(pp, info) != PNG_COLOR_TYPE_PALETTE && -+ png_get_valid(pp, info, PNG_INFO_tRNS) != 0) - { - png_set_expand (pp); - } -@@ -775,7 +779,7 @@ load_image (const gchar *filename, - */ - - if (png_get_valid (pp, info, PNG_INFO_tRNS) && -- info->color_type == PNG_COLOR_TYPE_PALETTE) -+ png_get_color_type(pp, info) == PNG_COLOR_TYPE_PALETTE) - { - png_get_tRNS (pp, info, &alpha_ptr, &num, NULL); - /* Copy the existing alpha values from the tRNS chunk */ -@@ -797,7 +801,7 @@ load_image (const gchar *filename, - - png_read_update_info (pp, info); - -- switch (info->color_type) -+ switch (png_get_color_type(pp, info)) - { - case PNG_COLOR_TYPE_RGB: /* RGB */ - bpp = 3; -@@ -836,7 +840,7 @@ load_image (const gchar *filename, - return -1; - } - -- image = gimp_image_new (info->width, info->height, image_type); -+ image = gimp_image_new (png_get_image_width(pp, info), png_get_image_height(pp, info), image_type); - if (image == -1) - { - g_set_error (error, 0, 0, -@@ -849,7 +853,7 @@ load_image (const gchar *filename, - * Create the "background" layer to hold the image... - */ - -- layer = gimp_layer_new (image, _("Background"), info->width, info->height, -+ layer = gimp_layer_new (image, _("Background"), png_get_image_width(pp, info), png_get_image_height(pp, info), - layer_type, 100, GIMP_NORMAL_MODE); - gimp_image_add_layer (image, layer, 0); - -@@ -883,7 +887,7 @@ load_image (const gchar *filename, - - gimp_layer_set_offsets (layer, offset_x, offset_y); - -- if ((abs (offset_x) > info->width) || (abs (offset_y) > info->height)) -+ if ((abs (offset_x) > png_get_image_width(pp, info)) || (abs (offset_y) > png_get_image_height(pp, info))) - { - if (interactive) - g_message (_("The PNG file specifies an offset that caused " -@@ -938,23 +942,27 @@ load_image (const gchar *filename, - - empty = 0; /* by default assume no full transparent palette entries */ - -- if (info->color_type & PNG_COLOR_MASK_PALETTE) -+ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE) - { -+ png_colorp palette; -+ int num_palette; -+ png_get_PLTE(pp, info, &palette, &num_palette); -+ - if (png_get_valid (pp, info, PNG_INFO_tRNS)) - { - for (empty = 0; empty < 256 && alpha[empty] == 0; ++empty) - /* Calculates number of fully transparent "empty" entries */; - - /* keep at least one entry */ -- empty = MIN (empty, info->num_palette - 1); -+ empty = MIN (empty, num_palette - 1); - -- gimp_image_set_colormap (image, (guchar *) (info->palette + empty), -- info->num_palette - empty); -+ gimp_image_set_colormap (image, (guchar *) (palette + empty), -+ num_palette - empty); - } - else - { -- gimp_image_set_colormap (image, (guchar *) info->palette, -- info->num_palette); -+ gimp_image_set_colormap (image, (guchar *) palette, -+ num_palette); - } - } - -@@ -972,18 +980,18 @@ load_image (const gchar *filename, - */ - - tile_height = gimp_tile_height (); -- pixel = g_new0 (guchar, tile_height * info->width * bpp); -+ pixel = g_new0 (guchar, tile_height * png_get_image_width(pp, info) * bpp); - pixels = g_new (guchar *, tile_height); - - for (i = 0; i < tile_height; i++) -- pixels[i] = pixel + info->width * info->channels * i; -+ pixels[i] = pixel + png_get_image_width(pp, info) * png_get_channels(pp, info) * i; - - /* Install our own error handler to handle incomplete PNG files better */ - error_data.drawable = drawable; - error_data.pixel = pixel; - error_data.tile_height = tile_height; -- error_data.width = info->width; -- error_data.height = info->height; -+ error_data.width = png_get_image_width(pp, info); -+ error_data.height = png_get_image_height(pp, info); - error_data.bpp = bpp; - error_data.pixel_rgn = &pixel_rgn; - -@@ -996,10 +1004,10 @@ load_image (const gchar *filename, - */ - - for (begin = 0, end = tile_height; -- begin < info->height; begin += tile_height, end += tile_height) -+ begin < png_get_image_height(pp, info); begin += tile_height, end += tile_height) - { -- if (end > info->height) -- end = info->height; -+ if (end > png_get_image_height(pp, info)) -+ end = png_get_image_height(pp, info); - - num = end - begin; - -@@ -1016,10 +1024,10 @@ load_image (const gchar *filename, - gimp_pixel_rgn_set_rect (&pixel_rgn, pixel, 0, begin, - drawable->width, num); - -- memset (pixel, 0, tile_height * info->width * bpp); -+ memset (pixel, 0, tile_height * png_get_image_width(pp, info) * bpp); - - gimp_progress_update (((gdouble) pass + -- (gdouble) end / (gdouble) info->height) / -+ (gdouble) end / (gdouble) png_get_image_height(pp, info)) / - (gdouble) num_passes); - } - } -@@ -1072,7 +1080,8 @@ load_image (const gchar *filename, - - { - png_uint_32 proflen; -- png_charp profname, profile; -+ png_charp profname; -+ png_bytep profile; - int profcomp; - - if (png_get_iCCP (pp, info, &profname, &profcomp, &profile, &proflen)) -@@ -1200,6 +1209,8 @@ save_image (const gchar *filename, - guchar red, green, blue; /* Used for palette background */ - time_t cutime; /* Time since epoch */ - struct tm *gmt; /* GMT broken down */ -+ int color_type; /* type of colors in image */ -+ int bit_depth; /* width of colors in bit */ - - guchar remap[256]; /* Re-mapping for the palette */ - -@@ -1208,7 +1219,9 @@ save_image (const gchar *filename, - if (pngvals.comment) - { - GimpParasite *parasite; -+#ifndef PNG_iTXt_SUPPORTED - gsize text_length = 0; -+#endif - - parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment"); - if (parasite) -@@ -1249,7 +1262,7 @@ save_image (const gchar *filename, - pp = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - info = png_create_info_struct (pp); - -- if (setjmp (pp->jmpbuf)) -+ if (setjmp (png_jmpbuf(pp))) - { - g_set_error (error, 0, 0, - _("Error while saving '%s'. Could not save image."), -@@ -1291,11 +1304,6 @@ save_image (const gchar *filename, - - png_set_compression_level (pp, pngvals.compression_level); - -- info->width = drawable->width; -- info->height = drawable->height; -- info->bit_depth = 8; -- info->interlace_type = pngvals.interlaced; -- - /* - * Initialise remap[] - */ -@@ -1304,44 +1312,48 @@ save_image (const gchar *filename, - - /* - * Set color type and remember bytes per pixel count -+ * Also fix bit depths for (possibly) smaller colormap images - */ - -+ bit_depth = 8; -+ - switch (type) - { - case GIMP_RGB_IMAGE: -- info->color_type = PNG_COLOR_TYPE_RGB; -+ color_type = PNG_COLOR_TYPE_RGB; - bpp = 3; - break; - - case GIMP_RGBA_IMAGE: -- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; - bpp = 4; - break; - - case GIMP_GRAY_IMAGE: -- info->color_type = PNG_COLOR_TYPE_GRAY; -+ color_type = PNG_COLOR_TYPE_GRAY; - bpp = 1; - break; - - case GIMP_GRAYA_IMAGE: -- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; - bpp = 2; - break; - - case GIMP_INDEXED_IMAGE: -+ case GIMP_INDEXEDA_IMAGE: - bpp = 1; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -- info->valid |= PNG_INFO_PLTE; -- info->palette = -- (png_colorp) gimp_image_get_colormap (image_ID, &num_colors); -- info->num_palette = num_colors; -- break; -+ if (type == GIMP_INDEXEDA_IMAGE) -+ bpp = 2; - -- case GIMP_INDEXEDA_IMAGE: -- bpp = 2; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -- /* fix up transparency */ -- respin_cmap (pp, info, remap, image_ID, drawable); -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ gimp_image_get_colormap (image_ID, &num_colors); -+ if (num_colors <= 2) -+ bit_depth = 1; -+ else if (num_colors <= 4) -+ bit_depth = 2; -+ else if (num_colors <= 16) -+ bit_depth = 4; -+ /* otherwise the default is fine */ - break; - - default: -@@ -1349,19 +1361,14 @@ save_image (const gchar *filename, - return FALSE; - } - -- /* -- * Fix bit depths for (possibly) smaller colormap images -- */ -+ png_set_IHDR(pp, info, drawable->width, drawable->height, bit_depth, color_type, pngvals.interlaced ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - -- if (info->valid & PNG_INFO_PLTE) -+ if (type == GIMP_INDEXED_IMAGE) -+ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_colormap (image_ID, &num_colors), num_colors); -+ else if (type == GIMP_INDEXEDA_IMAGE) - { -- if (info->num_palette <= 2) -- info->bit_depth = 1; -- else if (info->num_palette <= 4) -- info->bit_depth = 2; -- else if (info->num_palette <= 16) -- info->bit_depth = 4; -- /* otherwise the default is fine */ -+ /* fix up transparency */ -+ respin_cmap (pp, info, remap, image_ID, drawable); - } - - /* All this stuff is optional extras, if the user is aiming for smallest -@@ -1477,7 +1484,7 @@ save_image (const gchar *filename, - * Convert unpacked pixels to packed if necessary - */ - -- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) -+ if (png_get_color_type(pp, info) == PNG_COLOR_TYPE_PALETTE && png_get_bit_depth(pp, info) < 8) - png_set_packing (pp); - - /* -@@ -1529,7 +1536,7 @@ save_image (const gchar *filename, - - /* If we're dealing with a paletted image with - * transparency set, write out the remapped palette */ -- if (info->valid & PNG_INFO_tRNS) -+ if (png_get_valid(pp, info, PNG_INFO_tRNS)) - { - guchar inverse_remap[256]; - -@@ -1549,7 +1556,7 @@ save_image (const gchar *filename, - } - /* Otherwise if we have a paletted image and transparency - * couldn't be set, we ignore the alpha channel */ -- else if (info->valid & PNG_INFO_PLTE && bpp == 2) -+ else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) - { - for (i = 0; i < num; ++i) - { -@@ -1564,7 +1571,7 @@ save_image (const gchar *filename, - png_write_rows (pp, pixels, num); - - gimp_progress_update (((double) pass + (double) end / -- (double) info->height) / -+ (double) png_get_image_height(pp, info)) / - (double) num_passes); - } - } diff --git a/media-gfx/gimp/files/gimp-libpng15.diff b/media-gfx/gimp/files/gimp-libpng15.diff deleted file mode 100644 index beead91b0398..000000000000 --- a/media-gfx/gimp/files/gimp-libpng15.diff +++ /dev/null @@ -1,489 +0,0 @@ -diff -Naur gimp-2.6.11/plug-ins/common/file-mng.c gimp-2.6.11-libpng//plug-ins/common/file-mng.c ---- gimp-2.6.11/plug-ins/common/file-mng.c 2010-07-03 00:51:56.000000000 +0200 -+++ gimp-2.6.11-libpng//plug-ins/common/file-mng.c 2011-02-16 11:59:21.238641008 +0100 -@@ -799,6 +799,13 @@ - png_infop png_info_ptr; - FILE *infile, *outfile; - int num_passes; -+ int color_type; -+ png_colorp palette; -+ int num_palette; -+ int bit_depth; -+ png_bytep trans_alpha; -+ int num_trans; -+ png_color_16p trans_color; - int tile_height; - guchar **layer_pixels, *layer_pixel; - int pass, j, k, begin, end, num; -@@ -969,7 +976,7 @@ - goto err3; - } - -- if (setjmp (png_ptr->jmpbuf) != 0) -+ if (setjmp (png_jmpbuf(png_ptr)) != 0) - { - g_warning ("HRM saving PNG in mng_save_image()"); - png_destroy_write_struct (&png_ptr, &png_info_ptr); -@@ -981,34 +988,27 @@ - png_init_io (png_ptr, outfile); - png_set_compression_level (png_ptr, mng_data.compression_level); - -- png_info_ptr->width = layer_cols; -- png_info_ptr->height = layer_rows; -- png_info_ptr->interlace_type = (mng_data.interlaced == 0 ? 0 : 1); -- png_info_ptr->bit_depth = 8; -- - switch (layer_drawable_type) - { - case GIMP_RGB_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_RGB; -+ color_type = PNG_COLOR_TYPE_RGB; - break; - case GIMP_RGBA_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; - break; - case GIMP_GRAY_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_GRAY; -+ color_type = PNG_COLOR_TYPE_GRAY; - break; - case GIMP_GRAYA_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; - break; - case GIMP_INDEXED_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; -- png_info_ptr->valid |= PNG_INFO_PLTE; -- png_info_ptr->palette = -- (png_colorp) gimp_image_get_colormap (image_id, &num_colors); -- png_info_ptr->num_palette = num_colors; -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ -+ png_set_PLTE(png_ptr, png_info_ptr, (png_colorp) gimp_image_get_colormap (image_id, &num_colors), num_colors); - break; - case GIMP_INDEXEDA_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; -+ color_type = PNG_COLOR_TYPE_PALETTE; - layer_has_unique_palette = - respin_cmap (png_ptr, png_info_ptr, layer_remap, - image_id, layer_drawable); -@@ -1021,15 +1021,17 @@ - goto err3; - } - -- if ((png_info_ptr->valid & PNG_INFO_PLTE) == PNG_INFO_PLTE) -+ bit_depth = 8; -+ if (png_get_PLTE(png_ptr, png_info_ptr, &palette, &num_palette) != 0) - { -- if (png_info_ptr->num_palette <= 2) -- png_info_ptr->bit_depth = 1; -- else if (png_info_ptr->num_palette <= 4) -- png_info_ptr->bit_depth = 2; -- else if (png_info_ptr->num_palette <= 16) -- png_info_ptr->bit_depth = 4; -+ if (num_palette <= 2) -+ bit_depth = 1; -+ else if (num_palette <= 4) -+ bit_depth = 2; -+ else if (num_palette <= 16) -+ bit_depth = 4; - } -+ png_set_IHDR(png_ptr, png_info_ptr, layer_cols, layer_rows, bit_depth, color_type, (mng_data.interlaced == 0 ? PNG_INTERLACE_NONE : PNG_INTERLACE_ADAM7), PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); - - png_write_info (png_ptr, png_info_ptr); - -@@ -1038,8 +1040,8 @@ - else - num_passes = 1; - -- if ((png_info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) && -- (png_info_ptr->bit_depth < 8)) -+ if ((png_get_color_type(png_ptr, png_info_ptr) == PNG_COLOR_TYPE_PALETTE) && -+ (png_get_bit_depth(png_ptr, png_info_ptr) < 8)) - png_set_packing (png_ptr); - - tile_height = gimp_tile_height (); -@@ -1065,7 +1067,7 @@ - gimp_pixel_rgn_get_rect (&layer_pixel_rgn, layer_pixel, 0, - begin, layer_cols, num); - -- if ((png_info_ptr->valid & PNG_INFO_tRNS) == PNG_INFO_tRNS) -+ if (png_get_tRNS(png_ptr, png_info_ptr, &trans_alpha, &num_trans, &trans_color) != 0) - { - for (j = 0; j < num; j++) - { -@@ -1077,7 +1079,7 @@ - } - } - else -- if (((png_info_ptr->valid & PNG_INFO_PLTE) == PNG_INFO_PLTE) -+ if ((png_get_PLTE(png_ptr, png_info_ptr, &palette, &num_palette) != 0) - && (layer_bpp == 2)) - { - for (j = 0; j < num; j++) -diff -Naur gimp-2.6.11/plug-ins/common/file-png.c gimp-2.6.11-libpng//plug-ins/common/file-png.c ---- gimp-2.6.11/plug-ins/common/file-png.c 2010-07-13 22:22:27.000000000 +0200 -+++ gimp-2.6.11-libpng//plug-ins/common/file-png.c 2011-02-16 11:59:13.465685257 +0100 -@@ -653,7 +653,11 @@ - error_data->drawable->width, num); - } - -+#if (PNG_LIBPNG_VER < 10500) - longjmp (png_ptr->jmpbuf, 1); -+#else -+ png_longjmp (png_ptr, 1); -+#endif - } - - /* -@@ -697,7 +701,7 @@ - pp = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - info = png_create_info_struct (pp); - -- if (setjmp (pp->jmpbuf)) -+ if (setjmp (png_jmpbuf(pp))) - { - g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Error while reading '%s'. File corrupted?"), -@@ -738,17 +742,19 @@ - * Latest attempt, this should be my best yet :) - */ - -- if (info->bit_depth == 16) -+ if (png_get_bit_depth(pp, info) == 16) - { - png_set_strip_16 (pp); - } - -- if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) -+ if (png_get_color_type(pp, info) == PNG_COLOR_TYPE_GRAY && -+ png_get_bit_depth(pp, info) < 8) - { - png_set_expand (pp); - } - -- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) -+ if (png_get_color_type(pp, info) == PNG_COLOR_TYPE_PALETTE && -+ png_get_bit_depth(pp, info) < 8) - { - png_set_packing (pp); - } -@@ -757,8 +763,8 @@ - * Expand G+tRNS to GA, RGB+tRNS to RGBA - */ - -- if (info->color_type != PNG_COLOR_TYPE_PALETTE && -- (info->valid & PNG_INFO_tRNS)) -+ if (png_get_color_type(pp, info) != PNG_COLOR_TYPE_PALETTE && -+ png_get_valid(pp, info, PNG_INFO_tRNS) != 0) - { - png_set_expand (pp); - } -@@ -775,7 +781,7 @@ - */ - - if (png_get_valid (pp, info, PNG_INFO_tRNS) && -- info->color_type == PNG_COLOR_TYPE_PALETTE) -+ png_get_color_type(pp, info) == PNG_COLOR_TYPE_PALETTE) - { - png_get_tRNS (pp, info, &alpha_ptr, &num, NULL); - /* Copy the existing alpha values from the tRNS chunk */ -@@ -797,7 +803,7 @@ - - png_read_update_info (pp, info); - -- switch (info->color_type) -+ switch (png_get_color_type(pp, info)) - { - case PNG_COLOR_TYPE_RGB: /* RGB */ - bpp = 3; -@@ -836,7 +842,9 @@ - return -1; - } - -- image = gimp_image_new (info->width, info->height, image_type); -+ image = gimp_image_new (png_get_image_width(pp, info), -+ png_get_image_height(pp, info), -+ image_type); - if (image == -1) - { - g_set_error (error, 0, 0, -@@ -849,7 +857,9 @@ - * Create the "background" layer to hold the image... - */ - -- layer = gimp_layer_new (image, _("Background"), info->width, info->height, -+ layer = gimp_layer_new (image, _("Background"), -+ png_get_image_width(pp, info), -+ png_get_image_height(pp, info), - layer_type, 100, GIMP_NORMAL_MODE); - gimp_image_add_layer (image, layer, 0); - -@@ -883,7 +893,8 @@ - - gimp_layer_set_offsets (layer, offset_x, offset_y); - -- if ((abs (offset_x) > info->width) || (abs (offset_y) > info->height)) -+ if ((abs (offset_x) > png_get_image_width(pp, info)) || -+ (abs (offset_y) > png_get_image_height(pp, info))) - { - if (interactive) - g_message (_("The PNG file specifies an offset that caused " -@@ -938,23 +949,27 @@ - - empty = 0; /* by default assume no full transparent palette entries */ - -- if (info->color_type & PNG_COLOR_MASK_PALETTE) -+ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE) - { -+ png_colorp palette; -+ int num_palette; -+ png_get_PLTE(pp, info, &palette, &num_palette); -+ - if (png_get_valid (pp, info, PNG_INFO_tRNS)) - { - for (empty = 0; empty < 256 && alpha[empty] == 0; ++empty) - /* Calculates number of fully transparent "empty" entries */; - - /* keep at least one entry */ -- empty = MIN (empty, info->num_palette - 1); -+ empty = MIN (empty, num_palette - 1); - -- gimp_image_set_colormap (image, (guchar *) (info->palette + empty), -- info->num_palette - empty); -+ gimp_image_set_colormap (image, (guchar *) (palette + empty), -+ num_palette - empty); - } - else - { -- gimp_image_set_colormap (image, (guchar *) info->palette, -- info->num_palette); -+ gimp_image_set_colormap (image, (guchar *) palette, -+ num_palette); - } - } - -@@ -972,18 +987,20 @@ - */ - - tile_height = gimp_tile_height (); -- pixel = g_new0 (guchar, tile_height * info->width * bpp); -+ pixel = g_new0 (guchar, tile_height * png_get_image_width(pp, info) * bpp); - pixels = g_new (guchar *, tile_height); - - for (i = 0; i < tile_height; i++) -- pixels[i] = pixel + info->width * info->channels * i; -+ pixels[i] = pixel + (png_get_image_width(pp, info) * -+ png_get_channels(pp, info) * -+ i); - - /* Install our own error handler to handle incomplete PNG files better */ - error_data.drawable = drawable; - error_data.pixel = pixel; - error_data.tile_height = tile_height; -- error_data.width = info->width; -- error_data.height = info->height; -+ error_data.width = png_get_image_width(pp, info); -+ error_data.height = png_get_image_height(pp, info); - error_data.bpp = bpp; - error_data.pixel_rgn = &pixel_rgn; - -@@ -996,10 +1013,11 @@ - */ - - for (begin = 0, end = tile_height; -- begin < info->height; begin += tile_height, end += tile_height) -+ begin < png_get_image_height(pp, info); -+ begin += tile_height, end += tile_height) - { -- if (end > info->height) -- end = info->height; -+ if (end > png_get_image_height(pp, info)) -+ end = png_get_image_height(pp, info); - - num = end - begin; - -@@ -1016,10 +1034,11 @@ - gimp_pixel_rgn_set_rect (&pixel_rgn, pixel, 0, begin, - drawable->width, num); - -- memset (pixel, 0, tile_height * info->width * bpp); -+ memset (pixel, 0, tile_height * png_get_image_width(pp, info) * bpp); - - gimp_progress_update (((gdouble) pass + -- (gdouble) end / (gdouble) info->height) / -+ (gdouble) end / -+ (gdouble) png_get_image_height(pp, info)) / - (gdouble) num_passes); - } - } -@@ -1072,7 +1091,8 @@ - - { - png_uint_32 proflen; -- png_charp profname, profile; -+ png_charp profname; -+ png_bytep profile; - int profcomp; - - if (png_get_iCCP (pp, info, &profname, &profcomp, &profile, &proflen)) -@@ -1200,6 +1220,8 @@ - guchar red, green, blue; /* Used for palette background */ - time_t cutime; /* Time since epoch */ - struct tm *gmt; /* GMT broken down */ -+ int color_type; /* type of colors in image */ -+ int bit_depth; /* width of colors in bit */ - - guchar remap[256]; /* Re-mapping for the palette */ - -@@ -1208,7 +1230,9 @@ - if (pngvals.comment) - { - GimpParasite *parasite; -+#ifndef PNG_iTXt_SUPPORTED - gsize text_length = 0; -+#endif - - parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment"); - if (parasite) -@@ -1249,7 +1273,7 @@ - pp = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - info = png_create_info_struct (pp); - -- if (setjmp (pp->jmpbuf)) -+ if (setjmp (png_jmpbuf(pp))) - { - g_set_error (error, 0, 0, - _("Error while saving '%s'. Could not save image."), -@@ -1291,11 +1315,6 @@ - - png_set_compression_level (pp, pngvals.compression_level); - -- info->width = drawable->width; -- info->height = drawable->height; -- info->bit_depth = 8; -- info->interlace_type = pngvals.interlaced; -- - /* - * Initialise remap[] - */ -@@ -1309,37 +1328,36 @@ - switch (type) - { - case GIMP_RGB_IMAGE: -- info->color_type = PNG_COLOR_TYPE_RGB; -+ color_type = PNG_COLOR_TYPE_RGB; - bpp = 3; - break; - - case GIMP_RGBA_IMAGE: -- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; - bpp = 4; - break; - - case GIMP_GRAY_IMAGE: -- info->color_type = PNG_COLOR_TYPE_GRAY; -+ color_type = PNG_COLOR_TYPE_GRAY; - bpp = 1; - break; - - case GIMP_GRAYA_IMAGE: -- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; - bpp = 2; - break; - - case GIMP_INDEXED_IMAGE: - bpp = 1; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -- info->valid |= PNG_INFO_PLTE; -- info->palette = -- (png_colorp) gimp_image_get_colormap (image_ID, &num_colors); -- info->num_palette = num_colors; -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ png_set_PLTE(pp, info, -+ (png_colorp) gimp_image_get_colormap (image_ID, &num_colors), -+ num_colors); - break; - - case GIMP_INDEXEDA_IMAGE: - bpp = 2; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -+ color_type = PNG_COLOR_TYPE_PALETTE; - /* fix up transparency */ - respin_cmap (pp, info, remap, image_ID, drawable); - break; -@@ -1353,17 +1371,28 @@ - * Fix bit depths for (possibly) smaller colormap images - */ - -- if (info->valid & PNG_INFO_PLTE) -+ bit_depth = 8; -+ -+ if (png_get_valid(pp, info, PNG_INFO_PLTE)) - { -- if (info->num_palette <= 2) -- info->bit_depth = 1; -- else if (info->num_palette <= 4) -- info->bit_depth = 2; -- else if (info->num_palette <= 16) -- info->bit_depth = 4; -+ png_colorp palette; -+ int num_palette; -+ png_get_PLTE(pp, info, &palette, &num_palette); -+ -+ if (num_palette <= 2) -+ bit_depth = 1; -+ else if (num_palette <= 4) -+ bit_depth = 2; -+ else if (num_palette <= 16) -+ bit_depth = 4; - /* otherwise the default is fine */ - } - -+ png_set_IHDR(pp, info, -+ drawable->width, drawable->height, bit_depth, color_type, -+ pngvals.interlaced ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE, -+ PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); -+ - /* All this stuff is optional extras, if the user is aiming for smallest - possible file size she can turn them all off */ - -@@ -1477,7 +1506,8 @@ - * Convert unpacked pixels to packed if necessary - */ - -- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) -+ if (png_get_color_type(pp, info) == -+ PNG_COLOR_TYPE_PALETTE && png_get_bit_depth(pp, info) < 8) - png_set_packing (pp); - - /* -@@ -1529,7 +1559,7 @@ - - /* If we're dealing with a paletted image with - * transparency set, write out the remapped palette */ -- if (info->valid & PNG_INFO_tRNS) -+ if (png_get_valid(pp, info, PNG_INFO_tRNS)) - { - guchar inverse_remap[256]; - -@@ -1549,7 +1579,7 @@ - } - /* Otherwise if we have a paletted image and transparency - * couldn't be set, we ignore the alpha channel */ -- else if (info->valid & PNG_INFO_PLTE && bpp == 2) -+ else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) - { - for (i = 0; i < num; ++i) - { -@@ -1564,7 +1594,7 @@ - png_write_rows (pp, pixels, num); - - gimp_progress_update (((double) pass + (double) end / -- (double) info->height) / -+ (double) png_get_image_height(pp, info)) / - (double) num_passes); - } - } diff --git a/media-gfx/gimp/gimp-2.8.8.ebuild b/media-gfx/gimp/gimp-2.8.10-r1.ebuild index 420614edd570..33c8d6bec145 100644 --- a/media-gfx/gimp/gimp-2.8.8.ebuild +++ b/media-gfx/gimp/gimp-2.8.10-r1.ebuild @@ -1,15 +1,16 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.8.ebuild,v 1.1 2013/11/04 16:27:37 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r1.ebuild,v 1.1 2013/12/10 09:12:09 polynomial-c Exp $ -EAPI="3" -PYTHON_DEPEND="python? 2:2.5" +EAPI=5 +PYTHON_COMPAT=( python2_{6,7} ) -inherit versionator autotools eutils gnome2 fdo-mime multilib python +inherit versionator autotools eutils gnome2 fdo-mime multilib python-single-r1 DESCRIPTION="GNU Image Manipulation Program" HOMEPAGE="http://www.gimp.org/" -SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2" +SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2 + https://git.gnome.org/browse/gimp/patch/?id=6c73f28b6d87a2afd11974552a075bffec52347f -> ${P}-freetype251.patch" LICENSE="GPL-3 LGPL-3" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" @@ -45,11 +46,14 @@ RDEPEND=">=dev-libs/glib-2.30.2:2 jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) - lcms? ( >=media-libs/lcms-1.16:0 ) + lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) - python? ( >=dev-python/pygtk-2.10.4:2 ) + python? ( + ${PYTHON_DEPS} + >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] + ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) @@ -72,6 +76,8 @@ DOCS="AUTHORS ChangeLog* HACKING NEWS README*" S="${WORKDIR}"/${P} +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + pkg_setup() { G2CONF="--enable-default-binary \ --disable-silent-rules \ @@ -87,7 +93,7 @@ pkg_setup() { $(use_with jpeg libjpeg) \ $(use_with jpeg2k libjasper) \ $(use_with exif libexif) \ - $(use_with lcms lcms lcms1) \ + $(use_with lcms lcms lcms2) \ $(use_with postscript gs) \ $(use_enable mmx) \ $(use_with mng libmng) \ @@ -105,16 +111,15 @@ pkg_setup() { --without-xvfb-run" if use python; then - python_set_active_version 2 - python_pkg_setup + python-single-r1_pkg_setup fi } src_prepare() { epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch # bug 395695, comment 9 and 16 + epatch "${DISTDIR}"/${P}-freetype251.patch # bug #493466 eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too - echo '#!/bin/sh' > py-compile gnome2_src_prepare } @@ -133,15 +138,14 @@ src_install() { gnome2_src_install if use python; then - python_convert_shebangs -r $(python_get_version) "${ED}" - python_need_rebuild + python_optimize fi # Workaround for bug #321111 to give GIMP the least # precedence on PDF documents by default mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - find "${ED}" -name '*.la' -delete || die + prune_libtool_files --all # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) local gimp_app_version=$(get_version_component_range 1-2) @@ -152,14 +156,8 @@ src_install() { pkg_postinst() { gnome2_pkg_postinst - - use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \ - /usr/$(get_libdir)/gimp/2.0/plug-ins } pkg_postrm() { gnome2_pkg_postrm - - use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \ - /usr/$(get_libdir)/gimp/2.0/plug-ins } diff --git a/media-gfx/gimp/gimp-2.8.2-r1.ebuild b/media-gfx/gimp/gimp-2.8.2-r1.ebuild deleted file mode 100644 index e63f8a667643..000000000000 --- a/media-gfx/gimp/gimp-2.8.2-r1.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.2-r1.ebuild,v 1.2 2012/12/11 05:43:44 patrick Exp $ - -EAPI="3" -PYTHON_DEPEND="python? 2:2.5" - -inherit versionator autotools eutils gnome2 fdo-mime multilib python - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="http://www.gimp.org/" -SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2" -LICENSE="GPL-3 LGPL-3" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" -IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm" - -for lang in ${LANGS}; do - IUSE+=" linguas_${lang}" -done - -RDEPEND=">=dev-libs/glib-2.30.2:2 - >=dev-libs/atk-2.2.0 - >=x11-libs/gtk+-2.24.10:2 - >=x11-libs/gdk-pixbuf-2.24.1:2 - >=x11-libs/cairo-1.10.2 - >=x11-libs/pango-1.29.4 - xpm? ( x11-libs/libXpm ) - >=media-libs/freetype-2.1.7 - >=media-libs/fontconfig-2.2.0 - sys-libs/zlib - dev-libs/libxml2 - dev-libs/libxslt - x11-themes/hicolor-icon-theme - >=media-libs/babl-0.1.10 - >=media-libs/gegl-0.2.0 - aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) - curl? ( net-misc/curl ) - dbus? ( dev-libs/dbus-glib ) - gnome? ( gnome-base/gvfs ) - webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/jasper ) - exif? ( >=media-libs/libexif-0.6.15 ) - lcms? ( >=media-libs/lcms-1.16:0 ) - mng? ( media-libs/libmng ) - pdf? ( >=app-text/poppler-0.12.4[cairo] ) - png? ( >=media-libs/libpng-1.2.37:0 ) - python? ( >=dev-python/pygtk-2.10.4:2 ) - tiff? ( >=media-libs/tiff-3.5.7:0 ) - svg? ( >=gnome-base/librsvg-2.36.0:2 ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - x11-libs/libXcursor - sys-libs/zlib - bzip2? ( app-arch/bzip2 ) - postscript? ( app-text/ghostscript-gpl ) - udev? ( virtual/udev[gudev] )" -DEPEND="${RDEPEND} - sys-apps/findutils - virtual/pkgconfig - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.17 - doc? ( >=dev-util/gtk-doc-1 ) - >=sys-devel/libtool-2.2 - >=sys-devel/automake-1.11 - dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453) - -DOCS="AUTHORS ChangeLog* HACKING NEWS README*" - -S="${WORKDIR}"/${P} - -pkg_setup() { - G2CONF="--enable-default-binary \ - --with-x \ - --disable-silent-rules \ - $(use_with aalib aa) \ - $(use_with alsa) \ - $(use_enable altivec) \ - $(use_with bzip2) \ - $(use_with curl libcurl) \ - $(use_with dbus) \ - $(use_with gnome gvfs) \ - $(use_with webkit) \ - $(use_with jpeg libjpeg) \ - $(use_with jpeg2k libjasper) \ - $(use_with exif libexif) \ - $(use_with lcms) \ - $(use_with postscript gs) \ - $(use_enable mmx) \ - $(use_with mng libmng) \ - $(use_with pdf poppler) \ - $(use_with png libpng) \ - $(use_enable python) \ - $(use_enable smp mp) \ - $(use_enable sse) \ - $(use_with svg librsvg) \ - $(use_with tiff libtiff) \ - $(use_with udev gudev) \ - $(use_with wmf) \ - --with-xmc \ - $(use_with xpm libxpm) \ - --without-xvfb-run" - - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - # https://bugs.gentoo.org/show_bug.cgi?id=444280 - epatch "${FILESDIR}"/${P}-xwd-file-security.patch - - epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch # bug 395695, comment 9 and 16 - eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too - - echo '#!/bin/sh' > py-compile - gnome2_src_prepare -} - -_clean_up_locales() { - einfo "Cleaning up locales..." - for lang in ${LANGS}; do - use "linguas_${lang}" && { - einfo "- keeping ${lang}" - continue - } - rm -Rf "${D}"/usr/share/locale/"${lang}" || die - done -} - -src_install() { - gnome2_src_install - - if use python; then - python_convert_shebangs -r $(python_get_version) "${ED}" - python_need_rebuild - fi - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die - - find "${D}" -name '*.la' -delete || die - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - local gimp_app_version=$(get_version_component_range 1-2) - mv "${D}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - _clean_up_locales -} - -pkg_postinst() { - gnome2_pkg_postinst - - use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \ - /usr/$(get_libdir)/gimp/2.0/plug-ins -} - -pkg_postrm() { - gnome2_pkg_postrm - - use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \ - /usr/$(get_libdir)/gimp/2.0/plug-ins -} diff --git a/media-gfx/gimp/gimp-2.8.2.ebuild b/media-gfx/gimp/gimp-2.8.2.ebuild deleted file mode 100644 index 8e89749d39ec..000000000000 --- a/media-gfx/gimp/gimp-2.8.2.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.2.ebuild,v 1.4 2012/12/11 05:43:44 patrick Exp $ - -EAPI="3" -PYTHON_DEPEND="python? 2:2.5" - -inherit versionator autotools eutils gnome2 fdo-mime multilib python - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="http://www.gimp.org/" -SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2" -LICENSE="GPL-3 LGPL-3" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" -IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm" - -for lang in ${LANGS}; do - IUSE+=" linguas_${lang}" -done - -RDEPEND=">=dev-libs/glib-2.30.2:2 - >=dev-libs/atk-2.2.0 - >=x11-libs/gtk+-2.24.10:2 - >=x11-libs/gdk-pixbuf-2.24.1:2 - >=x11-libs/cairo-1.10.2 - >=x11-libs/pango-1.29.4 - xpm? ( x11-libs/libXpm ) - >=media-libs/freetype-2.1.7 - >=media-libs/fontconfig-2.2.0 - sys-libs/zlib - dev-libs/libxml2 - dev-libs/libxslt - x11-themes/hicolor-icon-theme - >=media-libs/babl-0.1.10 - >=media-libs/gegl-0.2.0 - aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) - curl? ( net-misc/curl ) - dbus? ( dev-libs/dbus-glib ) - gnome? ( gnome-base/gvfs ) - webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/jasper ) - exif? ( >=media-libs/libexif-0.6.15 ) - lcms? ( >=media-libs/lcms-1.16:0 ) - mng? ( media-libs/libmng ) - pdf? ( >=app-text/poppler-0.12.4[cairo] ) - png? ( >=media-libs/libpng-1.2.37:0 ) - python? ( >=dev-python/pygtk-2.10.4:2 ) - tiff? ( >=media-libs/tiff-3.5.7:0 ) - svg? ( >=gnome-base/librsvg-2.36.0:2 ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - x11-libs/libXcursor - sys-libs/zlib - bzip2? ( app-arch/bzip2 ) - postscript? ( app-text/ghostscript-gpl ) - udev? ( virtual/udev[gudev] )" -DEPEND="${RDEPEND} - sys-apps/findutils - virtual/pkgconfig - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.17 - doc? ( >=dev-util/gtk-doc-1 ) - >=sys-devel/libtool-2.2 - >=sys-devel/automake-1.11 - dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453) - -DOCS="AUTHORS ChangeLog* HACKING NEWS README*" - -S="${WORKDIR}"/${P} - -pkg_setup() { - G2CONF="--enable-default-binary \ - --with-x \ - --disable-silent-rules \ - $(use_with aalib aa) \ - $(use_with alsa) \ - $(use_enable altivec) \ - $(use_with bzip2) \ - $(use_with curl libcurl) \ - $(use_with dbus) \ - $(use_with gnome gvfs) \ - $(use_with webkit) \ - $(use_with jpeg libjpeg) \ - $(use_with jpeg2k libjasper) \ - $(use_with exif libexif) \ - $(use_with lcms) \ - $(use_with postscript gs) \ - $(use_enable mmx) \ - $(use_with mng libmng) \ - $(use_with pdf poppler) \ - $(use_with png libpng) \ - $(use_enable python) \ - $(use_enable smp mp) \ - $(use_enable sse) \ - $(use_with svg librsvg) \ - $(use_with tiff libtiff) \ - $(use_with udev gudev) \ - $(use_with wmf) \ - --with-xmc \ - $(use_with xpm libxpm) \ - --without-xvfb-run" - - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch # bug 395695, comment 9 and 16 - eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too - - echo '#!/bin/sh' > py-compile - gnome2_src_prepare -} - -_clean_up_locales() { - einfo "Cleaning up locales..." - for lang in ${LANGS}; do - use "linguas_${lang}" && { - einfo "- keeping ${lang}" - continue - } - rm -Rf "${D}"/usr/share/locale/"${lang}" || die - done -} - -src_install() { - gnome2_src_install - - if use python; then - python_convert_shebangs -r $(python_get_version) "${ED}" - python_need_rebuild - fi - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die - - find "${D}" -name '*.la' -delete || die - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - local gimp_app_version=$(get_version_component_range 1-2) - mv "${D}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - _clean_up_locales -} - -pkg_postinst() { - gnome2_pkg_postinst - - use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \ - /usr/$(get_libdir)/gimp/2.0/plug-ins -} - -pkg_postrm() { - gnome2_pkg_postrm - - use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \ - /usr/$(get_libdir)/gimp/2.0/plug-ins -} diff --git a/media-gfx/gimp/gimp-2.8.4.ebuild b/media-gfx/gimp/gimp-2.8.4.ebuild deleted file mode 100644 index 97ca228464e1..000000000000 --- a/media-gfx/gimp/gimp-2.8.4.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.4.ebuild,v 1.3 2013/06/05 21:46:23 sping Exp $ - -EAPI="3" -PYTHON_DEPEND="python? 2:2.5" - -inherit versionator autotools eutils gnome2 fdo-mime multilib python - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="http://www.gimp.org/" -SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2" -LICENSE="GPL-3 LGPL-3" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~arm-linux ~x86-linux" - -LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" -IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm" - -for lang in ${LANGS}; do - IUSE+=" linguas_${lang}" -done - -RDEPEND=">=dev-libs/glib-2.30.2:2 - >=dev-libs/atk-2.2.0 - >=x11-libs/gtk+-2.24.10:2 - >=x11-libs/gdk-pixbuf-2.24.1:2 - >=x11-libs/cairo-1.10.2 - >=x11-libs/pango-1.29.4 - xpm? ( x11-libs/libXpm ) - >=media-libs/freetype-2.1.7 - >=media-libs/fontconfig-2.2.0 - sys-libs/zlib - dev-libs/libxml2 - dev-libs/libxslt - x11-themes/hicolor-icon-theme - >=media-libs/babl-0.1.10 - >=media-libs/gegl-0.2.0 - aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) - curl? ( net-misc/curl ) - dbus? ( dev-libs/dbus-glib ) - gnome? ( gnome-base/gvfs ) - webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/jasper ) - exif? ( >=media-libs/libexif-0.6.15 ) - lcms? ( >=media-libs/lcms-1.16:0 ) - mng? ( media-libs/libmng ) - pdf? ( >=app-text/poppler-0.12.4[cairo] ) - png? ( >=media-libs/libpng-1.2.37:0 ) - python? ( >=dev-python/pygtk-2.10.4:2 ) - tiff? ( >=media-libs/tiff-3.5.7:0 ) - svg? ( >=gnome-base/librsvg-2.36.0:2 ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - x11-libs/libXcursor - sys-libs/zlib - bzip2? ( app-arch/bzip2 ) - postscript? ( app-text/ghostscript-gpl ) - udev? ( virtual/udev[gudev] )" -DEPEND="${RDEPEND} - sys-apps/findutils - virtual/pkgconfig - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.17 - doc? ( >=dev-util/gtk-doc-1 ) - >=sys-devel/libtool-2.2 - >=sys-devel/automake-1.11 - dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453) - -DOCS="AUTHORS ChangeLog* HACKING NEWS README*" - -S="${WORKDIR}"/${P} - -pkg_setup() { - G2CONF="--enable-default-binary \ - --with-x \ - --disable-silent-rules \ - $(use_with aalib aa) \ - $(use_with alsa) \ - $(use_enable altivec) \ - $(use_with bzip2) \ - $(use_with curl libcurl) \ - $(use_with dbus) \ - $(use_with gnome gvfs) \ - $(use_with webkit) \ - $(use_with jpeg libjpeg) \ - $(use_with jpeg2k libjasper) \ - $(use_with exif libexif) \ - $(use_with lcms) \ - $(use_with postscript gs) \ - $(use_enable mmx) \ - $(use_with mng libmng) \ - $(use_with pdf poppler) \ - $(use_with png libpng) \ - $(use_enable python) \ - $(use_enable smp mp) \ - $(use_enable sse) \ - $(use_with svg librsvg) \ - $(use_with tiff libtiff) \ - $(use_with udev gudev) \ - $(use_with wmf) \ - --with-xmc \ - $(use_with xpm libxpm) \ - --without-xvfb-run" - - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch # bug 395695, comment 9 and 16 - epatch "${FILESDIR}"/${PN}-2.8.4-valid-desktop-file.patch # bug 433028 - eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too - - echo '#!/bin/sh' > py-compile - gnome2_src_prepare -} - -_clean_up_locales() { - einfo "Cleaning up locales..." - for lang in ${LANGS}; do - use "linguas_${lang}" && { - einfo "- keeping ${lang}" - continue - } - rm -Rf "${ED}"/usr/share/locale/"${lang}" || die - done -} - -src_install() { - gnome2_src_install - - if use python; then - python_convert_shebangs -r $(python_get_version) "${ED}" - python_need_rebuild - fi - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - - find "${ED}" -name '*.la' -delete || die - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - local gimp_app_version=$(get_version_component_range 1-2) - mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - _clean_up_locales -} - -pkg_postinst() { - gnome2_pkg_postinst - - use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \ - /usr/$(get_libdir)/gimp/2.0/plug-ins -} - -pkg_postrm() { - gnome2_pkg_postrm - - use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \ - /usr/$(get_libdir)/gimp/2.0/plug-ins -} |