<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7e612b71ae43f94422875178e6cc9d56ca5ac56a">https://github.com/macports/macports-ports/commit/7e612b71ae43f94422875178e6cc9d56ca5ac56a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7e612b7 gimp*: Rebuild with new libmypaint/mypaint-brushes1
</span>7e612b7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7e612b71ae43f94422875178e6cc9d56ca5ac56a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jun 3 14:44:47 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> gimp*: Rebuild with new libmypaint/mypaint-brushes1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Revbump since libmypaint's install_name has changed again, though after
</span><span style='display:block; white-space:pre;color:#404040;'> libmypaint 1.6.1 this should happen less frequently.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Change mypaint-brushes dependency to mypaint-brushes1 since GIMP does
</span><span style='display:block; white-space:pre;color:#404040;'> not support mypaint-brushes 2 yet.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add patch to accommodate a fix in mypaint-brushes that removes the
</span><span style='display:block; white-space:pre;color:#404040;'> quotes around MYPAINT_BRUSHES_DIR over there and adds them where needed
</span><span style='display:block; white-space:pre;color:#404040;'> here in GIMP.
</span>---
graphics/gimp2-devel/Portfile | 7 ++--
.../gimp2-devel/files/MYPAINT_BRUSHES_DIR.patch | 49 ++++++++++++++++++++++
graphics/gimp2/Portfile | 7 ++--
graphics/gimp2/files/MYPAINT_BRUSHES_DIR.patch | 49 ++++++++++++++++++++++
graphics/gimp3-devel/Portfile | 7 ++--
.../gimp3-devel/files/MYPAINT_BRUSHES_DIR.patch | 49 ++++++++++++++++++++++
6 files changed, 159 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2-devel/Portfile b/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a37020c..b9ef155 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ set git_name gimp
</span> set git_commit 3f9cd9b435a483ebe2e58e800fd294ead4cbe2cb
set git_date 20200223
version 2.10.19-${git_date}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> license GPL-3+
categories graphics
maintainers {devans @dbevans}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ depends_lib port:desktop-file-utils \
</span> port:curl \
port:libwmf \
port:libmypaint \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mypaint-brushes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mypaint-brushes1 \
</span> port:lcms2 \
port:dbus-glib \
port:libxml2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,7 +96,8 @@ compiler.cxx_standard 2014
</span> compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 700}
patchfiles patch-etc-gimprc.in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-quartz-32bit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-quartz-32bit.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MYPAINT_BRUSHES_DIR.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} < 11} {
# avoid Cursor type conflict between X11 and Quickdraw
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2-devel/files/MYPAINT_BRUSHES_DIR.patch b/graphics/gimp2-devel/files/MYPAINT_BRUSHES_DIR.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..18cf261
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2-devel/files/MYPAINT_BRUSHES_DIR.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Treat MYPAINT_BRUSHES_DIR as a value that has not already been quoted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://github.com/mypaint/mypaint-brushes/issues/5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/config/gimpcoreconfig.c.orig 2020-02-23 12:21:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/config/gimpcoreconfig.c 2020-06-02 21:37:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,6 +51,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gimp-intl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _QUOTE(x) #x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define QUOTE(x) _QUOTE(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GIMP_DEFAULT_BRUSH "2. Hardness 050"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GIMP_DEFAULT_DYNAMICS "Dynamics Off"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GIMP_DEFAULT_PATTERN "Pine"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -313,7 +316,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "share", "mypaint-data",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "1.0", "brushes", NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mypaint_brushes = g_strdup (MYPAINT_BRUSHES_DIR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mypaint_brushes = g_strdup (QUOTE(MYPAINT_BRUSHES_DIR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/core/gimpdata.c.orig 2020-02-23 12:21:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/core/gimpdata.c 2020-06-02 21:38:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gimp-intl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _QUOTE(x) #x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define QUOTE(x) _QUOTE(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DIRTY,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -457,10 +460,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ identifier = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free (tmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else if (g_str_has_prefix (path, MYPAINT_BRUSHES_DIR))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (g_str_has_prefix (path, QUOTE(MYPAINT_BRUSHES_DIR)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp = g_strconcat ("${mypaint_brushes_dir}",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- path + strlen (MYPAINT_BRUSHES_DIR),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ path + strlen (QUOTE(MYPAINT_BRUSHES_DIR)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ identifier = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free (tmp);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/Portfile b/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 479085c..31c587f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name gimp2
</span> conflicts gimp2-devel gimp3-devel
# please remember to update the gimp metapackage to match
version 2.10.18
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> set branch [join [lrange [split ${version} .] 0 1] .]
license GPL-3+
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +66,7 @@ depends_lib port:desktop-file-utils \
</span> port:curl \
port:libwmf \
port:libmypaint \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mypaint-brushes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mypaint-brushes1 \
</span> port:lcms2 \
port:dbus-glib \
port:libxml2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +91,8 @@ compiler.cxx_standard 2014
</span> compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 700}
patchfiles patch-etc-gimprc.in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-quartz-32bit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-quartz-32bit.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MYPAINT_BRUSHES_DIR.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} < 11} {
# avoid Cursor type conflict between X11 and Quickdraw
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/MYPAINT_BRUSHES_DIR.patch b/graphics/gimp2/files/MYPAINT_BRUSHES_DIR.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..18cf261
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/files/MYPAINT_BRUSHES_DIR.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Treat MYPAINT_BRUSHES_DIR as a value that has not already been quoted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://github.com/mypaint/mypaint-brushes/issues/5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/config/gimpcoreconfig.c.orig 2020-02-23 12:21:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/config/gimpcoreconfig.c 2020-06-02 21:37:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,6 +51,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gimp-intl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _QUOTE(x) #x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define QUOTE(x) _QUOTE(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GIMP_DEFAULT_BRUSH "2. Hardness 050"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GIMP_DEFAULT_DYNAMICS "Dynamics Off"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GIMP_DEFAULT_PATTERN "Pine"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -313,7 +316,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "share", "mypaint-data",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "1.0", "brushes", NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mypaint_brushes = g_strdup (MYPAINT_BRUSHES_DIR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mypaint_brushes = g_strdup (QUOTE(MYPAINT_BRUSHES_DIR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/core/gimpdata.c.orig 2020-02-23 12:21:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/core/gimpdata.c 2020-06-02 21:38:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gimp-intl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _QUOTE(x) #x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define QUOTE(x) _QUOTE(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DIRTY,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -457,10 +460,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ identifier = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free (tmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else if (g_str_has_prefix (path, MYPAINT_BRUSHES_DIR))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (g_str_has_prefix (path, QUOTE(MYPAINT_BRUSHES_DIR)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp = g_strconcat ("${mypaint_brushes_dir}",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- path + strlen (MYPAINT_BRUSHES_DIR),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ path + strlen (QUOTE(MYPAINT_BRUSHES_DIR)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ identifier = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free (tmp);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp3-devel/Portfile b/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e1b959..37864a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ conflicts gimp2 gimp2-devel
</span> set git_commit 9046c758e7b82ffe39b1acb93160a0c9c15743ff
set git_date 20200223
version 2.99.1-${git_date}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> license GPL-3+
categories graphics
maintainers {devans @dbevans}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +68,7 @@ depends_lib port:desktop-file-utils \
</span> port:curl \
port:libwmf \
port:libmypaint \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mypaint-brushes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mypaint-brushes1 \
</span> port:lcms2 \
port:dbus-glib \
port:libxml2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +93,8 @@ compiler.cxx_standard 2014
</span> compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 700}
patchfiles patch-etc-gimprc.in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-quartz-32bit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-quartz-32bit.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MYPAINT_BRUSHES_DIR.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} < 11} {
# avoid Cursor type conflict between X11 and Quickdraw
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp3-devel/files/MYPAINT_BRUSHES_DIR.patch b/graphics/gimp3-devel/files/MYPAINT_BRUSHES_DIR.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0fd31af
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp3-devel/files/MYPAINT_BRUSHES_DIR.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Treat MYPAINT_BRUSHES_DIR as a value that has not already been quoted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://github.com/mypaint/mypaint-brushes/issues/5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/config/gimpcoreconfig.c.orig 2020-06-02 22:16:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/config/gimpcoreconfig.c 2020-06-02 22:16:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,6 +51,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gimp-intl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _QUOTE(x) #x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define QUOTE(x) _QUOTE(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GIMP_DEFAULT_BRUSH "2. Hardness 050"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GIMP_DEFAULT_DYNAMICS "Dynamics Off"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GIMP_DEFAULT_PATTERN "Pine"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -314,7 +317,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "share", "mypaint-data",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "1.0", "brushes", NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mypaint_brushes = g_strdup (MYPAINT_BRUSHES_DIR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mypaint_brushes = g_strdup (QUOTE(MYPAINT_BRUSHES_DIR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/core/gimpdata.c.orig 2020-02-23 12:21:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/core/gimpdata.c 2020-06-02 21:38:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gimp-intl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _QUOTE(x) #x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define QUOTE(x) _QUOTE(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DIRTY,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -457,10 +460,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ identifier = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free (tmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else if (g_str_has_prefix (path, MYPAINT_BRUSHES_DIR))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (g_str_has_prefix (path, QUOTE(MYPAINT_BRUSHES_DIR)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp = g_strconcat ("${mypaint_brushes_dir}",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- path + strlen (MYPAINT_BRUSHES_DIR),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ path + strlen (QUOTE(MYPAINT_BRUSHES_DIR)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ identifier = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free (tmp);
</span></pre><pre style='margin:0'>
</pre>