[115529] trunk/dports/graphics/gimp2

4 Jan 2014

Revision: 115529
          https://trac.macports.org/changeset/115529
Author:   devans@macports.org
Date:     2014-01-04 01:47:12 -0800 (Sat, 04 Jan 2014)
Log Message:
-----------
gimp2: apply upstream patches from gimp-2-8 branch.

Modified Paths:
--------------
    trunk/dports/graphics/gimp2/Portfile

Added Paths:
-----------
    trunk/dports/graphics/gimp2/files/patch-gimpressionist-background-paper-not-aligned-bz720711.diff
    trunk/dports/graphics/gimp2/files/patch-letter-spacing-in-text-tool-bz720492.diff
    trunk/dports/graphics/gimp2/files/patch-mistaken-description-new-guides-from-selection-bz720598.diff
    trunk/dports/graphics/gimp2/files/patch-shadow-layer-for-drop-shadow-filter-bz721058.diff

Modified: trunk/dports/graphics/gimp2/Portfile
===================================================================

--- 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)
@@ -8,7 +8,7 @@
 conflicts       gimp2-devel gimp3-devel
 # please remember to update the gimp metapackage to match
 version         2.8.10
-revision        3
+revision        4
 license         {GPL-2+ LGPL}
 categories      graphics
 maintainers     devans
@@ -95,6 +95,10 @@
                 patch-file-xwd-sanity-check-colormap-size-CVE-2013-1913.diff \
                 patch-file-xwd-sanity-check-number-colors-CVE-2013-1978.diff \
                 patch-widget-direction-set-system-locale-not-user-bz679214.diff \
+                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 \
                 patch-plug-ins-twain-tw_mac.c.diff
 
 # gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm'

Added: trunk/dports/graphics/gimp2/files/patch-gimpressionist-background-paper-not-aligned-bz720711.diff
===================================================================
--- 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)
@@ -0,0 +1,64 @@
+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

Added: trunk/dports/graphics/gimp2/files/patch-letter-spacing-in-text-tool-bz720492.diff
===================================================================
--- 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)
@@ -0,0 +1,23 @@
+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

Added: trunk/dports/graphics/gimp2/files/patch-mistaken-description-new-guides-from-selection-bz720598.diff
===================================================================
--- 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)
@@ -0,0 +1,25 @@
+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

Added: trunk/dports/graphics/gimp2/files/patch-shadow-layer-for-drop-shadow-filter-bz721058.diff
===================================================================
--- 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)
@@ -0,0 +1,23 @@
+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

    

[115529] trunk/dports/graphics/gimp2

devans＠macports.org