Update to latest version, this will be the last 2.6.x version.
Ok ? Comments ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/gimp/stable/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- Makefile 3 Dec 2011 20:30:09 -0000 1.76
+++ Makefile 15 Feb 2012 16:30:56 -0000
@@ -2,8 +2,7 @@
COMMENT= GNU Image Manipulation Program
-DISTNAME= gimp-2.6.11
-REVISION= 5
+DISTNAME= gimp-2.6.12
SHARED_LIBS= gimp-2.0 271.0 \
gimpbase-2.0 271.0 \
@@ -73,7 +72,7 @@ MODULES= devel/gettext \
USE_GMAKE= Yes
USE_LIBTOOL= Yes
-AUTOCONF_VERSION= 2.67
+AUTOCONF_VERSION= 2.68
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+=--without-gvfs \
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/gimp/stable/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo 3 Dec 2010 16:33:59 -0000 1.28
+++ distinfo 15 Feb 2012 16:30:56 -0000
@@ -1,5 +1,5 @@
-MD5 (gimp-2.6.11.tar.bz2) = uyk5/hPlT8clXO9dCXu13Q==
-RMD160 (gimp-2.6.11.tar.bz2) = oRY3dJnljcK/4jGrPAV9C+lAkf8=
-SHA1 (gimp-2.6.11.tar.bz2) = L51ZbnJ72/ME+nglfBcx2frzk0w=
-SHA256 (gimp-2.6.11.tar.bz2) = m20I0IA7ORLqWW0bd7nCHuE3eMIziKIlwAS4wVh8sKE=
-SIZE (gimp-2.6.11.tar.bz2) = 16473561
+MD5 (gimp-2.6.12.tar.bz2) = n4du5joMSkyD9Q8y+zu+Yw==
+RMD160 (gimp-2.6.12.tar.bz2) = PHroY0dN6mcOrrkU4zO6a/UMf8w=
+SHA1 (gimp-2.6.12.tar.bz2) = gpZOPU6wAyOfNEOhvMrFP114DhU=
+SHA256 (gimp-2.6.12.tar.bz2) = 1VPJ8cB/Wfp7fOnMX4TOWb9OnftbbuS9hxi3S5R67GI=
+SIZE (gimp-2.6.12.tar.bz2) = 16745411
Index: patches/patch-app_main_c
===================================================================
RCS file: patches/patch-app_main_c
diff -N patches/patch-app_main_c
--- patches/patch-app_main_c 16 Apr 2011 07:47:04 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-app_main_c,v 1.1 2011/04/16 07:47:04 dcoppa Exp $
-
-Using G_OPTION_FLAG_NO_ARG with G_OPTION_ARG_NONE is not a valid
-combination and glib 2.28.2 warns about it.
-
-http://git.gnome.org/browse/gimp/commit/?id=b81276ca83e6ec4c7df32c8f611f441d1dfc59ad
-
---- app/main.c.orig Fri Apr 15 20:18:24 2011
-+++ app/main.c Fri Apr 15 20:19:15 2011
-@@ -240,7 +240,7 @@ static const GOptionEntry main_entries[] =
- N_("Debug in case of a crash (never|query|always)"), "<mode>"
- },
- {
-- "debug-handlers", 0, G_OPTION_FLAG_NO_ARG,
-+ "debug-handlers", 0, 0,
- G_OPTION_ARG_NONE, &use_debug_handler,
- N_("Enable non-fatal debugging signal handlers"), NULL
- },
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/graphics/gimp/stable/patches/patch-configure_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-configure_in
--- patches/patch-configure_in 16 Apr 2011 07:47:04 -0000 1.10
+++ patches/patch-configure_in 15 Feb 2012 16:30:56 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.10 2011/04/16 07:47:04 dcoppa Exp $
---- configure.in.orig Sun Oct 3 14:04:42 2010
-+++ configure.in Fri Apr 15 20:17:58 2011
-@@ -421,14 +421,7 @@ AM_GLIB_GNU_GETTEXT
+--- configure.in.orig Tue Jan 31 14:50:28 2012
++++ configure.in Wed Feb 8 15:30:13 2012
+@@ -424,14 +424,7 @@ AM_GLIB_GNU_GETTEXT
###########
AC_MSG_CHECKING([for iso-codes])
@@ -17,7 +17,7 @@ $OpenBSD: patch-configure_in,v 1.10 2011
AC_MSG_RESULT($have_iso_codes)
AC_SUBST(ISO_CODES_LOCATION)
-@@ -569,7 +562,8 @@ AC_TRY_RUN([#include <math.h>
+@@ -572,7 +565,8 @@ AC_TRY_RUN([#include <math.h>
AC_CHECK_FUNCS(finite, , [
AC_MSG_CHECKING(for finite in <math.h>)
AC_TRY_LINK([#include <math.h>], [double f = 0.0; finite (f)], [
@@ -27,7 +27,7 @@ $OpenBSD: patch-configure_in,v 1.10 2011
AC_MSG_RESULT(yes)], [
AC_MSG_RESULT(no)
AC_MSG_CHECKING(for isfinite in <math.h>)
-@@ -1146,10 +1140,10 @@ if test "x$with_libmng" != xno && test -z "$MNG_LIBS"
+@@ -1149,10 +1143,10 @@ if test "x$with_libmng" != xno && test -z "$MNG_LIBS"
test -n "$PNG_LIBS" && test -n "$JPEG_LIBS" && test -n "$Z_LIBS"; then
AC_CHECK_LIB(mng, mng_create,
[AC_CHECK_HEADER(libmng.h, mng_ok=yes)],
@@ -40,7 +40,7 @@ $OpenBSD: patch-configure_in,v 1.10 2011
else
have_libmng="no (MNG header file not found)"
fi
-@@ -1328,19 +1322,9 @@ if test "x$with_gnomevfs" != xno; then
+@@ -1331,19 +1325,9 @@ if test "x$with_gnomevfs" != xno; then
gnome_vfs_modules="gnome-vfs-2.0 >= gnome_vfs_required_version"
Index: patches/patch-etc_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/gimp/stable/patches/patch-etc_Makefile_in,v
retrieving revision 1.11
diff -u -p -r1.11 patch-etc_Makefile_in
--- patches/patch-etc_Makefile_in 8 Jul 2010 16:16:51 -0000 1.11
+++ patches/patch-etc_Makefile_in 15 Feb 2012 16:30:56 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-etc_Makefile_in,v 1.11 2010/07/08 16:16:51 giovanni Exp $
---- etc/Makefile.in.orig Mon Jun 21 22:00:58 2010
-+++ etc/Makefile.in Fri Jun 25 18:46:50 2010
-@@ -342,7 +342,7 @@ gimpdatadir = @gimpdatadir@
+--- etc/Makefile.in.orig Tue Jan 31 15:25:20 2012
++++ etc/Makefile.in Wed Feb 8 15:30:13 2012
+@@ -344,7 +344,7 @@ gimpdatadir = @gimpdatadir@
gimpdir = @gimpdir@
gimplocaledir = @gimplocaledir@
gimpplugindir = @gimpplugindir@
Index: patches/patch-plug-ins_common_file-gif-load_c
===================================================================
RCS file: patches/patch-plug-ins_common_file-gif-load_c
diff -N patches/patch-plug-ins_common_file-gif-load_c
--- patches/patch-plug-ins_common_file-gif-load_c 19 Aug 2011 08:57:07
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,55 +0,0 @@
-$OpenBSD: patch-plug-ins_common_file-gif-load_c,v 1.1 2011/08/19 08:57:07
jasper Exp $
-
-file-gif-load: fix heap corruption and buffer overflow (CVE-2011-2896)
-
-Patch from upstream git: 376ad788c1a1c31d40f18494889c383f6909ebfc
-
---- plug-ins/common/file-gif-load.c.orig Sat Jul 3 00:51:56 2010
-+++ plug-ins/common/file-gif-load.c Thu Aug 18 19:22:01 2011
-@@ -697,7 +697,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)
-@@ -772,7 +773,7 @@ LZWReadByte (FILE *fd,
-
- return firstcode;
- }
-- else if (code == end_code)
-+ else if (code == end_code || code > max_code)
- {
- gint count;
- guchar buf[260];
-@@ -791,13 +792,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])
-@@ -808,7 +810,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))
- {
Index: patches/patch-plug-ins_common_file-mng_c
===================================================================
RCS file: patches/patch-plug-ins_common_file-mng_c
diff -N patches/patch-plug-ins_common_file-mng_c
--- patches/patch-plug-ins_common_file-mng_c 8 Jul 2011 20:36:09 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,133 +0,0 @@
-$OpenBSD: patch-plug-ins_common_file-mng_c,v 1.1 2011/07/08 20:36:09 naddy Exp
$
-
-Fix build with png-1.5.
-
---- plug-ins/common/file-mng.c.orig Fri Jul 2 16:51:56 2010
-+++ plug-ins/common/file-mng.c Tue Jul 5 11:11:15 2011
-@@ -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++)
Index: patches/patch-plug-ins_common_file-pdf_c
===================================================================
RCS file: patches/patch-plug-ins_common_file-pdf_c
diff -N patches/patch-plug-ins_common_file-pdf_c
--- patches/patch-plug-ins_common_file-pdf_c 26 Nov 2011 19:46:38 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,427 +0,0 @@
-$OpenBSD: patch-plug-ins_common_file-pdf_c,v 1.1 2011/11/26 19:46:38 kili Exp $
-
-Fix build with poppler-0.18. Patch gyped from opensuse.
-
---- plug-ins/common/file-pdf.c.orig Sat Jul 3 00:51:56 2010
-+++ plug-ins/common/file-pdf.c Thu Nov 17 18:42:37 2011
-@@ -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 (PopplerDoc
- 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);
-+ pixbuf = render_page_to_pixbuf (page, width, height, scale);
-
-- poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0,
buf);
--
-- 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);
-
Index: patches/patch-plug-ins_common_file-png_c
===================================================================
RCS file: patches/patch-plug-ins_common_file-png_c
diff -N patches/patch-plug-ins_common_file-png_c
--- patches/patch-plug-ins_common_file-png_c 8 Jul 2011 20:36:09 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,364 +0,0 @@
-$OpenBSD: patch-plug-ins_common_file-png_c,v 1.1 2011/07/08 20:36:09 naddy Exp
$
-
-Fix build with png-1.5.
-
---- plug-ins/common/file-png.c.orig Tue Jul 13 14:22:27 2010
-+++ plug-ins/common/file-png.c Tue Jul 5 11:11:15 2011
-@@ -653,7 +653,11 @@ on_read_error (png_structp png_ptr, png_const_charp er
- 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);
- }
- }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/gimp/stable/pkg/PLIST,v
retrieving revision 1.28
diff -u -p -r1.28 PLIST
--- pkg/PLIST 3 Dec 2011 20:30:09 -0000 1.28
+++ pkg/PLIST 15 Feb 2012 16:30:58 -0000
@@ -396,7 +396,7 @@ lib/gimp/2.0/plug-ins/palette-to-gradien
@bin lib/gimp/2.0/plug-ins/polar-coords
@bin lib/gimp/2.0/plug-ins/print
@bin lib/gimp/2.0/plug-ins/procedure-browser
-lib/gimp/2.0/plug-ins/py-slice.py
+lib/gimp/2.0/plug-ins/${MODPY_PY_PREFIX}slice.py
lib/gimp/2.0/plug-ins/pyconsole.py
lib/gimp/2.0/plug-ins/python-console.py
lib/gimp/2.0/plug-ins/python-eval.py
@@ -958,7 +958,7 @@ share/gimp/2.0/scripts/clothify.scm
share/gimp/2.0/scripts/coffee.scm
share/gimp/2.0/scripts/comic-logo.scm
share/gimp/2.0/scripts/coolmetal-logo.scm
-share/gimp/2.0/scripts/copy-visible.scm
+share/gimp/2.0/scripts/co${MODPY_PY_PREFIX}visible.scm
share/gimp/2.0/scripts/crystal-logo.scm
share/gimp/2.0/scripts/difference-clouds.scm
share/gimp/2.0/scripts/distress-selection.scm
@@ -1188,7 +1188,6 @@ share/gtk-doc/html/libgimp/libgimp-index
share/gtk-doc/html/libgimp/libgimp-index-new-in-2-6.html
share/gtk-doc/html/libgimp/libgimp-index.html
share/gtk-doc/html/libgimp/libgimp-selectors.html
-share/gtk-doc/html/libgimp/libgimp.devhelp
share/gtk-doc/html/libgimp/libgimp.devhelp2
share/gtk-doc/html/libgimp/libgimp.html
share/gtk-doc/html/libgimp/libgimpui-hierarchy.html
@@ -1222,7 +1221,6 @@ share/gtk-doc/html/libgimpbase/libgimpba
share/gtk-doc/html/libgimpbase/libgimpbase-index-new-in-2-4.html
share/gtk-doc/html/libgimpbase/libgimpbase-index-new-in-2-6.html
share/gtk-doc/html/libgimpbase/libgimpbase-index.html
-share/gtk-doc/html/libgimpbase/libgimpbase.devhelp
share/gtk-doc/html/libgimpbase/libgimpbase.devhelp2
share/gtk-doc/html/libgimpbase/libgimpbase.html
share/gtk-doc/html/libgimpbase/right.png
@@ -1245,7 +1243,6 @@ share/gtk-doc/html/libgimpcolor/libgimpc
share/gtk-doc/html/libgimpcolor/libgimpcolor-index-new-in-2-4.html
share/gtk-doc/html/libgimpcolor/libgimpcolor-index-new-in-2-6.html
share/gtk-doc/html/libgimpcolor/libgimpcolor-index.html
-share/gtk-doc/html/libgimpcolor/libgimpcolor.devhelp
share/gtk-doc/html/libgimpcolor/libgimpcolor.devhelp2
share/gtk-doc/html/libgimpcolor/libgimpcolor.html
share/gtk-doc/html/libgimpcolor/right.png
@@ -1271,7 +1268,6 @@ share/gtk-doc/html/libgimpconfig/libgimp
share/gtk-doc/html/libgimpconfig/libgimpconfig-index-new-in-2-4.html
share/gtk-doc/html/libgimpconfig/libgimpconfig-index-new-in-2-6.html
share/gtk-doc/html/libgimpconfig/libgimpconfig-index.html
-share/gtk-doc/html/libgimpconfig/libgimpconfig.devhelp
share/gtk-doc/html/libgimpconfig/libgimpconfig.devhelp2
share/gtk-doc/html/libgimpconfig/libgimpconfig.html
share/gtk-doc/html/libgimpconfig/right.png
@@ -1291,7 +1287,6 @@ share/gtk-doc/html/libgimpmath/libgimpma
share/gtk-doc/html/libgimpmath/libgimpmath-index-new-in-2-4.html
share/gtk-doc/html/libgimpmath/libgimpmath-index-new-in-2-6.html
share/gtk-doc/html/libgimpmath/libgimpmath-index.html
-share/gtk-doc/html/libgimpmath/libgimpmath.devhelp
share/gtk-doc/html/libgimpmath/libgimpmath.devhelp2
share/gtk-doc/html/libgimpmath/libgimpmath.html
share/gtk-doc/html/libgimpmath/right.png
@@ -1309,7 +1304,6 @@ share/gtk-doc/html/libgimpmodule/libgimp
share/gtk-doc/html/libgimpmodule/libgimpmodule-index-new-in-2-4.html
share/gtk-doc/html/libgimpmodule/libgimpmodule-index-new-in-2-6.html
share/gtk-doc/html/libgimpmodule/libgimpmodule-index.html
-share/gtk-doc/html/libgimpmodule/libgimpmodule.devhelp
share/gtk-doc/html/libgimpmodule/libgimpmodule.devhelp2
share/gtk-doc/html/libgimpmodule/libgimpmodule.html
share/gtk-doc/html/libgimpmodule/right.png
@@ -1329,7 +1323,6 @@ share/gtk-doc/html/libgimpthumb/libgimpt
share/gtk-doc/html/libgimpthumb/libgimpthumb-index-new-in-2-4.html
share/gtk-doc/html/libgimpthumb/libgimpthumb-index-new-in-2-6.html
share/gtk-doc/html/libgimpthumb/libgimpthumb-index.html
-share/gtk-doc/html/libgimpthumb/libgimpthumb.devhelp
share/gtk-doc/html/libgimpthumb/libgimpthumb.devhelp2
share/gtk-doc/html/libgimpthumb/libgimpthumb.html
share/gtk-doc/html/libgimpthumb/right.png
@@ -1430,7 +1423,6 @@ share/gtk-doc/html/libgimpwidgets/libgim
share/gtk-doc/html/libgimpwidgets/libgimpwidgets-index.html
share/gtk-doc/html/libgimpwidgets/libgimpwidgets-utils.html
share/gtk-doc/html/libgimpwidgets/libgimpwidgets-widgets.html
-share/gtk-doc/html/libgimpwidgets/libgimpwidgets.devhelp
share/gtk-doc/html/libgimpwidgets/libgimpwidgets.devhelp2
share/gtk-doc/html/libgimpwidgets/right.png
share/gtk-doc/html/libgimpwidgets/stock-anchor-16.png
@@ -1825,6 +1817,7 @@ share/locale/el/LC_MESSAGES/gimp20-libgi
share/locale/el/LC_MESSAGES/gimp20-python.mo
share/locale/el/LC_MESSAGES/gimp20-script-fu.mo
share/locale/el/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/el/LC_MESSAGES/gimp20-tips.mo
share/locale/el/LC_MESSAGES/gimp20.mo
share/locale/en_CA/LC_MESSAGES/gimp20-libgimp.mo
share/locale/en_CA/LC_MESSAGES/gimp20-python.mo
@@ -1841,6 +1834,7 @@ share/locale/en_GB/LC_MESSAGES/gimp20.mo
share/locale/eo/LC_MESSAGES/gimp20-libgimp.mo
share/locale/eo/LC_MESSAGES/gimp20-python.mo
share/locale/eo/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/eo/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/eo/LC_MESSAGES/gimp20-tips.mo
share/locale/eo/LC_MESSAGES/gimp20.mo
share/locale/es/LC_MESSAGES/gimp20-libgimp.mo
@@ -1937,6 +1931,8 @@ share/locale/ja/LC_MESSAGES/gimp20-std-p
share/locale/ja/LC_MESSAGES/gimp20-tips.mo
share/locale/ja/LC_MESSAGES/gimp20.mo
share/locale/ka/LC_MESSAGES/gimp20.mo
+share/locale/kk/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/kk/LC_MESSAGES/gimp20.mo
share/locale/km/
share/locale/km/LC_MESSAGES/
share/locale/km/LC_MESSAGES/gimp20-libgimp.mo
@@ -1960,6 +1956,10 @@ share/locale/lt/LC_MESSAGES/gimp20-std-p
share/locale/lt/LC_MESSAGES/gimp20-tips.mo
share/locale/lt/LC_MESSAGES/gimp20.mo
share/locale/lv/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/lv/LC_MESSAGES/gimp20-python.mo
+share/locale/lv/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/lv/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/lv/LC_MESSAGES/gimp20-tips.mo
share/locale/lv/LC_MESSAGES/gimp20.mo
share/locale/mk/LC_MESSAGES/gimp20-libgimp.mo
share/locale/mk/LC_MESSAGES/gimp20-python.mo
@@ -2098,6 +2098,7 @@ share/locale/tr/LC_MESSAGES/gimp20-libgi
share/locale/tr/LC_MESSAGES/gimp20-python.mo
share/locale/tr/LC_MESSAGES/gimp20-script-fu.mo
share/locale/tr/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/tr/LC_MESSAGES/gimp20-tips.mo
share/locale/tr/LC_MESSAGES/gimp20.mo
share/locale/tt/LC_MESSAGES/gimp20.mo
share/locale/uk/LC_MESSAGES/gimp20-libgimp.mo
