<!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>[144729] 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/144729">144729</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2016-01-16 12:09:51 -0800 (Sat, 16 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>MyPaint: update to 1.2.0
MyPaint-devel: update to 1.3.0-alpha.20160115+git.6ba6c251
Fix possible wrong build or build failure due to library and include order</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="#trunkdportsgraphicsMyPaintfileslibraryandincludeorderpatch">trunk/dports/graphics/MyPaint/files/library-and-include-order.patch</a></li>
</ul>
<h3>Removed 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="#trunkdportsgraphicsMyPaintfilespatchMyPaintmallocdiff">trunk/dports/graphics/MyPaint/files/patch-MyPaint-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 (144728 => 144729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/Portfile 2016-01-16 19:13:53 UTC (rev 144728)
+++ trunk/dports/graphics/MyPaint/Portfile 2016-01-16 20:09:51 UTC (rev 144729)
</span><span class="lines">@@ -3,9 +3,43 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup app 1.0
</span><ins>+PortGroup github 1.0
</ins><span class="cx">
</span><span class="cx"> name MyPaint
</span><del>-set my_name mypaint
</del><ins>+
+if {${name} eq ${subport}} {
+ conflicts ${name}-devel
+ github.setup mypaint mypaint 1.2.0 v
+
+ github.tarball_from releases
+ use_xz yes
+
+ checksums rmd160 89c0960d1e38f71623225221ef109b1ed0ea217c \
+ sha256 cdab33dd0c146cf678c97bcdd44e561f97a0aec40421b8c6785a74b33b9728e2
+}
+
+subport ${name}-devel {
+ conflicts ${name}
+ github.setup mypaint mypaint 6ba6c251207d6efa629b8a1d3a3d70dc688fac55
+ version 1.3.0-alpha.20160115+git.[string range ${git.branch} 0 7]
+ set libmypaint_branch f6278c97aa5af443e30069099c6461b056cdfe63
+
+ master_sites-append https://github.com/${github.author}/libmypaint/tarball/${libmypaint_branch}:libmypaint
+ distfiles-append libmypaint-${libmypaint_branch}${extract.suffix}:libmypaint
+
+ checksums mypaint-${git.branch}${extract.suffix} \
+ rmd160 12d69eb0c22bf179e436c4160864878d2089df41 \
+ sha256 e83f8822aa0e2f6c9ef53002103c87569f7b4d14c5789ba881da931f9cbf57cb \
+ libmypaint-${libmypaint_branch}${extract.suffix} \
+ rmd160 67cd7cb49c817a6216eb8dabdb87e0d8648fa1fe \
+ sha256 7eb0e28cb74d2c5c3f8dbdf67a084b58f135ac145c562dd46ac71f7bfcd38df6
+
+ post-extract {
+ delete ${workpath}/mypaint-${git.branch}/brushlib
+ move {*}[glob ${workpath}/mypaint-libmypaint-*] ${workpath}/mypaint-${git.branch}/brushlib
+ }
+}
+
</ins><span class="cx"> homepage http://mypaint.info/
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers ryandesign
</span><span class="lines">@@ -20,19 +54,26 @@
</span><span class="cx"> minimum distractions, bringing up the interface only \
</span><span class="cx"> when you need it.
</span><span class="cx">
</span><del>-depends_build port:pkgconfig \
</del><ins>+depends_build-append port:pkgconfig \
</ins><span class="cx"> port:scons \
</span><span class="cx"> port:swig-python
</span><span class="cx">
</span><del>-depends_lib port:json-c \
</del><ins>+depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \
+ port:gtk3 \
+ port:json-c \
</ins><span class="cx"> port:lcms2 \
</span><span class="cx"> port:libpng \
</span><ins>+ port:librsvg \
</ins><span class="cx"> port:python27 \
</span><ins>+ port:py27-cairo \
+ port:py27-gobject3 \
</ins><span class="cx"> port:py27-numpy \
</span><span class="cx"> port:py27-protobuf
</span><span class="cx">
</span><del>-depends_run port:hicolor-icon-theme
</del><ins>+depends_run-append port:hicolor-icon-theme
</ins><span class="cx">
</span><ins>+patchfiles library-and-include-order.patch
+
</ins><span class="cx"> use_configure no
</span><span class="cx">
</span><span class="cx"> variant universal {}
</span><span class="lines">@@ -63,7 +104,7 @@
</span><span class="cx"> build.args-append enable_openmp=true
</span><span class="cx"> }
</span><span class="cx">
</span><del>-set docdir ${destroot}${prefix}/share/doc/${name}
</del><ins>+set docdir ${prefix}/share/doc/${name}
</ins><span class="cx"> post-destroot {
</span><span class="cx"> # Because we must set --install-sandbox to a relative path for now, multiple pre-destroot
</span><span class="cx"> # directories get created, which must now be combined; see https://gna.org/bugs/?20399
</span><span class="lines">@@ -73,11 +114,15 @@
</span><span class="cx"> system -W ${destroot} "tar -C ${d} -c -f - .${prefix} | tar -x -p -v -f -"
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- xinstall -d ${docdir}
</del><ins>+ xinstall -d ${destroot}${docdir}
</ins><span class="cx"> xinstall -m 644 -W ${worksrcpath} \
</span><ins>+ CODE_OF_CONDUCT.md \
+ CONTRIBUTING.md \
</ins><span class="cx"> COPYING \
</span><del>- LICENSE \
- ${docdir}
</del><ins>+ DEBUGGING.md \
+ Licenses.md \
+ README.md \
+ ${destroot}${docdir}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> app.executable ${workpath}/${name}
</span><span class="lines">@@ -92,75 +137,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {${name} eq ${subport}} {
- conflicts ${name}-devel
- version 1.1.0
- revision 3
-
- master_sites http://download.gna.org/mypaint/
- distname ${my_name}-${version}
- use_xz yes
-
- checksums rmd160 a102688793e2392f70bd625d65cd5b4ea763adec \
- sha256 58fd90b08fa3142b6dddc2a656c0e406fc3ebcf9086b84e83815780ab7698036
-
- depends_lib-append port:py27-pygtk
-
- patchfiles-append patch-${subport}-SConstruct.diff
- patchfiles-append patch-${subport}-brushlib-SConscript.diff
- patchfiles-append patch-${subport}-malloc.diff
-
- post-destroot {
- xinstall -m 644 -W ${worksrcpath} \
- README \
- ${docdir}
- }
-
- post-activate {
- system "${prefix}/bin/gtk-update-icon-cache -tf ${prefix}/share/icons/hicolor"
- }
-
- livecheck.type regex
- livecheck.url [lindex ${master_sites} 0]
- livecheck.regex ${my_name}-(\[0-9.\]+)${extract.suffix}
-} else {
- livecheck.type none
</del><ins>+post-activate {
+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -tf ${prefix}/share/icons/hicolor"
</ins><span class="cx"> }
</span><del>-
-subport ${name}-devel {
- PortGroup github 1.0
- github.setup mypaint mypaint 64730e8c63c10ee466a9da72a4ddf431ca966277
- version 1.2.0-beta.20160109+git.[string range ${git.branch} 0 7]
- set libmypaint_branch 6f482bd6fdc462bb06df15a157edee7035b3ccf9
- conflicts ${name}
-
- master_sites-append https://github.com/${github.author}/libmypaint/tarball/${libmypaint_branch}:libmypaint
- distfiles-append libmypaint-${libmypaint_branch}${extract.suffix}:libmypaint
-
- checksums mypaint-${git.branch}${extract.suffix} \
- rmd160 97a25fbbb7b951392559346209449768a02c9f80 \
- sha256 dbc70dd33cc90c3fb05d96bed7bce3195f5c5081337e44409b6760c88692c459 \
- libmypaint-${libmypaint_branch}${extract.suffix} \
- rmd160 e390600cd6aad15d1b55ea5d4c23fda59ce901b7 \
- sha256 19baeb7570b5eceef8b0dd49de1ff60f86f0a357cbc82344fad2d7f5520627df
-
- depends_lib-append port:gtk3 \
- port:librsvg \
- port:py27-cairo \
- port:py27-gobject3
-
- post-extract {
- delete ${workpath}/mypaint-${git.branch}/brushlib
- move {*}[glob ${workpath}/mypaint-libmypaint-*] ${workpath}/mypaint-${git.branch}/brushlib
- }
-
- post-destroot {
- xinstall -m 644 -W ${worksrcpath} \
- README.md \
- ${docdir}
- }
-
- post-activate {
- system "${prefix}/bin/gtk-update-icon-cache-3.0 -tf ${prefix}/share/icons/hicolor"
- }
-}
</del></span></pre></div>
<a id="trunkdportsgraphicsMyPaintfileslibraryandincludeorderpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/MyPaint/files/library-and-include-order.patch (0 => 144729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/files/library-and-include-order.patch (rev 0)
+++ trunk/dports/graphics/MyPaint/files/library-and-include-order.patch 2016-01-16 20:09:51 UTC (rev 144729)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+Ensure we link with the just-built libmypaint, not a different version that might already be installed.
+https://github.com/mypaint/libmypaint/pull/41
+https://github.com/mypaint/mypaint/pull/566
+--- brushlib/tests/SConscript.orig 2016-01-15 13:42:55.000000000 -0600
++++ brushlib/tests/SConscript 2016-01-16 13:30:24.000000000 -0600
+@@ -19,7 +19,7 @@
+ testlib_env.Append(LIBS=['intl'])
+ elif sys.platform == "msys" and os.environ.get("MSYSTEM") != "MSYS":
+ testlib_env.Append(LIBS=['intl'])
+-testlib_env.Append(CPPPATH=['../'], LIBPATH=['../'])
++testlib_env.Prepend(CPPPATH=['../'], LIBPATH=['../'])
+
+ if testlib_env['enable_gperftools']:
+ parse_pkg_config(testlib_env, "libprofiler")
+--- lib/SConscript.orig 2016-01-15 13:42:55.000000000 -0600
++++ lib/SConscript 2016-01-16 13:28:23.000000000 -0600
+@@ -21,8 +21,8 @@
+
+ # Build against brushlib
+ env.Prepend(LIBS=['mypaint-tests', "mypaint"])
+-env.Append(LIBPATH="../brushlib")
+-env.Append(CPPPATH=['../brushlib', '../brushlib/tests'])
++env.Prepend(LIBPATH="../brushlib")
++env.Prepend(CPPPATH=['../brushlib', '../brushlib/tests'])
+
+
+ def parse_pkg_config(env, libname):
</ins></span></pre></div>
<a id="trunkdportsgraphicsMyPaintfilespatchMyPaintSConstructdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/MyPaint/files/patch-MyPaint-SConstruct.diff (144728 => 144729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/files/patch-MyPaint-SConstruct.diff 2016-01-16 19:13:53 UTC (rev 144728)
+++ trunk/dports/graphics/MyPaint/files/patch-MyPaint-SConstruct.diff 2016-01-16 20:09:51 UTC (rev 144729)
</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="trunkdportsgraphicsMyPaintfilespatchMyPaintbrushlibSConscriptdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/MyPaint/files/patch-MyPaint-brushlib-SConscript.diff (144728 => 144729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/files/patch-MyPaint-brushlib-SConscript.diff 2016-01-16 19:13:53 UTC (rev 144728)
+++ trunk/dports/graphics/MyPaint/files/patch-MyPaint-brushlib-SConscript.diff 2016-01-16 20:09:51 UTC (rev 144729)
</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="trunkdportsgraphicsMyPaintfilespatchMyPaintmallocdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff (144728 => 144729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff 2016-01-16 19:13:53 UTC (rev 144728)
+++ trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff 2016-01-16 20:09:51 UTC (rev 144729)
</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>