<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[145475] trunk/dports/graphics/gimp2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/145475">145475</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-02-06 20:26:13 -0800 (Sat, 06 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>gimp2: apply post-release upstream patches through 2016-01-07, increment revision.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsgimp2Portfile">trunk/dports/graphics/gimp2/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsgimp2filesupstreampatchesdiff">trunk/dports/graphics/gimp2/files/upstream-patches.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsgimp2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp2/Portfile (145474 => 145475)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/Portfile 2016-02-07 02:49:49 UTC (rev 145474)
+++ trunk/dports/graphics/gimp2/Portfile 2016-02-07 04:26:13 UTC (rev 145475)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> conflicts gimp2-devel gimp3-devel
</span><span class="cx"> # please remember to update the gimp metapackage to match
</span><span class="cx"> version 2.8.16
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> license GPL-3+
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers devans
</span><span class="lines">@@ -75,7 +75,8 @@
</span><span class="cx">
</span><span class="cx"> compiler.blacklist *gcc* {clang < 300}
</span><span class="cx">
</span><del>-patchfiles patch-etc-gimprc.diff
</del><ins>+patchfiles upstream-patches.diff \
+ patch-etc-gimprc.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</span></span></pre></div>
<a id="trunkdportsgraphicsgimp2filesupstreampatchesdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/gimp2/files/upstream-patches.diff (0 => 145475)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/upstream-patches.diff (rev 0)
+++ trunk/dports/graphics/gimp2/files/upstream-patches.diff 2016-02-07 04:26:13 UTC (rev 145475)
</span><span class="lines">@@ -0,0 +1,173 @@
</span><ins>+From 051b1f0bd9b1c50c09ac3453d6bffed6508c3dce Mon Sep 17 00:00:00 2001
+From: Michael Natterer <mitch@gimp.org>
+Date: Mon, 28 Dec 2015 02:04:46 +0100
+Subject: app: fix the curves tool to not warn on layers without alpha
+
+when adding control points to all channels with control-click. It was
+looking up curve points based on a -1 alpha value.
+
+(cherry picked from commit e9a38c320d03adda0ae2acd5f6646995a21f4369)
+---
+ app/tools/gimpcurvestool.c | 25 ++++++++++++++++---------
+ 1 file changed, 16 insertions(+), 9 deletions(-)
+
+diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c
+index fa82ba2..acb0c78 100644
+--- app/tools/gimpcurvestool.c
++++ app/tools/gimpcurvestool.c
+@@ -286,21 +286,26 @@ gimp_curves_tool_button_release (GimpTool *tool,
+ }
+ else if (state & gimp_get_toggle_behavior_mask ())
+ {
+- gint i;
++ GimpHistogramChannel channel;
+
+- for (i = 0; i < 5; i++)
++ for (channel = GIMP_HISTOGRAM_VALUE;
++ channel <= GIMP_HISTOGRAM_ALPHA;
++ channel++)
+ {
+- GimpCurve *curve = config->curve[i];
+- gdouble value = c_tool->picked_color[i];
++ GimpCurve *curve = config->curve[channel];
++ gdouble value = c_tool->picked_color[channel];
+ gint closest;
+
+- closest = gimp_curve_get_closest_point (curve, value);
++ if (value != -1)
++ {
++ closest = gimp_curve_get_closest_point (curve, value);
+
+- gimp_curve_view_set_selected (GIMP_CURVE_VIEW (c_tool->graph),
+- closest);
++ gimp_curve_view_set_selected (GIMP_CURVE_VIEW (c_tool->graph),
++ closest);
+
+- gimp_curve_set_point (curve, closest,
+- value, gimp_curve_map_value (curve, value));
++ gimp_curve_set_point (curve, closest,
++ value, gimp_curve_map_value (curve, value));
++ }
+ }
+ }
+
+@@ -377,6 +382,8 @@ gimp_curves_tool_color_picked (GimpColorTool *color_tool,
+
+ if (gimp_drawable_has_alpha (drawable))
+ tool->picked_color[GIMP_HISTOGRAM_ALPHA] = color->a;
++ else
++ tool->picked_color[GIMP_HISTOGRAM_ALPHA] = -1;
+
+ tool->picked_color[GIMP_HISTOGRAM_VALUE] = MAX (MAX (color->r, color->g),
+ color->b);
+--
+cgit v0.12
+
+From 9c8aeed60df4ec052ea478fa34ccfce4b6fd2a35 Mon Sep 17 00:00:00 2001
+From: Massimo Valentini <mvalentini@src.gnome.org>
+Date: Mon, 4 Jan 2016 12:55:58 +0100
+Subject: Bug 684295: wrong layer group structure in gimp 2.8.2...
+
+... (read PSD file from PS CS3)
+
+use a position of 0 when inserting normal layers
+as they're always inserted on top of their group
+
+-1 means inside the group when the active drawable is
+a group or above it when it's not. This used to work
+before layer groups or in simple cases.
+
+(cherry picked from commit 32469d53b7e28973b3c8488573341c69bef0576b)
+
+ Conflicts:
+ plug-ins/file-psd/psd-load.c
+---
+ plug-ins/file-psd/psd-load.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plug-ins/file-psd/psd-load.c b/plug-ins/file-psd/psd-load.c
+index 35adf82..d789929 100644
+--- plug-ins/file-psd/psd-load.c
++++ plug-ins/file-psd/psd-load.c
+@@ -1323,7 +1323,7 @@ add_layers (const gint32 image_id,
+ img_a->columns, img_a->rows,
+ image_type, 0, GIMP_NORMAL_MODE);
+ g_free (lyr_a[lidx]->name);
+- gimp_image_insert_layer (image_id, layer_id, parent_group_id, -1);
++ gimp_image_insert_layer (image_id, layer_id, parent_group_id, 0);
+ drawable = gimp_drawable_get (layer_id);
+ gimp_drawable_fill (drawable->drawable_id, GIMP_TRANSPARENT_FILL);
+ gimp_item_set_visible (drawable->drawable_id, lyr_a[lidx]->layer_flags.visible);
+@@ -1360,7 +1360,7 @@ add_layers (const gint32 image_id,
+ layer_mode);
+ IFDBG(3) g_debug ("Layer tattoo: %d", layer_id);
+ g_free (lyr_a[lidx]->name);
+- gimp_image_insert_layer (image_id, layer_id, parent_group_id, -1);
++ gimp_image_insert_layer (image_id, layer_id, parent_group_id, 0);
+ gimp_layer_set_offsets (layer_id, l_x, l_y);
+ gimp_layer_set_lock_alpha (layer_id, lyr_a[lidx]->layer_flags.trans_prot);
+ drawable = gimp_drawable_get (layer_id);
+--
+cgit v0.12
+
+From 242c5152ae96e817042ff869896056d615fd7441 Mon Sep 17 00:00:00 2001
+From: Michael Natterer <mitch@gimp.org>
+Date: Wed, 6 Jan 2016 05:12:03 +0100
+Subject: app: set the name of the open dialog again in file_open_dialog_show()
+
+so we get back the "Open Image as Layers" window title. Seems it was
+gone since I broke it in 2008.
+
+(cherry picked from commit 865bb627e01bb9c83ed7f84038a406ef6e2b3db5)
+---
+ app/actions/file-commands.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/app/actions/file-commands.c b/app/actions/file-commands.c
+index 7bb9c20..70b7b4d 100644
+--- app/actions/file-commands.c
++++ app/actions/file-commands.c
+@@ -527,6 +527,8 @@ file_open_dialog_show (Gimp *gimp,
+ if (uri)
+ gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (dialog), uri);
+
++ gtk_window_set_title (GTK_WINDOW (dialog), title);
++
+ gimp_file_dialog_set_open_image (GIMP_FILE_DIALOG (dialog),
+ image, open_as_layers);
+
+--
+cgit v0.12
+
+
+From d4cebcea8fec7c74b65bd94332d5ac8ce4c303c7 Mon Sep 17 00:00:00 2001
+From: Massimo Valentini <mvalentini@src.gnome.org>
+Date: Thu, 7 Jan 2016 17:49:52 +0100
+Subject: Bug 758760: OpenRaster plug-In could not open image
+
+An oversight while cherry-picking in
+
+621f5e296def8159020201b06f544517624f767d
+---
+ plug-ins/pygimp/plug-ins/file-openraster.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/plug-ins/pygimp/plug-ins/file-openraster.py b/plug-ins/pygimp/plug-ins/file-openraster.py
+index 6aa273c..135b9b4 100755
+--- plug-ins/pygimp/plug-ins/file-openraster.py
++++ plug-ins/pygimp/plug-ins/file-openraster.py
+@@ -271,11 +271,6 @@ def load_ora(filename, raw_filename):
+ parent_groups.pop()
+ continue
+
+- if not name:
+- # use the filename without extention as name
+- n = os.path.basename(path)
+- name = os.path.splitext(n)[0]
+-
+ if item.tag == 'stack':
+ name, x, y, opac, visible, layer_mode = get_group_layer_attributes(item)
+ gimp_layer = gimp.GroupLayer(img)
+--
+cgit v0.12
+
</ins></span></pre>
</div>
</div>
</body>
</html>