<!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>[130177] trunk/dports/graphics/MyPaint</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/130177">130177</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-12-27 23:18:03 -0800 (Sat, 27 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>MyPaint-devel: update to 1.1.1.alpha.20141216+git.68f876fc; rename patchfiles to include subport name; add patch to no longer link with libgettextlib which was causing a crash on launch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsMyPaintPortfile">trunk/dports/graphics/MyPaint/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsMyPaintfilespatchMyPaintSConstructdiff">trunk/dports/graphics/MyPaint/files/patch-MyPaint-SConstruct.diff</a></li>
<li><a href="#trunkdportsgraphicsMyPaintfilespatchMyPaintbrushlibSConscriptdiff">trunk/dports/graphics/MyPaint/files/patch-MyPaint-brushlib-SConscript.diff</a></li>
<li><a href="#trunkdportsgraphicsMyPaintfilespatchMyPaintdevelbrushlibSConscriptdiff">trunk/dports/graphics/MyPaint/files/patch-MyPaint-devel-brushlib-SConscript.diff</a></li>
<li><a href="#trunkdportsgraphicsMyPaintfilespatchMyPaintmallocdiff">trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsMyPaintfilespatchSConstructdiff">trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff</a></li>
<li><a href="#trunkdportsgraphicsMyPaintfilespatchbrushlibSConscriptdiff">trunk/dports/graphics/MyPaint/files/patch-brushlib-SConscript.diff</a></li>
<li><a href="#trunkdportsgraphicsMyPaintfilespatchmallocdiff">trunk/dports/graphics/MyPaint/files/patch-malloc.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsMyPaintPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/MyPaint/Portfile (130176 => 130177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/Portfile 2014-12-28 06:38:52 UTC (rev 130176)
+++ trunk/dports/graphics/MyPaint/Portfile 2014-12-28 07:18:03 UTC (rev 130177)
</span><span class="lines">@@ -106,9 +106,9 @@
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:py27-pygtk
</span><span class="cx">
</span><del>- patchfiles-append patch-SConstruct.diff
- patchfiles-append patch-brushlib-SConscript.diff
- patchfiles-append patch-malloc.diff
</del><ins>+ patchfiles-append patch-${subport}-SConstruct.diff
+ patchfiles-append patch-${subport}-brushlib-SConscript.diff
+ patchfiles-append patch-${subport}-malloc.diff
</ins><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> xinstall -m 644 -W ${worksrcpath} \
</span><span class="lines">@@ -129,8 +129,8 @@
</span><span class="cx">
</span><span class="cx"> subport ${name}-devel {
</span><span class="cx"> PortGroup github 1.0
</span><del>- github.setup mypaint mypaint 4fafd2ad68d52752cea0c7e18c87d55e144c96d6
- version 1.1.1.alpha.20140929+git.[string range ${git.branch} 0 7]
</del><ins>+ github.setup mypaint mypaint 68f876fc82f24f71bbe3c3d91ddf364d31fa5ff5
+ version 1.1.1.alpha.20141216+git.[string range ${git.branch} 0 7]
</ins><span class="cx"> set libmypaint_branch 0a6ad9de9debb9786bcc23cef19446410ac042a5
</span><span class="cx"> conflicts ${name}
</span><span class="cx">
</span><span class="lines">@@ -138,8 +138,8 @@
</span><span class="cx"> distfiles-append libmypaint-${libmypaint_branch}${extract.suffix}:libmypaint
</span><span class="cx">
</span><span class="cx"> checksums mypaint-${git.branch}${extract.suffix} \
</span><del>- rmd160 7d5d9c4057021d9a90eb7478cd5acdd0bb4db49d \
- sha256 6b8dccbb50c8532e3824bcc828b3ca35f8c25ea840fa821330b66bc9f86a7920 \
</del><ins>+ rmd160 beec9b869bb0f5b3d67c98d8078a895fa327147e \
+ sha256 0c48292b8815b4f7d90268719b9594f24ddceda164569266e0956bf3cfbbbc94 \
</ins><span class="cx"> libmypaint-${libmypaint_branch}${extract.suffix} \
</span><span class="cx"> rmd160 ffb71163b3c5959d08bbe252a3ab5c4a51037242 \
</span><span class="cx"> sha256 397487add31eef31ea725b997581c7a4a476a7a74adc28fb401db94edf44794c
</span><span class="lines">@@ -154,6 +154,8 @@
</span><span class="cx"> eval move [glob ${workpath}/mypaint-libmypaint-*] ${workpath}/mypaint-${git.branch}/brushlib
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ patchfiles-append patch-${subport}-brushlib-SConscript.diff
+
</ins><span class="cx"> post-destroot {
</span><span class="cx"> xinstall -m 644 -W ${worksrcpath} \
</span><span class="cx"> README.md \
</span></span></pre></div>
<a id="trunkdportsgraphicsMyPaintfilespatchMyPaintSConstructdifffromrev130160trunkdportsgraphicsMyPaintfilespatchSConstructdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/graphics/MyPaint/files/patch-MyPaint-SConstruct.diff (from rev 130160, trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff) (0 => 130177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/files/patch-MyPaint-SConstruct.diff (rev 0)
+++ trunk/dports/graphics/MyPaint/files/patch-MyPaint-SConstruct.diff 2014-12-28 07:18:03 UTC (rev 130177)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- SConstruct.orig 2012-12-31 11:03:38.000000000 -0600
++++ SConstruct 2013-01-02 11:20:08.000000000 -0600
+@@ -116,6 +113,8 @@
+
+ return install_targs
+
++env['CC'] = os.environ.get('CC', 'gcc')
++env['CXX'] = os.environ.get('CXX', 'g++')
+
+ def install_tree(env, dest, path, perms=0644, dirperms=0755):
+ assert os.path.isdir(path)
</ins></span></pre></div>
<a id="trunkdportsgraphicsMyPaintfilespatchMyPaintbrushlibSConscriptdifffromrev130160trunkdportsgraphicsMyPaintfilespatchbrushlibSConscriptdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/graphics/MyPaint/files/patch-MyPaint-brushlib-SConscript.diff (from rev 130160, trunk/dports/graphics/MyPaint/files/patch-brushlib-SConscript.diff) (0 => 130177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/files/patch-MyPaint-brushlib-SConscript.diff (rev 0)
+++ trunk/dports/graphics/MyPaint/files/patch-MyPaint-brushlib-SConscript.diff 2014-12-28 07:18:03 UTC (rev 130177)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+https://gna.org/bugs/?20817
+--- brushlib/SConscript.orig 2012-12-31 11:03:38.000000000 -0600
++++ brushlib/SConscript 2014-06-01 03:52:55.000000000 -0500
+@@ -73,7 +73,7 @@
+
+ env.Append(CPPPATH='./')
+
+-pkg_deps = ['json']
++pkg_deps = ['json-c']
+ libs = ['m']
+ linkflags = []
+
</ins></span></pre></div>
<a id="trunkdportsgraphicsMyPaintfilespatchMyPaintdevelbrushlibSConscriptdifffromrev130160trunkdportsgraphicsMyPaintfilespatchbrushlibSConscriptdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/graphics/MyPaint/files/patch-MyPaint-devel-brushlib-SConscript.diff (from rev 130160, trunk/dports/graphics/MyPaint/files/patch-brushlib-SConscript.diff) (0 => 130177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/files/patch-MyPaint-devel-brushlib-SConscript.diff (rev 0)
+++ trunk/dports/graphics/MyPaint/files/patch-MyPaint-devel-brushlib-SConscript.diff 2014-12-28 07:18:03 UTC (rev 130177)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+https://github.com/mypaint/libmypaint/pull/13
+--- brushlib/SConscript.orig 2014-07-23 13:35:21.000000000 -0500
++++ brushlib/SConscript 2014-12-27 20:14:39.000000000 -0600
+@@ -93,7 +93,7 @@
+ if env['enable_i18n']:
+ env.Append(CPPDEFINES='HAVE_GETTEXT')
+ if sys.platform == "darwin":
+- libs += ['intl', 'gettextlib']
++ libs += ['intl']
+
+
+ config_defines = ''
</ins></span></pre></div>
<a id="trunkdportsgraphicsMyPaintfilespatchMyPaintmallocdifffromrev130160trunkdportsgraphicsMyPaintfilespatchmallocdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff (from rev 130160, trunk/dports/graphics/MyPaint/files/patch-malloc.diff) (0 => 130177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff (rev 0)
+++ trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff 2014-12-28 07:18:03 UTC (rev 130177)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+https://gna.org/bugs/?20398
+--- brushlib/fifo.c.orig 2012-12-31 11:03:38.000000000 -0600
++++ brushlib/fifo.c 2013-01-02 11:28:48.000000000 -0600
+@@ -15,7 +15,7 @@
+ *
+ */
+
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "fifo.h"
+
+ struct fifo_item
+--- brushlib/operationqueue.c.orig 2012-12-31 11:03:38.000000000 -0600
++++ brushlib/operationqueue.c 2013-01-02 11:29:53.000000000 -0600
+@@ -15,7 +15,7 @@
+ */
+
+
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <assert.h>
+
+ #include <mypaint-glib-compat.h>
</ins></span></pre></div>
<a id="trunkdportsgraphicsMyPaintfilespatchSConstructdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff (130176 => 130177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff 2014-12-28 06:38:52 UTC (rev 130176)
+++ trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff 2014-12-28 07:18:03 UTC (rev 130177)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- SConstruct.orig 2012-12-31 11:03:38.000000000 -0600
-+++ SConstruct 2013-01-02 11:20:08.000000000 -0600
-@@ -116,6 +113,8 @@
-
- return install_targs
-
-+env['CC'] = os.environ.get('CC', 'gcc')
-+env['CXX'] = os.environ.get('CXX', 'g++')
-
- def install_tree(env, dest, path, perms=0644, dirperms=0755):
- assert os.path.isdir(path)
</del></span></pre></div>
<a id="trunkdportsgraphicsMyPaintfilespatchbrushlibSConscriptdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/MyPaint/files/patch-brushlib-SConscript.diff (130176 => 130177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/files/patch-brushlib-SConscript.diff 2014-12-28 06:38:52 UTC (rev 130176)
+++ trunk/dports/graphics/MyPaint/files/patch-brushlib-SConscript.diff 2014-12-28 07:18:03 UTC (rev 130177)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-https://gna.org/bugs/?20817
---- brushlib/SConscript.orig 2012-12-31 11:03:38.000000000 -0600
-+++ brushlib/SConscript 2014-06-01 03:52:55.000000000 -0500
-@@ -73,7 +73,7 @@
-
- env.Append(CPPPATH='./')
-
--pkg_deps = ['json']
-+pkg_deps = ['json-c']
- libs = ['m']
- linkflags = []
-
</del></span></pre></div>
<a id="trunkdportsgraphicsMyPaintfilespatchmallocdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/MyPaint/files/patch-malloc.diff (130176 => 130177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/files/patch-malloc.diff 2014-12-28 06:38:52 UTC (rev 130176)
+++ trunk/dports/graphics/MyPaint/files/patch-malloc.diff 2014-12-28 07:18:03 UTC (rev 130177)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-https://gna.org/bugs/?20398
---- brushlib/fifo.c.orig 2012-12-31 11:03:38.000000000 -0600
-+++ brushlib/fifo.c 2013-01-02 11:28:48.000000000 -0600
-@@ -15,7 +15,7 @@
- *
- */
-
--#include <malloc.h>
-+#include <stdlib.h>
- #include "fifo.h"
-
- struct fifo_item
---- brushlib/operationqueue.c.orig 2012-12-31 11:03:38.000000000 -0600
-+++ brushlib/operationqueue.c 2013-01-02 11:29:53.000000000 -0600
-@@ -15,7 +15,7 @@
- */
-
-
--#include <malloc.h>
-+#include <stdlib.h>
- #include <assert.h>
-
- #include <mypaint-glib-compat.h>
</del></span></pre>
</div>
</div>
</body>
</html>