<!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>[115529] 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/115529">115529</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-01-04 01:47:12 -0800 (Sat, 04 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gimp2: apply upstream patches from gimp-2-8 branch.</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="#trunkdportsgraphicsgimp2filespatchgimpressionistbackgroundpapernotalignedbz720711diff">trunk/dports/graphics/gimp2/files/patch-gimpressionist-background-paper-not-aligned-bz720711.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchletterspacingintexttoolbz720492diff">trunk/dports/graphics/gimp2/files/patch-letter-spacing-in-text-tool-bz720492.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchmistakendescriptionnewguidesfromselectionbz720598diff">trunk/dports/graphics/gimp2/files/patch-mistaken-description-new-guides-from-selection-bz720598.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchshadowlayerfordropshadowfilterbz721058diff">trunk/dports/graphics/gimp2/files/patch-shadow-layer-for-drop-shadow-filter-bz721058.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 (115528 => 115529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/Portfile 2014-01-04 08:53:07 UTC (rev 115528)
+++ trunk/dports/graphics/gimp2/Portfile 2014-01-04 09:47:12 UTC (rev 115529)
</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.10
</span><del>-revision 3
</del><ins>+revision 4
</ins><span class="cx"> license {GPL-2+ LGPL}
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers devans
</span><span class="lines">@@ -95,6 +95,10 @@
</span><span class="cx"> patch-file-xwd-sanity-check-colormap-size-CVE-2013-1913.diff \
</span><span class="cx"> patch-file-xwd-sanity-check-number-colors-CVE-2013-1978.diff \
</span><span class="cx"> patch-widget-direction-set-system-locale-not-user-bz679214.diff \
</span><ins>+ patch-mistaken-description-new-guides-from-selection-bz720598.diff \
+ patch-letter-spacing-in-text-tool-bz720492.diff \
+ patch-shadow-layer-for-drop-shadow-filter-bz721058.diff \
+ patch-gimpressionist-background-paper-not-aligned-bz720711.diff \
</ins><span class="cx"> patch-plug-ins-twain-tw_mac.c.diff
</span><span class="cx">
</span><span class="cx"> # gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm'
</span></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchgimpressionistbackgroundpapernotalignedbz720711diff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/gimp2/files/patch-gimpressionist-background-paper-not-aligned-bz720711.diff (0 => 115529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-gimpressionist-background-paper-not-aligned-bz720711.diff (rev 0)
+++ trunk/dports/graphics/gimp2/files/patch-gimpressionist-background-paper-not-aligned-bz720711.diff 2014-01-04 09:47:12 UTC (rev 115529)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+From efe9900c94be360bc55033b5adaf2975f62ae378 Mon Sep 17 00:00:00 2001
+From: Mark Schmitz <renegat.nospam@gmail.com>
+Date: Wed, 18 Dec 2013 17:35:06 +0000
+Subject: Bug 720711 - gimpressionist: Background paper is not aligned...
+
+...with the painted image
+
+gimpressionist: fix alignment of image and background paper.
+Additionally the resize function is now skipped for a scale of 100%.
+
+(cherry picked from commit 3afc53d866282a4fa8adda31c2adb3734eceb53b)
+---
+diff --git a/plug-ins/gimpressionist/repaint.c b/plug-ins/gimpressionist/repaint.c
+index ca7cbe2..5b0bf70 100644
+--- plug-ins/gimpressionist/repaint.c
++++ plug-ins/gimpressionist/repaint.c
+@@ -553,22 +553,37 @@ repaint (ppm_t *p, ppm_t *a)
+ }
+ else
+ {
+- scale = runningvals.paper_scale / 100.0;
++ int dx, dy;
++
+ ppm_new (&tmp, p->width, p->height);
+ ppm_load (runningvals.selected_paper, &paper_ppm);
+- resize (&paper_ppm, paper_ppm.width * scale, paper_ppm.height * scale);
++
++ if (runningvals.paper_scale != 100.0)
++ {
++ scale = runningvals.paper_scale / 100.0;
++ resize (&paper_ppm, paper_ppm.width * scale, paper_ppm.height * scale);
++ }
++
+ if (runningvals.paper_invert)
+ ppm_apply_gamma (&paper_ppm, -1.0, 1, 1, 1);
+- for (x = 0; x < tmp.width; x++)
++
++ dx = runningvals.general_paint_edges ? paper_ppm.width - maxbrushwidth : 0;
++ dy = runningvals.general_paint_edges ? paper_ppm.height - maxbrushheight : 0;
++
++ for (y = 0; y < tmp.height; y++)
+ {
+- int rx = x % paper_ppm.width;
++ int lx;
++ int ry = (y + dy) % paper_ppm.height;
+
+- for (y = 0; y < tmp.height; y++)
++ for (x = 0; x < tmp.width; x+=lx)
+ {
+- int ry = y % paper_ppm.height;
++ int rx = (x + dx) % paper_ppm.width;
++
++ lx = MIN (tmp.width - x, paper_ppm.width - rx);
++
+ memcpy (&tmp.col[y * tmp.width * 3 + x * 3],
+- &paper_ppm.col[ry*paper_ppm.width*3+rx*3],
+- 3);
++ &paper_ppm.col[ry * paper_ppm.width * 3 + rx * 3],
++ 3 * lx);
+ }
+ }
+ }
+--
+cgit v0.9.2
</ins></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchletterspacingintexttoolbz720492diff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/gimp2/files/patch-letter-spacing-in-text-tool-bz720492.diff (0 => 115529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-letter-spacing-in-text-tool-bz720492.diff (rev 0)
+++ trunk/dports/graphics/gimp2/files/patch-letter-spacing-in-text-tool-bz720492.diff 2014-01-04 09:47:12 UTC (rev 115529)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+From db602b3b3328275359e5714df33ae449e6e93774 Mon Sep 17 00:00:00 2001
+From: Michael Natterer <mitch@gimp.org>
+Date: Fri, 20 Dec 2013 12:11:53 +0000
+Subject: Bug 720492 - Letter spacing in Text Tool not reset to default
+
+Also reset the "letter-spacing" property in gimp_text_options_reset().
+
+(cherry picked from commit 81c02e7db1fa96ec6b7f0e84d4bc8b9ce2dca293)
+---
+diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c
+index 324fa13..061e1fb 100644
+--- app/tools/gimptextoptions.c
++++ app/tools/gimptextoptions.c
+@@ -380,6 +380,7 @@ gimp_text_options_reset (GimpToolOptions *tool_options)
+ gimp_config_reset_property (object, "justify");
+ gimp_config_reset_property (object, "indent");
+ gimp_config_reset_property (object, "line-spacing");
++ gimp_config_reset_property (object, "letter-spacing");
+ gimp_config_reset_property (object, "box-mode");
+ gimp_config_reset_property (object, "use-editor");
+ }
+--
+cgit v0.9.2
</ins></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchmistakendescriptionnewguidesfromselectionbz720598diff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/gimp2/files/patch-mistaken-description-new-guides-from-selection-bz720598.diff (0 => 115529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-mistaken-description-new-guides-from-selection-bz720598.diff (rev 0)
+++ trunk/dports/graphics/gimp2/files/patch-mistaken-description-new-guides-from-selection-bz720598.diff 2014-01-04 09:47:12 UTC (rev 115529)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+From 96da39c28e74c57fc6aebddd24629a7c9d8a5aee Mon Sep 17 00:00:00 2001
+From: SimaMoto,RyōTa <liangtai.s16@gmail.com>
+Date: Tue, 17 Dec 2013 13:27:30 +0000
+Subject: Bug 720598 - Mistaken description for 'New Guides from Selection
+
+Use original desc. for 'New Guides from Selection', it was
+accidentially changed in commit 6239dddda312157af72d596b9bdd6348bca275d3.
+
+(cherry picked from commit bebccb4a28ca9b6ec31a619f69f60d333edfbba2)
+---
+diff --git a/plug-ins/script-fu/scripts/guides-from-selection.scm b/plug-ins/script-fu/scripts/guides-from-selection.scm
+index 8f7c3bc..60a52f4 100644
+--- plug-ins/script-fu/scripts/guides-from-selection.scm
++++ plug-ins/script-fu/scripts/guides-from-selection.scm
+@@ -30,7 +30,7 @@
+
+ (script-fu-register "script-fu-guides-from-selection"
+ _"New Guides from _Selection"
+- _"Draw a grid as specified by the lists of X and Y locations using the current brush"
++ _"Create four guides around the bounding box of the current selection"
+ "Alan Horkan"
+ "Alan Horkan, 2004. Public Domain."
+ "2004-08-13"
+--
+cgit v0.9.2
</ins></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchshadowlayerfordropshadowfilterbz721058diff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/gimp2/files/patch-shadow-layer-for-drop-shadow-filter-bz721058.diff (0 => 115529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-shadow-layer-for-drop-shadow-filter-bz721058.diff (rev 0)
+++ trunk/dports/graphics/gimp2/files/patch-shadow-layer-for-drop-shadow-filter-bz721058.diff 2014-01-04 09:47:12 UTC (rev 115529)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+From cab66eb377f615695fedd7443d0b5d3fdb6cb48d Mon Sep 17 00:00:00 2001
+From: saul <saul@crazyauntgail.com>
+Date: Wed, 25 Dec 2013 22:56:43 +0000
+Subject: Bug 721058 - Shadow layer for Drop Shadow filter in wrong stack position
+
+Fix layer stack positioning for Drop Shadow.
+
+(cherry picked from commit 598673bc830d54c8a88bca3bb85f0565dfc4d011)
+---
+diff --git a/plug-ins/script-fu/scripts/drop-shadow.scm b/plug-ins/script-fu/scripts/drop-shadow.scm
+index 9f6cc2a..d7f8f9e 100644
+--- plug-ins/script-fu/scripts/drop-shadow.scm
++++ plug-ins/script-fu/scripts/drop-shadow.scm
+@@ -128,6 +128,7 @@
+ "Drop Shadow"
+ shadow-opacity
+ NORMAL-MODE)))
++ (gimp-image-set-active-layer image drawable)
+ (gimp-image-insert-layer image shadow-layer 0 -1)
+ (gimp-layer-set-offsets shadow-layer
+ shadow-offset-x
+--
+cgit v0.9.2
</ins></span></pre>
</div>
</div>
</body>
</html>