From d5f233a3881fe06a301fac589c62febeb2f4aa1e Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 30 Aug 2014 06:37:41 +0000 Subject: Changes 2.8.14: - Fix libtool versioning (forgot to bump gimp_interface_age) Changes 2.8.12: Core: - OSX: Fix migration code for old GIMP directories - Fix brush sizes when used from plug-ins - Windows: Allow to Explorer-open files with UTF-8 characters in the filename - Make XCF loading more robust against broken files GUI: - Make sure the widget direction matches the GUI language - Remove the option to disable the warning when closing a modified image - Fix canvas overlay widgets (like the text options) for tablets - Make DND work between images in one dockable Libgimp: - Make gimp_image_get_name() return the string used for the image title Plug-ins: - Make script-fu-server more secure by listening to 127.0.0.1 by default and add a warning about changing that IP. This breaks the procedure's API, but for security reasons. - Bring back proper script-fu translations General: - Massively clean up and fix the OSX build and bundle - Add Jenkins tutorial - Documentation updates - Bug fixes - Translation updates --- graphics/gimp/Makefile | 5 +- graphics/gimp/PLIST | 28 +++- graphics/gimp/distinfo | 10 +- graphics/gimp/patches/patch-app_text_gimpfont.c | 15 -- .../gimp/patches/patch-plug-ins_common_file-xwd.c | 156 --------------------- 5 files changed, 33 insertions(+), 181 deletions(-) delete mode 100644 graphics/gimp/patches/patch-app_text_gimpfont.c delete mode 100644 graphics/gimp/patches/patch-plug-ins_common_file-xwd.c (limited to 'graphics/gimp') diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 83280e64fe1..92da745e1c1 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.245 2014/08/19 10:42:55 wiz Exp $ +# $NetBSD: Makefile,v 1.246 2014/08/30 06:37:41 adam Exp $ -DISTNAME= gimp-2.8.10 -PKGREVISION= 3 +DISTNAME= gimp-2.8.14 CATEGORIES= graphics MASTER_SITES= http://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/ \ ${MASTER_SITE_GNU:=gimp/v${PKGVERSION_NOREV:R}/} \ diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST index 54d46ccec08..42f7e34d6ff 100644 --- a/graphics/gimp/PLIST +++ b/graphics/gimp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.52 2013/12/01 11:58:44 adam Exp $ +@comment $NetBSD: PLIST,v 1.53 2014/08/30 06:37:41 adam Exp $ bin/gimp bin/gimp-2.8 bin/gimp-console @@ -1121,6 +1121,7 @@ share/gtk-doc/html/libgimp/GimpZoomPreview.html share/gtk-doc/html/libgimp/home.png share/gtk-doc/html/libgimp/index.html share/gtk-doc/html/libgimp/index.sgml +share/gtk-doc/html/libgimp/left-insensitive.png share/gtk-doc/html/libgimp/left.png share/gtk-doc/html/libgimp/libgimp-Gimp.html share/gtk-doc/html/libgimp/libgimp-GimpItemComboBox.html @@ -1201,12 +1202,15 @@ share/gtk-doc/html/libgimp/libgimp.devhelp2 share/gtk-doc/html/libgimp/libgimp.html share/gtk-doc/html/libgimp/libgimpui-hierarchy.html share/gtk-doc/html/libgimp/libgimpui.html +share/gtk-doc/html/libgimp/right-insensitive.png share/gtk-doc/html/libgimp/right.png share/gtk-doc/html/libgimp/style.css +share/gtk-doc/html/libgimp/up-insensitive.png share/gtk-doc/html/libgimp/up.png share/gtk-doc/html/libgimpbase/home.png share/gtk-doc/html/libgimpbase/index.html share/gtk-doc/html/libgimpbase/index.sgml +share/gtk-doc/html/libgimpbase/left-insensitive.png share/gtk-doc/html/libgimpbase/left.png share/gtk-doc/html/libgimpbase/libgimpbase-gimpbaseenums.html share/gtk-doc/html/libgimpbase/libgimpbase-gimpbasetypes.html @@ -1232,12 +1236,15 @@ share/gtk-doc/html/libgimpbase/libgimpbase-index-new-in-2-8.html share/gtk-doc/html/libgimpbase/libgimpbase-index.html share/gtk-doc/html/libgimpbase/libgimpbase.devhelp2 share/gtk-doc/html/libgimpbase/libgimpbase.html +share/gtk-doc/html/libgimpbase/right-insensitive.png share/gtk-doc/html/libgimpbase/right.png share/gtk-doc/html/libgimpbase/style.css +share/gtk-doc/html/libgimpbase/up-insensitive.png share/gtk-doc/html/libgimpbase/up.png share/gtk-doc/html/libgimpcolor/home.png share/gtk-doc/html/libgimpcolor/index.html share/gtk-doc/html/libgimpcolor/index.sgml +share/gtk-doc/html/libgimpcolor/left-insensitive.png share/gtk-doc/html/libgimpcolor/left.png share/gtk-doc/html/libgimpcolor/libgimpcolor-GimpAdaptiveSupersample.html share/gtk-doc/html/libgimpcolor/libgimpcolor-GimpBilinear.html @@ -1255,13 +1262,16 @@ share/gtk-doc/html/libgimpcolor/libgimpcolor-index-new-in-2-8.html share/gtk-doc/html/libgimpcolor/libgimpcolor-index.html share/gtk-doc/html/libgimpcolor/libgimpcolor.devhelp2 share/gtk-doc/html/libgimpcolor/libgimpcolor.html +share/gtk-doc/html/libgimpcolor/right-insensitive.png share/gtk-doc/html/libgimpcolor/right.png share/gtk-doc/html/libgimpcolor/style.css +share/gtk-doc/html/libgimpcolor/up-insensitive.png share/gtk-doc/html/libgimpcolor/up.png share/gtk-doc/html/libgimpconfig/GimpColorConfig.html share/gtk-doc/html/libgimpconfig/home.png share/gtk-doc/html/libgimpconfig/index.html share/gtk-doc/html/libgimpconfig/index.sgml +share/gtk-doc/html/libgimpconfig/left-insensitive.png share/gtk-doc/html/libgimpconfig/left.png share/gtk-doc/html/libgimpconfig/libgimpconfig-GimpConfig-deserialize.html share/gtk-doc/html/libgimpconfig/libgimpconfig-GimpConfig-params.html @@ -1280,12 +1290,15 @@ share/gtk-doc/html/libgimpconfig/libgimpconfig-index-new-in-2-8.html share/gtk-doc/html/libgimpconfig/libgimpconfig-index.html share/gtk-doc/html/libgimpconfig/libgimpconfig.devhelp2 share/gtk-doc/html/libgimpconfig/libgimpconfig.html +share/gtk-doc/html/libgimpconfig/right-insensitive.png share/gtk-doc/html/libgimpconfig/right.png share/gtk-doc/html/libgimpconfig/style.css +share/gtk-doc/html/libgimpconfig/up-insensitive.png share/gtk-doc/html/libgimpconfig/up.png share/gtk-doc/html/libgimpmath/home.png share/gtk-doc/html/libgimpmath/index.html share/gtk-doc/html/libgimpmath/index.sgml +share/gtk-doc/html/libgimpmath/left-insensitive.png share/gtk-doc/html/libgimpmath/left.png share/gtk-doc/html/libgimpmath/libgimpmath-GimpMD5.html share/gtk-doc/html/libgimpmath/libgimpmath-GimpMath.html @@ -1298,14 +1311,17 @@ 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.devhelp2 share/gtk-doc/html/libgimpmath/libgimpmath.html +share/gtk-doc/html/libgimpmath/right-insensitive.png share/gtk-doc/html/libgimpmath/right.png share/gtk-doc/html/libgimpmath/style.css +share/gtk-doc/html/libgimpmath/up-insensitive.png share/gtk-doc/html/libgimpmath/up.png share/gtk-doc/html/libgimpmodule/GimpModule.html share/gtk-doc/html/libgimpmodule/GimpModuleDB.html share/gtk-doc/html/libgimpmodule/home.png share/gtk-doc/html/libgimpmodule/index.html share/gtk-doc/html/libgimpmodule/index.sgml +share/gtk-doc/html/libgimpmodule/left-insensitive.png share/gtk-doc/html/libgimpmodule/left.png share/gtk-doc/html/libgimpmodule/libgimpmodule-index-deprecated.html share/gtk-doc/html/libgimpmodule/libgimpmodule-index-new-in-2-2.html @@ -1315,13 +1331,16 @@ share/gtk-doc/html/libgimpmodule/libgimpmodule-index-new-in-2-8.html share/gtk-doc/html/libgimpmodule/libgimpmodule-index.html share/gtk-doc/html/libgimpmodule/libgimpmodule.devhelp2 share/gtk-doc/html/libgimpmodule/libgimpmodule.html +share/gtk-doc/html/libgimpmodule/right-insensitive.png share/gtk-doc/html/libgimpmodule/right.png share/gtk-doc/html/libgimpmodule/style.css +share/gtk-doc/html/libgimpmodule/up-insensitive.png share/gtk-doc/html/libgimpmodule/up.png share/gtk-doc/html/libgimpthumb/GimpThumbnail.html share/gtk-doc/html/libgimpthumb/home.png share/gtk-doc/html/libgimpthumb/index.html share/gtk-doc/html/libgimpthumb/index.sgml +share/gtk-doc/html/libgimpthumb/left-insensitive.png share/gtk-doc/html/libgimpthumb/left.png share/gtk-doc/html/libgimpthumb/libgimpthumb-GimpThumb-enums.html share/gtk-doc/html/libgimpthumb/libgimpthumb-GimpThumb-error.html @@ -1333,8 +1352,10 @@ 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.devhelp2 share/gtk-doc/html/libgimpthumb/libgimpthumb.html +share/gtk-doc/html/libgimpthumb/right-insensitive.png share/gtk-doc/html/libgimpthumb/right.png share/gtk-doc/html/libgimpthumb/style.css +share/gtk-doc/html/libgimpthumb/up-insensitive.png share/gtk-doc/html/libgimpthumb/up.png share/gtk-doc/html/libgimpwidgets/GimpBrowser.html share/gtk-doc/html/libgimpwidgets/GimpButton.html @@ -1408,6 +1429,7 @@ share/gtk-doc/html/libgimpwidgets/gimp-unit-menu.png share/gtk-doc/html/libgimpwidgets/home.png share/gtk-doc/html/libgimpwidgets/index.html share/gtk-doc/html/libgimpwidgets/index.sgml +share/gtk-doc/html/libgimpwidgets/left-insensitive.png share/gtk-doc/html/libgimpwidgets/left.png share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpCairoUtils.html share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpEnumWidgets.html @@ -1434,6 +1456,7 @@ 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.devhelp2 +share/gtk-doc/html/libgimpwidgets/right-insensitive.png share/gtk-doc/html/libgimpwidgets/right.png share/gtk-doc/html/libgimpwidgets/stock-anchor-16.png share/gtk-doc/html/libgimpwidgets/stock-cap-butt-16.png @@ -1762,6 +1785,7 @@ share/gtk-doc/html/libgimpwidgets/stock-wilber-64.png share/gtk-doc/html/libgimpwidgets/stock-wilber-eek-64.png share/gtk-doc/html/libgimpwidgets/stock-zoom-follow-window-12.png share/gtk-doc/html/libgimpwidgets/style.css +share/gtk-doc/html/libgimpwidgets/up-insensitive.png share/gtk-doc/html/libgimpwidgets/up.png share/icons/hicolor/16x16/apps/gimp.png share/icons/hicolor/22x22/apps/gimp.png @@ -1901,6 +1925,8 @@ share/locale/ga/LC_MESSAGES/gimp20-python.mo share/locale/ga/LC_MESSAGES/gimp20-script-fu.mo share/locale/ga/LC_MESSAGES/gimp20-std-plug-ins.mo share/locale/ga/LC_MESSAGES/gimp20.mo +share/locale/gd/LC_MESSAGES/gimp20-script-fu.mo +share/locale/gd/LC_MESSAGES/gimp20.mo share/locale/gl/LC_MESSAGES/gimp20-libgimp.mo share/locale/gl/LC_MESSAGES/gimp20-python.mo share/locale/gl/LC_MESSAGES/gimp20-script-fu.mo diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo index 036ad9c502a..81a92039d64 100644 --- a/graphics/gimp/distinfo +++ b/graphics/gimp/distinfo @@ -1,15 +1,13 @@ -$NetBSD: distinfo,v 1.82 2014/05/22 12:02:19 he Exp $ +$NetBSD: distinfo,v 1.83 2014/08/30 06:37:41 adam Exp $ -SHA1 (gimp-2.8.10.tar.bz2) = 6d3c98fcc86f42b0a825a5c62d5d3a5e1c83f48b -RMD160 (gimp-2.8.10.tar.bz2) = c5364c49af2c695bc3d0bd97e792bf3ad75b1175 -Size (gimp-2.8.10.tar.bz2) = 20343461 bytes +SHA1 (gimp-2.8.14.tar.bz2) = 380a8e2887e1a161056444921807e338c3d31653 +RMD160 (gimp-2.8.14.tar.bz2) = eb1f1e590200416c593cd227b6de6eb9951b3ca7 +Size (gimp-2.8.14.tar.bz2) = 20440077 bytes SHA1 (patch-aa) = bc998a9510458e1f296c44ae26c8ee3900ce49ab SHA1 (patch-ab) = 37820b9e03702248294f0030ffbd09e7f14f3dcb SHA1 (patch-ad) = 7863678d59ccf54e2ce61a4ac4b883fb9eb5fb82 SHA1 (patch-app_Makefile.in) = 1677fa436f76d0b83bf048447fc025584a255e68 SHA1 (patch-app_config_Makefile.in) = c5376f98649255b163cf9af448b5931d7675526c -SHA1 (patch-app_text_gimpfont.c) = 723af05dc0d80a2ca20b2aee60f81e15bc5e71d1 SHA1 (patch-devel-docs_app_Makefile.in) = 89aec477783899cc6a5ac765d567d73f79474d5e SHA1 (patch-plug-ins_common_file-mng.c) = 8ed244997cdef7125e1aa5da4d0fac5068ad5159 -SHA1 (patch-plug-ins_common_file-xwd.c) = ffe795b7a98e072f1993f6f452b510faa0d84ad5 SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = c424b1a8e345ec3d0763ac2cf1f8535da9e10797 diff --git a/graphics/gimp/patches/patch-app_text_gimpfont.c b/graphics/gimp/patches/patch-app_text_gimpfont.c deleted file mode 100644 index 3c061b9a820..00000000000 --- a/graphics/gimp/patches/patch-app_text_gimpfont.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-app_text_gimpfont.c,v 1.1 2013/12/15 08:25:38 markd Exp $ - -Build with freetype 2.5.x - ---- app/text/gimpfont.c.orig 2012-05-08 06:05:46.000000000 +0000 -+++ app/text/gimpfont.c -@@ -27,7 +27,7 @@ - - #define PANGO_ENABLE_ENGINE 1 /* Argh */ - #include --#include -+#include FT_TRUETYPE_TABLES_H - - #include "text-types.h" - diff --git a/graphics/gimp/patches/patch-plug-ins_common_file-xwd.c b/graphics/gimp/patches/patch-plug-ins_common_file-xwd.c deleted file mode 100644 index 82bddf90b8f..00000000000 --- a/graphics/gimp/patches/patch-plug-ins_common_file-xwd.c +++ /dev/null @@ -1,156 +0,0 @@ -$NetBSD: patch-plug-ins_common_file-xwd.c,v 1.1 2014/05/21 13:50:22 he Exp $ - -Sanity check colormap size (CVE-2013-1913), valid range is 0 .. 256. -Sanity check # of colors and map entries (CVE-2013-1978) - -The number of colors in an image shouldn't be higher than the number of -colormap entries. Additionally, consolidate post error cleanup in -load_image(). - -From -https://git.gnome.org/browse/gimp/patch/?id=32ae0f83e5748299641cceaabe3f80f1b3afd03e -and -https://git.gnome.org/browse/gimp/patch/?id=23f685931e5f000dd033a45c60c1e60d7f78caf4 - ---- plug-ins/common/file-xwd.c.orig 2013-11-10 15:37:53.000000000 +0000 -+++ plug-ins/common/file-xwd.c -@@ -424,9 +424,9 @@ static gint32 - load_image (const gchar *filename, - GError **error) - { -- FILE *ifp; -+ FILE *ifp = NULL; - gint depth, bpp; -- gint32 image_ID; -+ gint32 image_ID = -1; - L_XWDFILEHEADER xwdhdr; - L_XWDCOLOR *xwdcolmap = NULL; - -@@ -436,7 +436,7 @@ load_image (const gchar *filename, - g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), - _("Could not open '%s' for reading: %s"), - gimp_filename_to_utf8 (filename), g_strerror (errno)); -- return -1; -+ goto out; - } - - read_xwd_header (ifp, &xwdhdr); -@@ -445,8 +445,7 @@ load_image (const gchar *filename, - g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Could not read XWD header from '%s'"), - gimp_filename_to_utf8 (filename)); -- fclose (ifp); -- return -1; -+ goto out; - } - - #ifdef XWD_COL_WAIT_DEBUG -@@ -461,8 +460,25 @@ load_image (const gchar *filename, - /* Position to start of XWDColor structures */ - fseek (ifp, (long)xwdhdr.l_header_size, SEEK_SET); - -+ /* Guard against insanely huge color maps -- gimp_image_set_colormap() only -+ * accepts colormaps with 0..256 colors anyway. */ -+ if (xwdhdr.l_colormap_entries > 256) -+ { -+ g_message (_("'%s':\nIllegal number of colormap entries: %ld"), -+ gimp_filename_to_utf8 (filename), -+ (long)xwdhdr.l_colormap_entries); -+ goto out; -+ } -+ - if (xwdhdr.l_colormap_entries > 0) - { -+ if (xwdhdr.l_colormap_entries < xwdhdr.l_ncolors) -+ { -+ g_message (_("'%s':\nNumber of colormap entries < number of colors"), -+ gimp_filename_to_utf8 (filename)); -+ goto out; -+ } -+ - xwdcolmap = g_new (L_XWDCOLOR, xwdhdr.l_colormap_entries); - - read_xwd_cols (ifp, &xwdhdr, xwdcolmap); -@@ -482,9 +498,7 @@ load_image (const gchar *filename, - if (xwdhdr.l_file_version != 7) - { - g_message (_("Can't read color entries")); -- g_free (xwdcolmap); -- fclose (ifp); -- return (-1); -+ goto out; - } - } - -@@ -492,9 +506,7 @@ load_image (const gchar *filename, - { - g_message (_("'%s':\nNo image width specified"), - gimp_filename_to_utf8 (filename)); -- g_free (xwdcolmap); -- fclose (ifp); -- return (-1); -+ goto out; - } - - if (xwdhdr.l_pixmap_width > GIMP_MAX_IMAGE_SIZE -@@ -502,27 +514,21 @@ load_image (const gchar *filename, - { - g_message (_("'%s':\nImage width is larger than GIMP can handle"), - gimp_filename_to_utf8 (filename)); -- g_free (xwdcolmap); -- fclose (ifp); -- return (-1); -+ goto out; - } - - if (xwdhdr.l_pixmap_height <= 0) - { - g_message (_("'%s':\nNo image height specified"), - gimp_filename_to_utf8 (filename)); -- g_free (xwdcolmap); -- fclose (ifp); -- return (-1); -+ goto out; - } - - if (xwdhdr.l_pixmap_height > GIMP_MAX_IMAGE_SIZE) - { - g_message (_("'%s':\nImage height is larger than GIMP can handle"), - gimp_filename_to_utf8 (filename)); -- g_free (xwdcolmap); -- fclose (ifp); -- return (-1); -+ goto out; - } - - gimp_progress_init_printf (_("Opening '%s'"), -@@ -571,11 +577,6 @@ load_image (const gchar *filename, - } - gimp_progress_update (1.0); - -- fclose (ifp); -- -- if (xwdcolmap) -- g_free (xwdcolmap); -- - if (image_ID == -1 && ! (error && *error)) - g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("XWD-file %s has format %d, depth %d and bits per pixel %d. " -@@ -583,6 +584,17 @@ load_image (const gchar *filename, - gimp_filename_to_utf8 (filename), - (gint) xwdhdr.l_pixmap_format, depth, bpp); - -+out: -+ if (ifp) -+ { -+ fclose (ifp); -+ } -+ -+ if (xwdcolmap) -+ { -+ g_free (xwdcolmap); -+ } -+ - return image_ID; - } - -- cgit v1.2.3