[114215] trunk/dports/graphics/gimp2
devans at macports.org
devans at macports.org
Mon Dec 2 16:24:17 PST 2013
Revision: 114215
https://trac.macports.org/changeset/114215
Author: devans at macports.org
Date: 2013-12-02 16:24:17 -0800 (Mon, 02 Dec 2013)
Log Message:
-----------
gimp2: upstream bug fixes, help_browser now works with +quartz.
Modified Paths:
--------------
trunk/dports/graphics/gimp2/Portfile
Added Paths:
-----------
trunk/dports/graphics/gimp2/files/patch-brush-outline-not-displayed-bz719593.diff
trunk/dports/graphics/gimp2/files/patch-palette-editor-not-working-new-palettes-bz719634.diff
trunk/dports/graphics/gimp2/files/patch-plug-in-borderaverage-return-garbage-alpha-value-bz719662.diff
Modified: trunk/dports/graphics/gimp2/Portfile
===================================================================
--- trunk/dports/graphics/gimp2/Portfile 2013-12-03 00:16:08 UTC (rev 114214)
+++ trunk/dports/graphics/gimp2/Portfile 2013-12-03 00:24:17 UTC (rev 114215)
@@ -7,6 +7,7 @@
name gimp2
# please remember to update the gimp metapackage to match
version 2.8.10
+revision 1
license {GPL-2+ LGPL}
categories graphics
maintainers devans
@@ -70,6 +71,9 @@
patchfiles patch-etc-gimprc.diff \
patch-freetype-includes.diff \
+ patch-brush-outline-not-displayed-bz719593.diff \
+ patch-palette-editor-not-working-new-palettes-bz719634.diff \
+ patch-plug-in-borderaverage-return-garbage-alpha-value-bz719662.diff \
patch-plug-ins-twain-tw_mac.c.diff
platform darwin 9 {
@@ -178,17 +182,15 @@
#
# set default variants
-# help browser builds but doesn't work with +quartz
#
-if {![variant_isset quartz]} {
- variant help_browser description {Enable Gimp help browser} {
- depends_lib-append port:webkit-gtk
- configure.args-delete --without-webkit
- }
- default_variants +help_browser
+variant help_browser description {Enable Gimp help browser} {
+ depends_lib-append port:webkit-gtk
+ configure.args-delete --without-webkit
}
+default_variants +help_browser
+
post-activate {
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
Added: trunk/dports/graphics/gimp2/files/patch-brush-outline-not-displayed-bz719593.diff
===================================================================
--- trunk/dports/graphics/gimp2/files/patch-brush-outline-not-displayed-bz719593.diff (rev 0)
+++ trunk/dports/graphics/gimp2/files/patch-brush-outline-not-displayed-bz719593.diff 2013-12-03 00:24:17 UTC (rev 114215)
@@ -0,0 +1,35 @@
+From ecefaead96fce52d499dccdb02191b3e93352231 Mon Sep 17 00:00:00 2001
+From: Michael Henning <drawoc at darkrefraction.com>
+Date: Sat, 30 Nov 2013 21:31:57 +0000
+Subject: Bug 719593 - On clang, brush outline is not displayed
+
+Don't access path_data->len after path_data has been freed.
+
+(cherry picked from commit 95becc7615c7e9cf2f6135c8d5b0fe1cca86648f)
+---
+diff --git a/app/core/gimpbezierdesc.c b/app/core/gimpbezierdesc.c
+index 03ea2f0..f2eacb2 100644
+--- app/core/gimpbezierdesc.c
++++ app/core/gimpbezierdesc.c
+@@ -111,6 +111,7 @@ gimp_bezier_desc_new_from_bound_segs (BoundSeg *bound_segs,
+ gint n_points;
+ gint seg;
+ gint i;
++ guint path_data_len;
+
+ g_return_val_if_fail (bound_segs != NULL, NULL);
+ g_return_val_if_fail (n_bound_segs > 0, NULL);
+@@ -159,8 +160,10 @@ gimp_bezier_desc_new_from_bound_segs (BoundSeg *bound_segs,
+
+ g_free (points);
+
++ path_data_len = path_data->len;
++
+ return gimp_bezier_desc_new ((cairo_path_data_t *) g_array_free (path_data, FALSE),
+- path_data->len);
++ path_data_len);
+ }
+
+ void
+--
+cgit v0.9.2
Added: trunk/dports/graphics/gimp2/files/patch-palette-editor-not-working-new-palettes-bz719634.diff
===================================================================
--- trunk/dports/graphics/gimp2/files/patch-palette-editor-not-working-new-palettes-bz719634.diff (rev 0)
+++ trunk/dports/graphics/gimp2/files/patch-palette-editor-not-working-new-palettes-bz719634.diff 2013-12-03 00:24:17 UTC (rev 114215)
@@ -0,0 +1,77 @@
+From 5847d56f365ca5cf3b57601f01924ec609696ec1 Mon Sep 17 00:00:00 2001
+From: Michael Natterer <mitch at gimp.org>
+Date: Sun, 01 Dec 2013 17:04:51 +0000
+Subject: Bug 719634 - Palette editor not working for New Palettes (cannot drop colors)
+
+Allow to drop colors also on the palette view's parent viewport, so
+colors can be dropped everywhere inside the scrolled window, also when
+the palette view is invisible because it has zero colors. Also allow
+dropping of palettes on the viewport to change the editor's active
+palette.
+
+(cherry picked from commit 0e1978d27346c6ba952945d48c50c0bb64ec1ca8)
+---
+diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c
+index 04914f4..0e9ed22 100644
+--- app/widgets/gimppaletteeditor.c
++++ app/widgets/gimppaletteeditor.c
+@@ -87,6 +87,11 @@ static void palette_editor_drop_palette (GtkWidget *widget,
+ gint y,
+ GimpViewable *viewable,
+ gpointer data);
++static void palette_editor_drop_color (GtkWidget *widget,
++ gint x,
++ gint y,
++ const GimpRGB *color,
++ gpointer data);
+
+ static void palette_editor_entry_clicked (GimpPaletteView *view,
+ GimpPaletteEntry *entry,
+@@ -212,9 +217,18 @@ gimp_palette_editor_init (GimpPaletteEditor *editor)
+ G_CALLBACK (palette_editor_color_dropped),
+ editor);
+
+- gimp_dnd_viewable_dest_add (editor->view, GIMP_TYPE_PALETTE,
++ gimp_dnd_viewable_dest_add (editor->view,
++ GIMP_TYPE_PALETTE,
+ palette_editor_drop_palette,
+ editor);
++ gimp_dnd_viewable_dest_add (gtk_widget_get_parent (editor->view),
++ GIMP_TYPE_PALETTE,
++ palette_editor_drop_palette,
++ editor);
++
++ gimp_dnd_color_dest_add (gtk_widget_get_parent (editor->view),
++ palette_editor_drop_color,
++ editor);
+
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+ gtk_box_pack_start (GTK_BOX (editor), hbox, FALSE, FALSE, 0);
+@@ -643,6 +657,25 @@ palette_editor_drop_palette (GtkWidget *widget,
+ gimp_data_editor_set_data (GIMP_DATA_EDITOR (data), GIMP_DATA (viewable));
+ }
+
++static void
++palette_editor_drop_color (GtkWidget *widget,
++ gint x,
++ gint y,
++ const GimpRGB *color,
++ gpointer data)
++{
++ GimpPaletteEditor *editor = data;
++
++ if (GIMP_DATA_EDITOR (editor)->data_editable)
++ {
++ GimpPalette *palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
++ GimpPaletteEntry *entry;
++
++ entry = gimp_palette_add_entry (palette, -1, NULL, color);
++ gimp_palette_view_select_entry (GIMP_PALETTE_VIEW (editor->view), entry);
++ }
++}
++
+
+ /* palette view callbacks */
+
+--
+cgit v0.9.2
Added: trunk/dports/graphics/gimp2/files/patch-plug-in-borderaverage-return-garbage-alpha-value-bz719662.diff
===================================================================
--- trunk/dports/graphics/gimp2/files/patch-plug-in-borderaverage-return-garbage-alpha-value-bz719662.diff (rev 0)
+++ trunk/dports/graphics/gimp2/files/patch-plug-in-borderaverage-return-garbage-alpha-value-bz719662.diff 2013-12-03 00:24:17 UTC (rev 114215)
@@ -0,0 +1,24 @@
+From 7fab702e9b52802ab411fa56ad17bac50590ecaf Mon Sep 17 00:00:00 2001
+From: Michael Natterer <mitch at gimp.org>
+Date: Sun, 01 Dec 2013 22:00:24 +0000
+Subject: Bug 719662 - plug-in-borderaverage returns a garbage alpha value
+
+Return a fully opaque color instead of a random-memory alpha value.
+
+(cherry picked from commit 56cdf642fc005ff03da67107c7c64308b36fa3e5)
+---
+diff --git a/plug-ins/common/border-average.c b/plug-ins/common/border-average.c
+index be265fb..8df76b3 100644
+--- plug-ins/common/border-average.c
++++ plug-ins/common/border-average.c
+@@ -301,7 +301,7 @@ borderaverage (GimpDrawable *drawable,
+ }
+
+ /* return the color */
+- gimp_rgb_set_uchar (result, r, g, b);
++ gimp_rgba_set_uchar (result, r, g, b, 255);
+
+ g_free (buffer);
+ g_free (cube);
+--
+cgit v0.9.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131202/72ed7102/attachment-0001.html>
More information about the macports-changes
mailing list