<!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>[124864] 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/124864">124864</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-08-29 14:04:03 -0700 (Fri, 29 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gimp2: update to version 2.8.14, now uses lcms2, delete outdated patches.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsgimp2Portfile">trunk/dports/graphics/gimp2/Portfile</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchetcgimprcdiff">trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsgimp2filespatchICCprofilewithlongdescriptionbz723177diff">trunk/dports/graphics/gimp2/files/patch-ICC-profile-with-long-description-bz723177.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchbrushoutlinenotdisplayedbz719593diff">trunk/dports/graphics/gimp2/files/patch-brush-outline-not-displayed-bz719593.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchcrashremovingtagfrompalettebz722975diff">trunk/dports/graphics/gimp2/files/patch-crash-removing-tag-from-palette-bz722975.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchcreatefilechooserbuttonbz699978diff">trunk/dports/graphics/gimp2/files/patch-create-filechooserbutton-bz699978.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchdontresetbrushsizebeforeeachpaintstrokebz721249diff">trunk/dports/graphics/gimp2/files/patch-dont-reset-brush-size-before-each-paint-stroke-bz721249.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatcherrorcloseportbz719396diff">trunk/dports/graphics/gimp2/files/patch-error-close-port-bz719396.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchfilexwdsanitycheckcolormapsizeCVE20131913diff">trunk/dports/graphics/gimp2/files/patch-file-xwd-sanity-check-colormap-size-CVE-2013-1913.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchfilexwdsanitychecknumbercolorsCVE20131978diff">trunk/dports/graphics/gimp2/files/patch-file-xwd-sanity-check-number-colors-CVE-2013-1978.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchfreetypeincludesdiff">trunk/dports/graphics/gimp2/files/patch-freetype-includes.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchgimppaintoptionssetdefaultbrushsizediff">trunk/dports/graphics/gimp2/files/patch-gimp-paint-options-set-default-brush-size.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchgimpressionistbackgroundpapernotalignedbz720711diff">trunk/dports/graphics/gimp2/files/patch-gimpressionist-background-paper-not-aligned-bz720711.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchhalttransformtoolwhenswitchingdiff">trunk/dports/graphics/gimp2/files/patch-halt-transform-tool-when-switching.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="#trunkdportsgraphicsgimp2filespatchpaletteeditornotworkingnewpalettesbz719634diff">trunk/dports/graphics/gimp2/files/patch-palette-editor-not-working-new-palettes-bz719634.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchpluginborderaveragereturngarbagealphavaluebz719662diff">trunk/dports/graphics/gimp2/files/patch-plug-in-borderaverage-return-garbage-alpha-value-bz719662.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchpluginstwaintw_maccdiff">trunk/dports/graphics/gimp2/files/patch-plug-ins-twain-tw_mac.c.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchpluginsbmpdontcheckbiClrUsedbz697431diff">trunk/dports/graphics/gimp2/files/patch-plugins-bmp-dont-check-biClrUsed-bz697431.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchremoveacceleratormarkerspythonfutooltipsdiff">trunk/dports/graphics/gimp2/files/patch-remove-accelerator-markers-python-fu-tooltips.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchremoveconfirmonclosepreferencediff">trunk/dports/graphics/gimp2/files/patch-remove-confirm-on-close-preference.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchshadowlayerfordropshadowfilterbz721058diff">trunk/dports/graphics/gimp2/files/patch-shadow-layer-for-drop-shadow-filter-bz721058.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchsnappingbehaviorscaletoolbz722034diff">trunk/dports/graphics/gimp2/files/patch-snapping-behavior-scale-tool-bz722034.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchwidgetdirectionsetsystemlocalenotuserbz679214diff">trunk/dports/graphics/gimp2/files/patch-widget-direction-set-system-locale-not-user-bz679214.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchwritingcharacterconstantsbz721775diff">trunk/dports/graphics/gimp2/files/patch-writing-character-constants-bz721775.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchwrongnametransfertooldialogsbz701159diff">trunk/dports/graphics/gimp2/files/patch-wrong-name-transfer-tool-dialogs-bz701159.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 (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/Portfile 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/Portfile 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -7,9 +7,8 @@
</span><span class="cx"> name gimp2
</span><span class="cx"> conflicts gimp2-devel gimp3-devel
</span><span class="cx"> # please remember to update the gimp metapackage to match
</span><del>-version 2.8.10
-revision 6
-license {GPL-2+ LGPL}
</del><ins>+version 2.8.14
+license GPL-3+
</ins><span class="cx"> categories graphics
</span><span class="cx"> maintainers devans
</span><span class="cx"> homepage http://www.gimp.org/
</span><span class="lines">@@ -29,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 c5364c49af2c695bc3d0bd97e792bf3ad75b1175 \
- sha256 e7fd8b19f989138d826003c75f56bd5b6f136eef597e86e3978ede0bba470ae6
</del><ins>+checksums rmd160 eb1f1e590200416c593cd227b6de6eb9951b3ca7 \
+ sha256 d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -59,7 +58,7 @@
</span><span class="cx"> port:curl \
</span><span class="cx"> port:libwmf \
</span><span class="cx"> port:jasper \
</span><del>- port:lcms \
</del><ins>+ port:lcms2 \
</ins><span class="cx"> port:dbus-glib \
</span><span class="cx"> port:libxml2 \
</span><span class="cx"> port:libxslt \
</span><span class="lines">@@ -70,32 +69,7 @@
</span><span class="cx">
</span><span class="cx"> depends_run path:share/gimp/2.0/help:gimp-help-en
</span><span class="cx">
</span><del>-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-error-close-port-bz719396.diff \
- 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-gimp-paint-options-set-default-brush-size.diff \
- patch-remove-accelerator-markers-python-fu-tooltips.diff \
- patch-create-filechooserbutton-bz699978.diff \
- patch-crash-removing-tag-from-palette-bz722975.diff \
- patch-ICC-profile-with-long-description-bz723177.diff \
- patch-remove-confirm-on-close-preference.diff \
- patch-snapping-behavior-scale-tool-bz722034.diff \
- patch-plugins-bmp-dont-check-biClrUsed-bz697431.diff \
- patch-dont-reset-brush-size-before-each-paint-stroke-bz721249.diff \
- patch-writing-character-constants-bz721775.diff \
- patch-halt-transform-tool-when-switching.diff \
- patch-wrong-name-transfer-tool-dialogs-bz701159.diff \
- patch-plug-ins-twain-tw_mac.c.diff
</del><ins>+patchfiles patch-etc-gimprc.diff
</ins><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 class="cx"> compiler.blacklist-append gcc-3.3 gcc-4.0 gcc-4.2 apple-gcc-4.2
</span><span class="lines">@@ -118,13 +92,13 @@
</span><span class="cx"> copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4macros
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><span class="cx"> configure.args --build=${configure.build_arch}-apple-${os.platform}${os.version} \
</span><span class="cx"> --enable-mp \
</span><span class="cx"> --with-pdbgen \
</span><ins>+ --with-lcms=2 \
</ins><span class="cx"> --with-x \
</span><span class="cx"> --x-includes=${prefix}/include \
</span><span class="cx"> --x-libraries=${prefix}/lib \
</span><span class="lines">@@ -133,14 +107,16 @@
</span><span class="cx"> --without-alsa \
</span><span class="cx"> --without-gvfs \
</span><span class="cx"> --without-gudev \
</span><del>- --without-webkit \
- --without-mac-twain
</del><ins>+ --without-webkit
</ins><span class="cx">
</span><span class="cx"> # --without-mac-twain:
</span><span class="cx"> # Leopard's 64bit Carbon is missing QuitApplicationEventLoop
</span><del>-# It doesn't build any more anyways:
</del><ins>+# It doesn't build any more anyway:
</ins><span class="cx"> # https://trac.macports.org/ticket/35168
</span><span class="cx">
</span><ins>+configure.args-append \
+ --without-mac-twain
+
</ins><span class="cx"> variant python26 conflicts python27 description {Use python 2.6} {
</span><span class="cx"> configure.args-delete --disable-python
</span><span class="cx"> configure.python ${prefix}/bin/python2.6
</span><span class="lines">@@ -194,7 +170,7 @@
</span><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
</span><del>- configure.args-append --without-lcms
</del><ins>+ configure.args-replace --with-lcms=2 --without-lcms
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchICCprofilewithlongdescriptionbz723177diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-ICC-profile-with-long-description-bz723177.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-ICC-profile-with-long-description-bz723177.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-ICC-profile-with-long-description-bz723177.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-From 8b6b6add69d3f0d66287a3d2b4e951f28e0d7103 Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Tue, 28 Jan 2014 17:54:46 +0000
-Subject: Bug 723177 - After opening an ICC profile with a long description...
-
-...dialogs are too wide
-
-Ellipsize GimpColorProfileComboBox' label.
-
-(cherry picked from commit 219bf3529942f9b12d65cf93705dbeaf0a9812cb)
----
-diff --git a/libgimpwidgets/gimpcolorprofilecombobox.c b/libgimpwidgets/gimpcolorprofilecombobox.c
-index 10bde3a..0a1b319 100644
---- libgimpwidgets/gimpcolorprofilecombobox.c
-+++ libgimpwidgets/gimpcolorprofilecombobox.c
-@@ -130,6 +130,11 @@ gimp_color_profile_combo_box_init (GimpColorProfileComboBox *combo_box)
- {
- GtkCellRenderer *cell = gtk_cell_renderer_text_new ();
-
-+ g_object_set (cell,
-+ "ellipsize", PANGO_ELLIPSIZE_END,
-+ NULL);
-+
-+
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), cell,
- "text", GIMP_COLOR_PROFILE_STORE_LABEL,
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchbrushoutlinenotdisplayedbz719593diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-brush-outline-not-displayed-bz719593.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-brush-outline-not-displayed-bz719593.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-brush-outline-not-displayed-bz719593.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-From ecefaead96fce52d499dccdb02191b3e93352231 Mon Sep 17 00:00:00 2001
-From: Michael Henning <drawoc@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
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchcrashremovingtagfrompalettebz722975diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-crash-removing-tag-from-palette-bz722975.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-crash-removing-tag-from-palette-bz722975.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-crash-removing-tag-from-palette-bz722975.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,146 +0,0 @@
</span><del>-From 2ec7e24d805d1f524fe455ed08ac641c5244a6e6 Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Sun, 26 Jan 2014 20:03:28 +0000
-Subject: Bug 722975 - crash when removing tag from palette while filtering by same tag
-
-Each of the following cleans up tag refcounting, fixes access to
-released memory, or other small glitches. Not sure which change
-actually fixed the bug:
-
-gimp_data_remove_tag(): remove the found tag, not the passed in tag
-(which is to be treated only as a value for comparison).
-
-gimp_tagged_remove_tag(): don't continue the loop after the tag to
-remove has been found, there can only be one matching tag, and the
-list element has become invalid.
-
-gimptagentry.c: keep references around for the members of
-entry->common_tags, and make sure the references are always dropped
-properly. In assign_tags(), reference the "add" and "remove" lists for
-paranoia and safety reasons.
-
-(cherry picked from commit 7fca15c27dd944890a67bb6db90c0b1fd4238f2f)
----
-diff --git a/app/core/gimpdata.c b/app/core/gimpdata.c
-index 711d38f..76806ff 100644
---- app/core/gimpdata.c
-+++ app/core/gimpdata.c
-@@ -421,7 +421,7 @@ gimp_data_remove_tag (GimpTagged *tagged,
- if (gimp_tag_equals (tag, this))
- {
- private->tags = g_list_delete_link (private->tags, list);
-- g_object_unref (tag);
-+ g_object_unref (this);
- return TRUE;
- }
- }
-diff --git a/app/core/gimptagged.c b/app/core/gimptagged.c
-index 9c44940..b04304a 100644
---- app/core/gimptagged.c
-+++ app/core/gimptagged.c
-@@ -153,6 +153,8 @@ gimp_tagged_remove_tag (GimpTagged *tagged,
- }
-
- g_object_unref (tag_ref);
-+
-+ return;
- }
- }
- }
-diff --git a/app/widgets/gimptagentry.c b/app/widgets/gimptagentry.c
-index 5593801..73227e1 100644
---- app/widgets/gimptagentry.c
-+++ app/widgets/gimptagentry.c
-@@ -227,7 +227,7 @@ gimp_tag_entry_dispose (GObject *object)
-
- if (entry->common_tags)
- {
-- g_list_free (entry->common_tags);
-+ g_list_free_full (entry->common_tags, (GDestroyNotify) g_object_unref);
- entry->common_tags = NULL;
- }
-
-@@ -761,7 +761,7 @@ gimp_tag_entry_assign_tags (GimpTagEntry *tag_entry)
- }
- else
- {
-- add_list = g_list_prepend (add_list, tag);
-+ add_list = g_list_prepend (add_list, g_object_ref (tag));
- }
-
- common_tags = g_list_prepend (common_tags, tag);
-@@ -778,7 +778,8 @@ gimp_tag_entry_assign_tags (GimpTagEntry *tag_entry)
- if (! g_list_find_custom (dont_remove_list, tag_iter->data,
- gimp_tag_compare_func))
- {
-- remove_list = g_list_prepend (remove_list, tag_iter->data);
-+ remove_list = g_list_prepend (remove_list,
-+ g_object_ref (tag_iter->data));
- }
- }
-
-@@ -792,20 +793,20 @@ gimp_tag_entry_assign_tags (GimpTagEntry *tag_entry)
-
- for (tag_iter = remove_list; tag_iter; tag_iter = g_list_next (tag_iter))
- {
-- gimp_tagged_remove_tag (tagged, GIMP_TAG (tag_iter->data));
-+ gimp_tagged_remove_tag (tagged, tag_iter->data);
- }
-
- for (tag_iter = add_list; tag_iter; tag_iter = g_list_next (tag_iter))
- {
-- gimp_tagged_add_tag (tagged, GIMP_TAG (tag_iter->data));
-+ gimp_tagged_add_tag (tagged, tag_iter->data);
- }
- }
-
-- g_list_free (add_list);
-- g_list_free (remove_list);
-+ g_list_free_full (add_list, (GDestroyNotify) g_object_unref);
-+ g_list_free_full (remove_list, (GDestroyNotify) g_object_unref);
-
- /* common tags list with changes applied. */
-- g_list_free (tag_entry->common_tags);
-+ g_list_free_full (tag_entry->common_tags, (GDestroyNotify) g_object_unref);
- tag_entry->common_tags = common_tags;
- }
-
-@@ -903,7 +904,7 @@ gimp_tag_entry_set_selected_items (GimpTagEntry *tag_entry,
-
- if (tag_entry->common_tags)
- {
-- g_list_free (tag_entry->common_tags);
-+ g_list_free_full (tag_entry->common_tags, (GDestroyNotify) g_object_unref);
- tag_entry->common_tags = NULL;
- }
-
-@@ -956,7 +957,7 @@ gimp_tag_entry_load_selection (GimpTagEntry *tag_entry,
- }
- }
-
-- g_hash_table_foreach (refcounts, gimp_tag_entry_find_common_tags,tag_entry);
-+ g_hash_table_foreach (refcounts, gimp_tag_entry_find_common_tags, tag_entry);
-
- g_hash_table_destroy (refcounts);
-
-@@ -996,7 +997,8 @@ gimp_tag_entry_find_common_tags (gpointer key,
- /* FIXME: more efficient list length */
- if (ref_count == g_list_length (tag_entry->selected_items))
- {
-- tag_entry->common_tags = g_list_prepend (tag_entry->common_tags, key);
-+ tag_entry->common_tags = g_list_prepend (tag_entry->common_tags,
-+ g_object_ref (key));
- }
- }
-
-@@ -1215,7 +1217,7 @@ gimp_tag_entry_container_changed (GimpContainer *container,
- {
- if (gimp_tagged_get_tags (GIMP_TAGGED (list->data)) &&
- gimp_container_have (GIMP_CONTAINER (tag_entry->container),
-- GIMP_OBJECT(list->data)))
-+ GIMP_OBJECT (list->data)))
- {
- break;
- }
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchcreatefilechooserbuttonbz699978diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-create-filechooserbutton-bz699978.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-create-filechooserbutton-bz699978.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-create-filechooserbutton-bz699978.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,111 +0,0 @@
</span><del>-From 20523c61aca40ac1189c444e77ee73f6aa81bdbb Mon Sep 17 00:00:00 2001
-From: João S. O. Bueno <gwidion@gmail.com>
-Date: Thu, 09 Jan 2014 02:44:55 +0000
-Subject: Creates a FileChooserbutton that can pick new filenames. Fixes #699978
-
----
-diff --git a/plug-ins/pygimp/gimpfu.py b/plug-ins/pygimp/gimpfu.py
-index 5c7304d..8bd79fd 100644
---- plug-ins/pygimp/gimpfu.py
-+++ plug-ins/pygimp/gimpfu.py
-@@ -581,25 +581,61 @@ def _interact(proc_name, start_params):
- def get_value(self):
- return self.get_active()
-
-- def FileSelector(default=""):
-+ def FileSelector(default="", title=None):
- # FIXME: should this be os.path.separator? If not, perhaps explain why?
- if default and default.endswith("/"):
-- selector = DirnameSelector
- if default == "/": default = ""
-+ return DirnameSelector(default)
- else:
-- selector = FilenameSelector
-- return selector(default)
--
-- class FilenameSelector(gtk.FileChooserButton):
-- def __init__(self, default="", save_mode=False):
-- gtk.FileChooserButton.__init__(self,
-- _("Python-Fu File Selection"))
-- self.set_action(gtk.FILE_CHOOSER_ACTION_OPEN)
-+ return FilenameSelector(default, title=title)
-+
-+ class FilenameSelector(gtk.HBox):
-+ #gimpfu.FileChooserButton
-+ def __init__(self, default, save_mode=True, title=None):
-+ super(FilenameSelector, self).__init__()
-+ if not title:
-+ self.title = _("Python-Fu File Selection")
-+ else:
-+ self.title = title
-+ self.save_mode = save_mode
-+ box = self
-+ self.entry = gtk.Entry()
-+ image = gtk.Image()
-+ image.set_from_stock(gtk.STOCK_FILE, gtk.ICON_SIZE_BUTTON)
-+ self.button = gtk.Button()
-+ self.button.set_image(image)
-+ box.pack_start(self.entry)
-+ box.pack_start(self.button)
-+ self.button.connect("clicked", self.pick_file)
- if default:
-- self.set_filename(default)
-+ self.entry.set_text(default)
-+
-+ def show(self):
-+ super(FilenameSelector, self).show()
-+ self.button.show()
-+ self.entry.show()
-+
-+ def pick_file(self, widget):
-+ entry = self.entry
-+ dialog = gtk.FileChooserDialog(
-+ title=self.title,
-+ action=(gtk.FILE_CHOOSER_ACTION_SAVE
-+ if self.save_mode else
-+ gtk.FILE_CHOOSER_ACTION_OPEN),
-+ buttons=(gtk.STOCK_CANCEL,
-+ gtk.RESPONSE_CANCEL,
-+ gtk.STOCK_OPEN,
-+ gtk.RESPONSE_OK)
-+ )
-+ dialog.show_all()
-+ response = dialog.run()
-+ if response == gtk.RESPONSE_OK:
-+ entry.set_text(dialog.get_filename())
-+ dialog.destroy()
-
- def get_value(self):
-- return self.get_filename()
-+ return self.entry.get_text()
-+
-
- class DirnameSelector(gtk.FileChooserButton):
- def __init__(self, default=""):
-@@ -719,17 +755,22 @@ def _interact(proc_name, start_params):
- table.attach(label, 1, 2, i, i+1, xoptions=gtk.FILL)
- label.show()
-
-+ # Remove accelerator markers from tooltips
-+ tooltip_text = desc.replace("_", "")
-+
- if pf_type in (PF_SPINNER, PF_SLIDER, PF_RADIO, PF_OPTION):
- wid = _edit_mapping[pf_type](def_val, params[i][4])
-+ elif pf_type in (PF_FILE, PF_FILENAME):
-+ wid = _edit_mapping[pf_type](def_val, title= "%s - %s" %
-+ (proc_name, tooltip_text))
- else:
- wid = _edit_mapping[pf_type](def_val)
-
-+
- label.set_mnemonic_widget(wid)
-
- table.attach(wid, 2,3, i,i+1, yoptions=0)
-
-- # Remove accelerator markers from tooltips
-- tooltip_text = desc.replace("_", "")
- if pf_type != PF_TEXT:
- wid.set_tooltip_text(tooltip_text)
- else:
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchdontresetbrushsizebeforeeachpaintstrokebz721249diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-dont-reset-brush-size-before-each-paint-stroke-bz721249.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-dont-reset-brush-size-before-each-paint-stroke-bz721249.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-dont-reset-brush-size-before-each-paint-stroke-bz721249.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-From 6cb5fcafb04c515f8773f81d6867efcedd95688e Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Mon, 03 Feb 2014 22:05:56 +0000
-Subject: Bug 721249 - pdb.gimp_context_set_brush_size() dont't work
-
-Don't reset the brush size before each PDB paint stroke.
-
-(cherry picked from commit 9fe869236bbf178ac9699e0e789f78aa085e5ef6)
----
-diff --git a/app/pdb/paint-tools-cmds.c b/app/pdb/paint-tools-cmds.c
-index d1d6de3..ba1c826 100644
---- app/pdb/paint-tools-cmds.c
-+++ app/pdb/paint-tools-cmds.c
-@@ -62,10 +62,6 @@ paint_tools_stroke (Gimp *gimp,
-
- n_strokes /= 2; /* #doubles -> #points */
-
-- /* FIXME: i'm most certain that this is wrong, see bug 721249 --mitch */
-- gimp_paint_options_set_default_brush_size (options,
-- gimp_context_get_brush (context));
--
- /* undefine the paint-relevant context properties and get them
- * from the current context
- */
-diff --git a/tools/pdbgen/pdb/paint_tools.pdb b/tools/pdbgen/pdb/paint_tools.pdb
-index 8544a56..d084e25 100644
---- tools/pdbgen/pdb/paint_tools.pdb
-+++ tools/pdbgen/pdb/paint_tools.pdb
-@@ -987,10 +987,6 @@ paint_tools_stroke (Gimp *gimp,
-
- n_strokes /= 2; /* #doubles -> #points */
-
-- /* FIXME: i'm most certain that this is wrong, see bug 721249 --mitch */
-- gimp_paint_options_set_default_brush_size (options,
-- gimp_context_get_brush (context));
--
- /* undefine the paint-relevant context properties and get them
- * from the current context
- */
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatcherrorcloseportbz719396diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-error-close-port-bz719396.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-error-close-port-bz719396.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-error-close-port-bz719396.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,21 +0,0 @@
</span><del>-From f1677dea03fa3685887bdcb04f927158cbfeb15c Mon Sep 17 00:00:00 2001
-From: Kevin Cozens <kevin@ve3syb.ca>
-Date: Tue, 03 Dec 2013 01:17:05 +0000
-Subject: Fixed an error in the close-port function. Closes bug #719396.
-
----
-diff --git a/plug-ins/script-fu/scripts/script-fu.init b/plug-ins/script-fu/scripts/script-fu.init
-index 120ecc7..9f8c5a6 100644
---- plug-ins/script-fu/scripts/script-fu.init
-+++ plug-ins/script-fu/scripts/script-fu.init
-@@ -603,7 +603,7 @@
-
- (define (close-port p)
- (cond
-- ((input-output-port? p) (close-input-port (close-output-port p)))
-+ ((input-output-port? p) (close-input-port p) (close-output-port p))
- ((input-port? p) (close-input-port p))
- ((output-port? p) (close-output-port p))
- (else (throw "Not a port" p))))
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchetcgimprcdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><del>---- etc/gimprc.orig 2012-04-02 16:28:33.000000000 -0700
-+++ etc/gimprc 2012-07-10 08:55:00.000000000 -0700
-@@ -689,6 +689,8 @@
</del><ins>+--- etc/gimprc.orig 2014-08-25 12:49:30.000000000 -0700
++++ etc/gimprc 2014-08-25 19:08:51.000000000 -0700
+@@ -684,6 +684,8 @@
</ins><span class="cx"> #
</span><span class="cx"> # (dock-window-hint utility)
</span><span class="cx">
</span><del>-+(dock-window-hint utility)
</del><ins>++(dock-window-hint normal)
</ins><span class="cx"> +
</span><span class="cx"> # Sets the pixel format to use for mouse pointers. Possible values are
</span><span class="cx"> # bitmap and pixbuf.
</span></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchfilexwdsanitycheckcolormapsizeCVE20131913diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-file-xwd-sanity-check-colormap-size-CVE-2013-1913.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-file-xwd-sanity-check-colormap-size-CVE-2013-1913.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-file-xwd-sanity-check-colormap-size-CVE-2013-1913.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-From 7f2322e4ced8ba393abc5a0aa15a607f340f0db8 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Thu, 14 Nov 2013 13:29:01 +0000
-Subject: file-xwd: sanity check colormap size (CVE-2013-1913)
-
-(cherry picked from commit 32ae0f83e5748299641cceaabe3f80f1b3afd03e)
----
-diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c
-index 3240f7e..2625f69 100644
---- plug-ins/common/file-xwd.c
-+++ plug-ins/common/file-xwd.c
-@@ -461,6 +461,17 @@ 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);
-+ fclose (ifp);
-+ return -1;
-+ }
-+
- if (xwdhdr.l_colormap_entries > 0)
- {
- xwdcolmap = g_new (L_XWDCOLOR, xwdhdr.l_colormap_entries);
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchfilexwdsanitychecknumbercolorsCVE20131978diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-file-xwd-sanity-check-number-colors-CVE-2013-1978.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-file-xwd-sanity-check-number-colors-CVE-2013-1978.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-file-xwd-sanity-check-number-colors-CVE-2013-1978.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,152 +0,0 @@
</span><del>-From 0ffb3b6753aad00512349bba31bf5113054c6a0e Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Tue, 26 Nov 2013 09:49:42 +0000
-Subject: file-xwd: 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().
-
-(cherry picked from commit 23f685931e5f000dd033a45c60c1e60d7f78caf4)
----
-diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c
-index 2625f69..ba07afd 100644
---- plug-ins/common/file-xwd.c
-+++ 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
-@@ -468,12 +467,18 @@ load_image (const gchar *filename,
- g_message (_("'%s':\nIllegal number of colormap entries: %ld"),
- gimp_filename_to_utf8 (filename),
- (long)xwdhdr.l_colormap_entries);
-- fclose (ifp);
-- return -1;
-+ 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);
-@@ -493,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;
- }
- }
-
-@@ -503,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
-@@ -513,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'"),
-@@ -582,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. "
-@@ -594,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 v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchfreetypeincludesdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-freetype-includes.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-freetype-includes.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-freetype-includes.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>---- app/text/gimpfont.c.orig 2013-11-29 00:04:37.000000000 -0800
-+++ app/text/gimpfont.c 2013-11-29 00:05:43.000000000 -0800
-@@ -27,7 +27,8 @@
-
- #define PANGO_ENABLE_ENGINE 1 /* Argh */
- #include <pango/pango-ot.h>
--#include <freetype/tttables.h>
-+#include <ft2build.h>
-+#include FT_TRUETYPE_TABLES_H
-
- #include "text-types.h"
-
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchgimppaintoptionssetdefaultbrushsizediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-gimp-paint-options-set-default-brush-size.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-gimp-paint-options-set-default-brush-size.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-gimp-paint-options-set-default-brush-size.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,273 +0,0 @@
</span><del>-From b4477d8e01e4b03121a9b834d35b69d0d8374638 Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Sat, 04 Jan 2014 14:45:25 +0000
-Subject: app: add gimp_paint_options_set_default_brush_size()
-
-and use it globally instead of two different methods, one of which was
-forgotten to be ported to the new aspect ratio range where 0.0 means
-1:1. Add a FIXME comment in paint_tools.pdb where I think setting the
-default size is a bug, see #721249.
-
-(cherry picked from commit ef858453724f6d4ca105fc9daec038fdff358f30)
----
-diff --git a/app/core/gimpstrokeoptions.c b/app/core/gimpstrokeoptions.c
-index 832e99a..9505398 100644
---- app/core/gimpstrokeoptions.c
-+++ app/core/gimpstrokeoptions.c
-@@ -31,7 +31,6 @@
- #include "config/gimpcoreconfig.h"
-
- #include "gimp.h"
--#include "gimpbrush.h"
- #include "gimpcontext.h"
- #include "gimpdashpattern.h"
- #include "gimpmarshal.h"
-@@ -566,24 +565,10 @@ gimp_stroke_options_prepare (GimpStrokeOptions *options,
-
- if (use_default_values)
- {
-- GimpBrush *brush;
-- gdouble brush_size;
-- gint height;
-- gint width;
--
- paint_options = gimp_paint_options_new (paint_info);
-
-- brush = gimp_context_get_brush (context);
--
-- if (GIMP_IS_BRUSH (brush))
-- {
-- gimp_brush_transform_size (brush, 1.0, 1.0, 0.0, &height, &width);
-- brush_size = MAX (height, width);
--
-- g_object_set (paint_options,
-- "brush-size", brush_size,
-- NULL);
-- }
-+ gimp_paint_options_set_default_brush_size (paint_options,
-+ gimp_context_get_brush (context));
-
- /* undefine the paint-relevant context properties and get them
- * from the passed context
-diff --git a/app/paint/gimppaintoptions.c b/app/paint/gimppaintoptions.c
-index 10430a2..a624f2d 100644
---- app/paint/gimppaintoptions.c
-+++ app/paint/gimppaintoptions.c
-@@ -26,6 +26,7 @@
- #include "paint-types.h"
-
- #include "core/gimp.h"
-+#include "core/gimpbrush.h"
- #include "core/gimpimage.h"
- #include "core/gimpdynamics.h"
- #include "core/gimpdynamicsoutput.h"
-@@ -715,6 +716,29 @@ gimp_paint_options_get_brush_mode (GimpPaintOptions *paint_options)
- }
-
- void
-+gimp_paint_options_set_default_brush_size (GimpPaintOptions *paint_options,
-+ GimpBrush *brush)
-+{
-+ g_return_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options));
-+ g_return_if_fail (brush == NULL || GIMP_IS_BRUSH (brush));
-+
-+ if (! brush)
-+ brush = gimp_context_get_brush (GIMP_CONTEXT (paint_options));
-+
-+ if (brush)
-+ {
-+ gint height;
-+ gint width;
-+
-+ gimp_brush_transform_size (brush, 1.0, 0.0, 0.0, &height, &width);
-+
-+ g_object_set (paint_options,
-+ "brush-size", (gdouble) MAX (height, width),
-+ NULL);
-+ }
-+}
-+
-+void
- gimp_paint_options_copy_brush_props (GimpPaintOptions *src,
- GimpPaintOptions *dest)
- {
-diff --git a/app/paint/gimppaintoptions.h b/app/paint/gimppaintoptions.h
-index 70c4e40..a5a84c9 100644
---- app/paint/gimppaintoptions.h
-+++ app/paint/gimppaintoptions.h
-@@ -132,6 +132,9 @@ gboolean gimp_paint_options_get_gradient_color (GimpPaintOptions *paint_options,
- GimpBrushApplicationMode
- gimp_paint_options_get_brush_mode (GimpPaintOptions *paint_options);
-
-+void gimp_paint_options_set_default_brush_size (GimpPaintOptions *paint_options,
-+ GimpBrush *brush);
-+
- void gimp_paint_options_copy_brush_props (GimpPaintOptions *src,
- GimpPaintOptions *dest);
- void gimp_paint_options_copy_dynamics_props (GimpPaintOptions *src,
-diff --git a/app/pdb/context-cmds.c b/app/pdb/context-cmds.c
-index bf4ab08..ac2fc64 100644
---- app/pdb/context-cmds.c
-+++ app/pdb/context-cmds.c
-@@ -28,12 +28,11 @@
-
- #include "pdb-types.h"
-
--#include "base/temp-buf.h"
- #include "core/gimp.h"
--#include "core/gimpbrush.h"
- #include "core/gimpcontainer.h"
- #include "core/gimpdatafactory.h"
- #include "core/gimpparamspecs.h"
-+#include "paint/gimppaintoptions.h"
- #include "plug-in/gimpplugin-context.h"
- #include "plug-in/gimpplugin.h"
- #include "plug-in/gimppluginmanager.h"
-@@ -509,10 +508,7 @@ context_set_brush_default_size_invoker (GimpProcedure *procedure,
- options = gimp_pdb_context_get_brush_options (GIMP_PDB_CONTEXT (context));
-
- for (list = options; list; list = g_list_next (list))
-- g_object_set (list->data,
-- "brush-size", (gdouble) MAX (brush->mask->width,
-- brush->mask->height),
-- NULL);
-+ gimp_paint_options_set_default_brush_size (list->data, brush);
-
- g_list_free (options);
- }
-diff --git a/app/pdb/paint-tools-cmds.c b/app/pdb/paint-tools-cmds.c
-index 99faf15..d1d6de3 100644
---- app/pdb/paint-tools-cmds.c
-+++ app/pdb/paint-tools-cmds.c
-@@ -26,7 +26,6 @@
-
- #include "pdb-types.h"
-
--#include "core/gimpbrush.h"
- #include "core/gimpdrawable.h"
- #include "core/gimpdynamics.h"
- #include "core/gimppaintinfo.h"
-@@ -57,22 +56,15 @@ paint_tools_stroke (Gimp *gimp,
- {
- GimpPaintCore *core;
- GimpCoords *coords;
-- GimpBrush *brush;
- gboolean retval;
-- gdouble brush_size;
-- gint height, width;
- gint i;
- va_list args;
-
- n_strokes /= 2; /* #doubles -> #points */
-
-- brush = gimp_context_get_brush (context);
-- gimp_brush_transform_size (brush, 1.0, 1.0, 0.0, &height, &width);
-- brush_size = MAX (height, width);
--
-- g_object_set (options,
-- "brush-size", brush_size,
-- NULL);
-+ /* FIXME: i'm most certain that this is wrong, see bug 721249 --mitch */
-+ gimp_paint_options_set_default_brush_size (options,
-+ gimp_context_get_brush (context));
-
- /* undefine the paint-relevant context properties and get them
- * from the current context
-diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c
-index 9ba8f74..11ca180 100644
---- app/tools/gimppaintoptions-gui.c
-+++ app/tools/gimppaintoptions-gui.c
-@@ -23,9 +23,6 @@
-
- #include "tools-types.h"
-
--#include "base/temp-buf.h"
--
--#include "core/gimpbrush.h"
- #include "core/gimptoolinfo.h"
-
- #include "paint/gimppaintoptions.h"
-@@ -411,12 +408,7 @@ gimp_paint_options_gui_reset_size (GtkWidget *button,
- GimpBrush *brush = gimp_context_get_brush (GIMP_CONTEXT (paint_options));
-
- if (brush)
-- {
-- g_object_set (paint_options,
-- "brush-size", (gdouble) MAX (brush->mask->width,
-- brush->mask->height),
-- NULL);
-- }
-+ gimp_paint_options_set_default_brush_size (paint_options, brush);
- }
-
- static void
-diff --git a/tools/pdbgen/pdb/context.pdb b/tools/pdbgen/pdb/context.pdb
-index 8e1447e..3dfbe4b 100644
---- tools/pdbgen/pdb/context.pdb
-+++ tools/pdbgen/pdb/context.pdb
-@@ -569,10 +569,7 @@ HELP
- options = gimp_pdb_context_get_brush_options (GIMP_PDB_CONTEXT (context));
-
- for (list = options; list; list = g_list_next (list))
-- g_object_set (list->data,
-- "brush-size", (gdouble) MAX (brush->mask->width,
-- brush->mask->height),
-- NULL);
-+ gimp_paint_options_set_default_brush_size (list->data, brush);
-
- g_list_free (options);
- }
-@@ -2195,11 +2192,10 @@ CODE
- );
- }
-
--@headers = qw("base/temp-buf.h"
-- "core/gimp.h"
-- "core/gimpbrush.h"
-+@headers = qw("core/gimp.h"
- "core/gimpcontainer.h"
- "core/gimpdatafactory.h"
-+ "paint/gimppaintoptions.h"
- "libgimpconfig/gimpconfig.h"
- "plug-in/gimpplugin.h"
- "plug-in/gimpplugin-context.h"
-diff --git a/tools/pdbgen/pdb/paint_tools.pdb b/tools/pdbgen/pdb/paint_tools.pdb
-index f82c140..8544a56 100644
---- tools/pdbgen/pdb/paint_tools.pdb
-+++ tools/pdbgen/pdb/paint_tools.pdb
-@@ -981,22 +981,15 @@ paint_tools_stroke (Gimp *gimp,
- {
- GimpPaintCore *core;
- GimpCoords *coords;
-- GimpBrush *brush;
- gboolean retval;
-- gdouble brush_size;
-- gint height, width;
- gint i;
- va_list args;
-
- n_strokes /= 2; /* #doubles -> #points */
-
-- brush = gimp_context_get_brush (context);
-- gimp_brush_transform_size (brush, 1.0, 1.0, 0.0, &height, &width);
-- brush_size = MAX (height, width);
--
-- g_object_set (options,
-- "brush-size", brush_size,
-- NULL);
-+ /* FIXME: i'm most certain that this is wrong, see bug 721249 --mitch */
-+ gimp_paint_options_set_default_brush_size (options,
-+ gimp_context_get_brush (context));
-
- /* undefine the paint-relevant context properties and get them
- * from the current context
-@@ -1036,7 +1029,6 @@ CODE
-
- @headers = qw("libgimpmath/gimpmath.h"
- "libgimpconfig/gimpconfig.h"
-- "core/gimpbrush.h"
- "core/gimpdynamics.h"
- "core/gimppaintinfo.h"
- "paint/gimppaintcore.h"
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchgimpressionistbackgroundpapernotalignedbz720711diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-gimpressionist-background-paper-not-aligned-bz720711.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-gimpressionist-background-paper-not-aligned-bz720711.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-gimpressionist-background-paper-not-aligned-bz720711.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,64 +0,0 @@
</span><del>-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
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchhalttransformtoolwhenswitchingdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-halt-transform-tool-when-switching.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-halt-transform-tool-when-switching.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-halt-transform-tool-when-switching.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-From 72942f4e6b4aa25698b6432f7a20494f61ec3fca Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Tue, 04 Feb 2014 22:28:01 +0000
-Subject: app: halt the transform tool when switching layer|selection|path transform
-
-(cherry picked from commit 1335bc42c89c7b739bba54400b6adcee3abd7423)
----
-diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
-index 009659c..8c31222 100644
---- app/tools/gimptransformtool.c
-+++ app/tools/gimptransformtool.c
-@@ -667,12 +667,17 @@ gimp_transform_tool_options_notify (GimpTool *tool,
-
- GIMP_TOOL_CLASS (parent_class)->options_notify (tool, options, pspec);
-
-+ if (! strcmp (pspec->name, "type"))
-+ {
-+ gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
-+ return;
-+ }
-+
- if (tr_tool->use_grid)
- {
- gimp_draw_tool_pause (GIMP_DRAW_TOOL (tr_tool));
-
-- if (! strcmp (pspec->name, "type") ||
-- ! strcmp (pspec->name, "direction"))
-+ if (! strcmp (pspec->name, "direction"))
- {
- if (tr_tool->function != TRANSFORM_CREATING)
- {
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchletterspacingintexttoolbz720492diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-letter-spacing-in-text-tool-bz720492.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-letter-spacing-in-text-tool-bz720492.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-letter-spacing-in-text-tool-bz720492.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-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
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchmistakendescriptionnewguidesfromselectionbz720598diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-mistaken-description-new-guides-from-selection-bz720598.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-mistaken-description-new-guides-from-selection-bz720598.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-mistaken-description-new-guides-from-selection-bz720598.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-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
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchpaletteeditornotworkingnewpalettesbz719634diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-palette-editor-not-working-new-palettes-bz719634.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-palette-editor-not-working-new-palettes-bz719634.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-palette-editor-not-working-new-palettes-bz719634.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,77 +0,0 @@
</span><del>-From 5847d56f365ca5cf3b57601f01924ec609696ec1 Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@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
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchpluginborderaveragereturngarbagealphavaluebz719662diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-plug-in-borderaverage-return-garbage-alpha-value-bz719662.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-plug-in-borderaverage-return-garbage-alpha-value-bz719662.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-plug-in-borderaverage-return-garbage-alpha-value-bz719662.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>-From 7fab702e9b52802ab411fa56ad17bac50590ecaf Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@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
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchpluginstwaintw_maccdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-plug-ins-twain-tw_mac.c.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-plug-ins-twain-tw_mac.c.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-plug-ins-twain-tw_mac.c.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>---- plug-ins/twain/tw_mac.c.orig 2012-03-12 12:18:11.000000000 -0700
-+++ plug-ins/twain/tw_mac.c 2012-07-10 08:57:29.000000000 -0700
-@@ -192,10 +192,12 @@
-
- /* Voodoo magic fix inspired by java_swt launcher */
- /* Without this the icon setting doesn't work about half the time. */
-+#ifndef __LP64__
- CGrafPtr p = BeginQDContextForApplicationDockTile();
- EndQDContextForApplicationDockTile(p);
-
- SetApplicationDockTileImage (icon);
-+#endif
- }
-
- int
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchpluginsbmpdontcheckbiClrUsedbz697431diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-plugins-bmp-dont-check-biClrUsed-bz697431.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-plugins-bmp-dont-check-biClrUsed-bz697431.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-plugins-bmp-dont-check-biClrUsed-bz697431.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>-From 76ee47eff95e8dfad303d473c8a54b15720c83c0 Mon Sep 17 00:00:00 2001
-From: Téo Mazars <teomazars@gmail.com>
-Date: Thu, 30 Jan 2014 19:31:26 +0000
-Subject: plug-ins: don't check biClrUsed if bpp > 8 (in bug 697431)
-
-(cherry picked from commit 54f83a5ba273e45a9184f13d1f4b0f5697d56555)
----
-diff --git a/plug-ins/file-bmp/bmp-read.c b/plug-ins/file-bmp/bmp-read.c
-index e59dfb8..f088a48 100644
---- plug-ins/file-bmp/bmp-read.c
-+++ plug-ins/file-bmp/bmp-read.c
-@@ -487,7 +487,7 @@ ReadBMP (const gchar *name,
- goto out;
- }
-
-- if (Bitmap_Head.biClrUsed > 256)
-+ if (Bitmap_Head.biClrUsed > 256 && Bitmap_Head.biBitCnt <= 8)
- {
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
- _("'%s' is not a valid BMP file"),
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchremoveacceleratormarkerspythonfutooltipsdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-remove-accelerator-markers-python-fu-tooltips.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-remove-accelerator-markers-python-fu-tooltips.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-remove-accelerator-markers-python-fu-tooltips.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-From e3a65f2ff5df4c7dd6b48b6e68989f4776e1a90e Mon Sep 17 00:00:00 2001
-From: João S. O. Bueno <gwidion@gmail.com>
-Date: Sun, 05 Jan 2014 06:40:04 +0000
-Subject: Remove accelerator markers from tooltips for python-fu dialogs
-
----
-diff --git a/plug-ins/pygimp/gimpfu.py b/plug-ins/pygimp/gimpfu.py
-index ba833c2..5c7304d 100644
---- plug-ins/pygimp/gimpfu.py
-+++ plug-ins/pygimp/gimpfu.py
-@@ -728,11 +728,13 @@ def _interact(proc_name, start_params):
-
- table.attach(wid, 2,3, i,i+1, yoptions=0)
-
-+ # Remove accelerator markers from tooltips
-+ tooltip_text = desc.replace("_", "")
- if pf_type != PF_TEXT:
-- wid.set_tooltip_text(desc)
-+ wid.set_tooltip_text(tooltip_text)
- else:
- # Attach tip to TextView, not to ScrolledWindow
-- wid.view.set_tooltip_text(desc)
-+ wid.view.set_tooltip_text(tooltip_text)
- wid.show()
-
- wid.desc = desc
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchremoveconfirmonclosepreferencediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-remove-confirm-on-close-preference.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-remove-confirm-on-close-preference.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-remove-confirm-on-close-preference.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,172 +0,0 @@
</span><del>-From b101f38f0a7cd0b31a8c9c2b90842f75d20e97c0 Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Mon, 07 May 2012 12:02:36 +0000
-Subject: app: remove the "confirm-on-close" preference
-
-the warning dialog cannot be disabled any longer now.
-
-(cherry picked from commit e2c8a60665499cc945838fbd5a99964b09ec8892)
----
-diff --git a/app/config/gimpdisplayconfig.c b/app/config/gimpdisplayconfig.c
-index 91c8c3d..36a46b2 100644
---- app/config/gimpdisplayconfig.c
-+++ app/config/gimpdisplayconfig.c
-@@ -59,7 +59,6 @@ enum
- PROP_SHOW_PAINT_TOOL_CURSOR,
- PROP_IMAGE_TITLE_FORMAT,
- PROP_IMAGE_STATUS_FORMAT,
-- PROP_CONFIRM_ON_CLOSE,
- PROP_MONITOR_XRESOLUTION,
- PROP_MONITOR_YRESOLUTION,
- PROP_MONITOR_RES_FROM_GDK,
-@@ -76,6 +75,7 @@ enum
- PROP_USE_EVENT_HISTORY,
-
- /* ignored, only for backward compatibility: */
-+ PROP_CONFIRM_ON_CLOSE,
- PROP_XOR_COLOR
- };
-
-@@ -185,10 +185,6 @@ gimp_display_config_class_init (GimpDisplayConfigClass *klass)
- IMAGE_STATUS_FORMAT_BLURB,
- GIMP_CONFIG_DEFAULT_IMAGE_STATUS_FORMAT,
- GIMP_PARAM_STATIC_STRINGS);
-- GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_CONFIRM_ON_CLOSE,
-- "confirm-on-close", CONFIRM_ON_CLOSE_BLURB,
-- TRUE,
-- GIMP_PARAM_STATIC_STRINGS);
- GIMP_CONFIG_INSTALL_PROP_RESOLUTION (object_class, PROP_MONITOR_XRESOLUTION,
- "monitor-xresolution",
- MONITOR_XRESOLUTION_BLURB,
-@@ -267,6 +263,10 @@ gimp_display_config_class_init (GimpDisplayConfigClass *klass)
- GIMP_PARAM_STATIC_STRINGS);
-
- /* only for backward compatibility: */
-+ GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_CONFIRM_ON_CLOSE,
-+ "confirm-on-close", NULL,
-+ TRUE,
-+ GIMP_PARAM_STATIC_STRINGS);
- GIMP_CONFIG_INSTALL_PROP_RGB (object_class, PROP_XOR_COLOR,
- "xor-color", NULL,
- FALSE, &color,
-@@ -366,9 +366,6 @@ gimp_display_config_set_property (GObject *object,
- g_free (display_config->image_status_format);
- display_config->image_status_format = g_value_dup_string (value);
- break;
-- case PROP_CONFIRM_ON_CLOSE:
-- display_config->confirm_on_close = g_value_get_boolean (value);
-- break;
- case PROP_MONITOR_XRESOLUTION:
- display_config->monitor_xres = g_value_get_double (value);
- break;
-@@ -416,6 +413,8 @@ gimp_display_config_set_property (GObject *object,
- case PROP_USE_EVENT_HISTORY:
- display_config->use_event_history = g_value_get_boolean (value);
- break;
-+
-+ case PROP_CONFIRM_ON_CLOSE:
- case PROP_XOR_COLOR:
- /* ignored */
- break;
-@@ -481,9 +480,6 @@ gimp_display_config_get_property (GObject *object,
- case PROP_IMAGE_STATUS_FORMAT:
- g_value_set_string (value, display_config->image_status_format);
- break;
-- case PROP_CONFIRM_ON_CLOSE:
-- g_value_set_boolean (value, display_config->confirm_on_close);
-- break;
- case PROP_MONITOR_XRESOLUTION:
- g_value_set_double (value, display_config->monitor_xres);
- break;
-@@ -526,6 +522,8 @@ gimp_display_config_get_property (GObject *object,
- case PROP_USE_EVENT_HISTORY:
- g_value_set_boolean (value, display_config->use_event_history);
- break;
-+
-+ case PROP_CONFIRM_ON_CLOSE:
- case PROP_XOR_COLOR:
- /* ignored */
- break;
-diff --git a/app/config/gimpdisplayconfig.h b/app/config/gimpdisplayconfig.h
-index 427e50e..2c6a7e5 100644
---- app/config/gimpdisplayconfig.h
-+++ app/config/gimpdisplayconfig.h
-@@ -56,7 +56,6 @@ struct _GimpDisplayConfig
- gboolean show_paint_tool_cursor;
- gchar *image_title_format;
- gchar *image_status_format;
-- gboolean confirm_on_close;
- gdouble monitor_xres;
- gdouble monitor_yres;
- gboolean monitor_res_from_gdk;
-diff --git a/app/config/gimprc-blurbs.h b/app/config/gimprc-blurbs.h
-index d8f6e44..2af5a29 100644
---- app/config/gimprc-blurbs.h
-+++ app/config/gimprc-blurbs.h
-@@ -42,9 +42,6 @@ N_("Specifies how the area around the image should be drawn.")
- #define COLOR_PROFILE_POLICY_BLURB \
- N_("How to handle embedded color profiles when opening a file.")
-
--#define CONFIRM_ON_CLOSE_BLURB \
--N_("Ask for confirmation before closing an image without saving.")
--
- #define CURSOR_FORMAT_BLURB \
- N_("Sets the pixel format to use for mouse pointers.")
-
-diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
-index a8e6d5b..259a5ee 100644
---- app/dialogs/preferences-dialog.c
-+++ app/dialogs/preferences-dialog.c
-@@ -1559,13 +1559,6 @@ prefs_dialog_new (Gimp *gimp,
- _("Maximum _filesize for thumbnailing:"),
- GTK_TABLE (table), 1, size_group);
-
-- /* File Saving */
-- vbox2 = prefs_frame_new (_("Saving Images"), GTK_CONTAINER (vbox), FALSE);
--
-- prefs_check_button_add (object, "confirm-on-close",
-- _("Confirm closing of unsa_ved images"),
-- GTK_BOX (vbox2));
--
- g_object_unref (size_group);
- size_group = NULL;
-
-diff --git a/app/display/gimpdisplayshell-close.c b/app/display/gimpdisplayshell-close.c
-index 6857e50..bc37295 100644
---- app/display/gimpdisplayshell-close.c
-+++ app/display/gimpdisplayshell-close.c
-@@ -98,8 +98,7 @@ gimp_display_shell_close (GimpDisplayShell *shell,
- if (! kill_it &&
- image &&
- gimp_image_get_display_count (image) == 1 &&
-- gimp_image_is_dirty (image) &&
-- shell->display->config->confirm_on_close)
-+ gimp_image_is_dirty (image))
- {
- /* If there's a save dialog active for this image, then raise it.
- * (see bug #511965)
---
-cgit v0.9.2
-From 523f807d75efdf69473996b0fd7ede07200835c4 Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Mon, 07 May 2012 12:07:43 +0000
-Subject: app: set GIMP_CONFIG_PARAM_IGNORE on "confirm-on-close"
-
-(cherry picked from commit bfb875755976cd4b2cd4b02d5f3a32ebaf24642f)
----
-diff --git a/app/config/gimpdisplayconfig.c b/app/config/gimpdisplayconfig.c
-index 36a46b2..4613535 100644
---- app/config/gimpdisplayconfig.c
-+++ app/config/gimpdisplayconfig.c
-@@ -266,7 +266,8 @@ gimp_display_config_class_init (GimpDisplayConfigClass *klass)
- GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_CONFIRM_ON_CLOSE,
- "confirm-on-close", NULL,
- TRUE,
-- GIMP_PARAM_STATIC_STRINGS);
-+ GIMP_PARAM_STATIC_STRINGS |
-+ GIMP_CONFIG_PARAM_IGNORE);
- GIMP_CONFIG_INSTALL_PROP_RGB (object_class, PROP_XOR_COLOR,
- "xor-color", NULL,
- FALSE, &color,
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchshadowlayerfordropshadowfilterbz721058diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-shadow-layer-for-drop-shadow-filter-bz721058.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-shadow-layer-for-drop-shadow-filter-bz721058.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-shadow-layer-for-drop-shadow-filter-bz721058.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-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
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchsnappingbehaviorscaletoolbz722034diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-snapping-behavior-scale-tool-bz722034.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-snapping-behavior-scale-tool-bz722034.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-snapping-behavior-scale-tool-bz722034.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,91 +0,0 @@
</span><del>-From aed3e3c741000ace5656030697cb0733c1c509ac Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Wed, 29 Jan 2014 22:40:35 +0000
-Subject: Bug 722034 - Incorrect snapping behaviour for scale tool
-
-Always snap to the center of transform tool handles.
-
-(cherry picked from commit 5054241ca61dbdf869701b429a84d0c239a2d22a)
----
-diff --git a/app/display/gimpcanvashandle.c b/app/display/gimpcanvashandle.c
-index 45ad673..c776fb4 100644
---- app/display/gimpcanvashandle.c
-+++ app/display/gimpcanvashandle.c
-@@ -452,6 +452,21 @@ gimp_canvas_handle_new (GimpDisplayShell *shell,
- }
-
- void
-+gimp_canvas_handle_get_position (GimpCanvasItem *handle,
-+ gdouble *x,
-+ gdouble *y)
-+{
-+ g_return_if_fail (GIMP_IS_CANVAS_HANDLE (handle));
-+ g_return_if_fail (x != NULL);
-+ g_return_if_fail (y != NULL);
-+
-+ g_object_get (handle,
-+ "x", x,
-+ "y", y,
-+ NULL);
-+}
-+
-+void
- gimp_canvas_handle_set_position (GimpCanvasItem *handle,
- gdouble x,
- gdouble y)
-diff --git a/app/display/gimpcanvashandle.h b/app/display/gimpcanvashandle.h
-index 7dea56b..2aeae08 100644
---- app/display/gimpcanvashandle.h
-+++ app/display/gimpcanvashandle.h
-@@ -57,9 +57,13 @@ GimpCanvasItem * gimp_canvas_handle_new (GimpDisplayShell *shell,
- gint width,
- gint height);
-
-+void gimp_canvas_handle_get_position (GimpCanvasItem *handle,
-+ gdouble *x,
-+ gdouble *y);
- void gimp_canvas_handle_set_position (GimpCanvasItem *handle,
- gdouble x,
- gdouble y);
-+
- void gimp_canvas_handle_set_angles (GimpCanvasItem *handle,
- gdouble start_handle,
- gdouble slice_handle);
-diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
-index 3df8f01..009659c 100644
---- app/tools/gimptransformtool.c
-+++ app/tools/gimptransformtool.c
-@@ -54,6 +54,7 @@
- #include "widgets/gimpwidgets-utils.h"
-
- #include "display/gimpcanvasgroup.h"
-+#include "display/gimpcanvashandle.h"
- #include "display/gimpdisplay.h"
- #include "display/gimpdisplayshell.h"
- #include "display/gimpdisplayshell-transform.h"
-@@ -341,6 +342,23 @@ gimp_transform_tool_button_press (GimpTool *tool,
- tr_tool->prev_trans_info[i] = tr_tool->trans_info[i];
-
- gimp_tool_control_activate (tool->control);
-+
-+ if (GIMP_IS_CANVAS_HANDLE (tr_tool->handles[tr_tool->function]))
-+ {
-+ gdouble x, y;
-+
-+ gimp_canvas_handle_get_position (tr_tool->handles[tr_tool->function],
-+ &x, &y);
-+
-+ gimp_tool_control_set_snap_offsets (tool->control,
-+ SIGNED_ROUND (x - coords->x),
-+ SIGNED_ROUND (y - coords->y),
-+ 0, 0);
-+ }
-+ else
-+ {
-+ gimp_tool_control_set_snap_offsets (tool->control, 0, 0, 0, 0);
-+ }
- }
-
- static void
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchwidgetdirectionsetsystemlocalenotuserbz679214diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-widget-direction-set-system-locale-not-user-bz679214.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-widget-direction-set-system-locale-not-user-bz679214.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-widget-direction-set-system-locale-not-user-bz679214.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-From c1314499ffa6aa4cf7543e00b028d987209fa6fc Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Mon, 09 Dec 2013 06:31:48 +0000
-Subject: Bug 679214 - widget direction set to system locale, not user-set lang
-
-In particular a RTL-localized OS, where the user sets GIMP to a LTR lang
-would still have a RTL UI (menus, etc.). And vice versa.
-(cherry picked from commit 735f00b886283f0a8fcee5ac9b414543f19a6ef4)
----
-diff --git a/app/gui/gui.c b/app/gui/gui.c
-index faaa91b..3f65546 100644
---- app/gui/gui.c
-+++ app/gui/gui.c
-@@ -198,6 +198,17 @@ gui_init (Gimp *gimp,
-
- the_gui_gimp = gimp;
-
-+ /* Normally this should have been taken care of during command line
-+ * parsing as a post-parse hook of gtk_get_option_group(), using the
-+ * system locales.
-+ * But user config may have overriden the language, therefore we must
-+ * check the widget directions again.
-+ */
-+ if (g_strcmp0 (dgettext ("gtk20", "default:LTR"), "default:RTL") == 0)
-+ gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);
-+ else
-+ gtk_widget_set_default_direction (GTK_TEXT_DIR_LTR);
-+
- gui_unique_init (gimp);
-
- gimp_widgets_init (gui_help_func,
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchwritingcharacterconstantsbz721775diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-writing-character-constants-bz721775.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-writing-character-constants-bz721775.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-writing-character-constants-bz721775.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,21 +0,0 @@
</span><del>-From 6c2cd97b868e7742f9a3ade611713e46a1759d1c Mon Sep 17 00:00:00 2001
-From: Kevin Cozens <kevin@ve3syb.ca>
-Date: Mon, 03 Feb 2014 22:30:04 +0000
-Subject: Removed extraneous 'x' when writing character constants. Fixes bug #721775.
-
----
-diff --git a/plug-ins/script-fu/tinyscheme/scheme.c b/plug-ins/script-fu/tinyscheme/scheme.c
-index 8abddcd..1d288f5 100644
---- plug-ins/script-fu/tinyscheme/scheme.c
-+++ plug-ins/script-fu/tinyscheme/scheme.c
-@@ -2177,7 +2177,7 @@ static void atom2str(scheme *sc, pointer l, int f, char **pp, int *plen) {
- snprintf(p,STRBUFFSIZE,"#\\x%x",c); break;
- }
- #endif
-- snprintf(p,STRBUFFSIZE,"#\\x%c",c); break;
-+ snprintf(p,STRBUFFSIZE,"#\\%c",c); break;
- }
- }
- } else if (is_symbol(l)) {
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchwrongnametransfertooldialogsbz701159diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/gimp2/files/patch-wrong-name-transfer-tool-dialogs-bz701159.diff (124863 => 124864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-wrong-name-transfer-tool-dialogs-bz701159.diff 2014-08-29 20:35:02 UTC (rev 124863)
+++ trunk/dports/graphics/gimp2/files/patch-wrong-name-transfer-tool-dialogs-bz701159.diff 2014-08-29 21:04:03 UTC (rev 124864)
</span><span class="lines">@@ -1,247 +0,0 @@
</span><del>-From d94f38c18db41dce4a22a9e55a84c92c2161f169 Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Tue, 04 Feb 2014 23:54:39 +0000
-Subject: Bug 701159 - Wrong name in transform tool dialogs...
-
-...when acting on a path or selection
-
-Factor out the code that checks if an active item exists and if it's
-transformable (not locked etc.) and use that function in more places.
-This fixes both the wrong dialog labels and the tool running into
-broken states when the selection or a path are being transformed.
-
-(cherry picked from commit b13c68fda6dcedd43d7e2f4633191f9ddc6cdf3f)
----
-diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
-index 8c31222..ff976ea 100644
---- app/tools/gimptransformtool.c
-+++ app/tools/gimptransformtool.c
-@@ -151,6 +151,12 @@ static void gimp_transform_tool_response (GtkWidget
- gint response_id,
- GimpTransformTool *tr_tool);
-
-+static GimpItem *gimp_transform_tool_get_active_item (GimpTransformTool *tr_tool,
-+ GimpImage *image);
-+static GimpItem *gimp_transform_tool_check_active_item (GimpTransformTool *tr_tool,
-+ GimpImage *display,
-+ GError **error);
-+
-
- G_DEFINE_TYPE (GimpTransformTool, gimp_transform_tool, GIMP_TYPE_DRAW_TOOL)
-
-@@ -236,18 +242,17 @@ gimp_transform_tool_initialize (GimpTool *tool,
- GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tool);
- GimpImage *image = gimp_display_get_image (display);
- GimpDrawable *drawable = gimp_image_get_active_drawable (image);
-+ GimpItem *item;
-
- if (! GIMP_TOOL_CLASS (parent_class)->initialize (tool, display, error))
- {
- return FALSE;
- }
-
-- if (gimp_item_is_content_locked (GIMP_ITEM (drawable)))
-- {
-- g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
-- _("The active layer's pixels are locked."));
-- return FALSE;
-- }
-+ item = gimp_transform_tool_check_active_item (tr_tool, image, error);
-+
-+ if (! item)
-+ return FALSE;
-
- if (display != tool->display)
- {
-@@ -578,13 +583,10 @@ gimp_transform_tool_cursor_update (GimpTool *tool,
- GdkModifierType state,
- GimpDisplay *display)
- {
-- GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tool);
-- GimpTransformOptions *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tool);
-- GimpCursorType cursor;
-- GimpCursorModifier modifier = GIMP_CURSOR_MODIFIER_NONE;
-- GimpImage *image = gimp_display_get_image (display);
--
-- cursor = gimp_tool_control_get_cursor (tool->control);
-+ GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tool);
-+ GimpImage *image = gimp_display_get_image (display);
-+ GimpCursorType cursor = gimp_tool_control_get_cursor (tool->control);
-+ GimpCursorModifier modifier = GIMP_CURSOR_MODIFIER_NONE;
-
- if (tr_tool->use_handles)
- {
-@@ -633,24 +635,8 @@ gimp_transform_tool_cursor_update (GimpTool *tool,
- modifier = GIMP_CURSOR_MODIFIER_MOVE;
- }
-
-- switch (options->type)
-- {
-- GimpDrawable *drawable;
--
-- case GIMP_TRANSFORM_TYPE_LAYER:
-- drawable = gimp_image_get_active_drawable (image);
-- if (gimp_item_is_content_locked (GIMP_ITEM (drawable)))
-- modifier = GIMP_CURSOR_MODIFIER_BAD;
-- break;
--
-- case GIMP_TRANSFORM_TYPE_SELECTION:
-- break;
--
-- case GIMP_TRANSFORM_TYPE_PATH:
-- if (! gimp_image_get_active_vectors (image))
-- modifier = GIMP_CURSOR_MODIFIER_BAD;
-- break;
-- }
-+ if (! gimp_transform_tool_check_active_item (tr_tool, image, NULL))
-+ modifier = GIMP_CURSOR_MODIFIER_BAD;
-
- gimp_tool_control_set_cursor (tool->control, cursor);
- gimp_tool_control_set_cursor_modifier (tool->control, modifier);
-@@ -1073,50 +1059,23 @@ gimp_transform_tool_transform (GimpTransformTool *tr_tool,
- GimpTransformOptions *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tool);
- GimpContext *context = GIMP_CONTEXT (options);
- GimpImage *image = gimp_display_get_image (display);
-- GimpItem *active_item = NULL;
-+ GimpItem *active_item;
- TileManager *orig_tiles = NULL;
-- gint orig_offset_x;
-- gint orig_offset_y;
-+ gint orig_offset_x = 0;
-+ gint orig_offset_y = 0;
- TileManager *new_tiles;
- gint new_offset_x;
- gint new_offset_y;
-- const gchar *null_message = NULL;
-- const gchar *locked_message = NULL;
- gchar *undo_desc = NULL;
-- gboolean new_layer;
-+ gboolean new_layer = FALSE;
-+ GError *error = NULL;
-
-- switch (options->type)
-- {
-- case GIMP_TRANSFORM_TYPE_LAYER:
-- active_item = GIMP_ITEM (gimp_image_get_active_drawable (image));
-- null_message = _("There is no layer to transform.");
-- locked_message = _("The active layer's pixels are locked.");
-- break;
--
-- case GIMP_TRANSFORM_TYPE_SELECTION:
-- active_item = GIMP_ITEM (gimp_image_get_mask (image));
-- /* cannot happen, so don't translate these messages */
-- null_message = "There is no selection to transform.";
-- locked_message = "The selection's pixels are locked.";
-- break;
--
-- case GIMP_TRANSFORM_TYPE_PATH:
-- active_item = GIMP_ITEM (gimp_image_get_active_vectors (image));
-- null_message = _("There is no path to transform.");
-- locked_message = _("The active path's strokes are locked.");
-- break;
-- }
-+ active_item = gimp_transform_tool_check_active_item (tr_tool, image, &error);
-
- if (! active_item)
- {
-- gimp_tool_message_literal (tool, display, null_message);
-- gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
-- return;
-- }
--
-- if (gimp_item_is_content_locked (active_item))
-- {
-- gimp_tool_message_literal (tool, display, locked_message);
-+ gimp_tool_message_literal (tool, display, error->message);
-+ g_clear_error (&error);
- gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
- return;
- }
-@@ -1396,10 +1355,12 @@ gimp_transform_tool_prepare (GimpTransformTool *tr_tool,
- {
- GimpTransformOptions *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
- GimpImage *image = gimp_display_get_image (display);
-- GimpDrawable *drawable = gimp_image_get_active_drawable (image);
-+ GimpItem *item;
-+
-+ item = gimp_transform_tool_get_active_item (tr_tool, image);
-
- gimp_viewable_dialog_set_viewable (GIMP_VIEWABLE_DIALOG (tr_tool->dialog),
-- GIMP_VIEWABLE (drawable),
-+ GIMP_VIEWABLE (item),
- GIMP_CONTEXT (options));
- gimp_tool_dialog_set_shell (GIMP_TOOL_DIALOG (tr_tool->dialog),
- gimp_display_get_shell (display));
-@@ -1464,3 +1425,70 @@ gimp_transform_tool_response (GtkWidget *widget,
- break;
- }
- }
-+
-+static GimpItem *
-+gimp_transform_tool_get_active_item (GimpTransformTool *tr_tool,
-+ GimpImage *image)
-+{
-+ GimpTransformOptions *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
-+
-+ switch (options->type)
-+ {
-+ case GIMP_TRANSFORM_TYPE_LAYER:
-+ return GIMP_ITEM (gimp_image_get_active_drawable (image));
-+
-+ case GIMP_TRANSFORM_TYPE_SELECTION:
-+ return GIMP_ITEM (gimp_image_get_mask (image));
-+
-+ case GIMP_TRANSFORM_TYPE_PATH:
-+ return GIMP_ITEM (gimp_image_get_active_vectors (image));
-+ }
-+
-+ return NULL;
-+}
-+
-+static GimpItem *
-+gimp_transform_tool_check_active_item (GimpTransformTool *tr_tool,
-+ GimpImage *image,
-+ GError **error)
-+{
-+ GimpTransformOptions *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
-+ GimpItem *item;
-+ const gchar *null_message = NULL;
-+ const gchar *locked_message = NULL;
-+
-+ item = gimp_transform_tool_get_active_item (tr_tool, image);
-+
-+ switch (options->type)
-+ {
-+ case GIMP_TRANSFORM_TYPE_LAYER:
-+ null_message = _("There is no layer to transform.");
-+ locked_message = _("The active layer's pixels are locked.");
-+ break;
-+
-+ case GIMP_TRANSFORM_TYPE_SELECTION:
-+ /* cannot happen, so don't translate these messages */
-+ null_message = "There is no selection to transform.";
-+ locked_message = "The selection's pixels are locked.";
-+ break;
-+
-+ case GIMP_TRANSFORM_TYPE_PATH:
-+ null_message = _("There is no path to transform.");
-+ locked_message = _("The active path's strokes are locked.");
-+ break;
-+ }
-+
-+ if (! item)
-+ {
-+ g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, null_message);
-+ return NULL;
-+ }
-+
-+ if (gimp_item_is_content_locked (item))
-+ {
-+ g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, locked_message);
-+ return NULL;
-+ }
-+
-+ return item;
-+}
---
-cgit v0.9.2
</del></span></pre>
</div>
</div>
</body>
</html>