<!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>[149606] trunk/dports/gnome/anjuta</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/149606">149606</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-06-27 15:12:54 -0700 (Mon, 27 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>anjuta: update to version 3.20.0, add dependency on gnutls, blacklist compilers that do not support C11 redefinition of typedef, add variants +python34 +python35, default +python34, patch python loader plugin to fix python3 runtime issue.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomeanjutaPortfile">trunk/dports/gnome/anjuta/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomeanjutafilespatchpluginspythonloaderplugincdiff">trunk/dports/gnome/anjuta/files/patch-plugins-python-loader-plugin.c.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomeanjuta">trunk/dports/gnome/anjuta/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomeanjuta"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/anjuta</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/users/devans/GNOME-3/stable/dports/gnome/anjuta:108269-142425
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/anjuta:116619-118151,119539-125908,132270-134577
</span><span class="cx">/users/devans/dports/gnome/anjuta:117797-117811
</span><span class="cx">/users/rmstonecipher/gnome/anjuta:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/anjuta:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/anjuta:108269-149603
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/anjuta:116619-118151,119539-125908,132270-134577
</span><span class="cx">/users/devans/dports/gnome/anjuta:117797-117811
</span><span class="cx">/users/rmstonecipher/gnome/anjuta:102363-103172
</span><a id="trunkdportsgnomeanjutaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/anjuta/Portfile (149605 => 149606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/anjuta/Portfile 2016-06-27 22:08:38 UTC (rev 149605)
+++ trunk/dports/gnome/anjuta/Portfile 2016-06-27 22:12:54 UTC (rev 149606)
</span><span class="lines">@@ -7,8 +7,7 @@
</span><span class="cx"> PortGroup muniversal 1.0
</span><span class="cx">
</span><span class="cx"> name anjuta
</span><del>-version 3.18.2
-revision 2
</del><ins>+version 3.20.0
</ins><span class="cx"> license GPL-2+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description A GNOME/GTK IDE
</span><span class="lines">@@ -21,8 +20,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 0c8289d057d2b1543032b34543668c539c461e47 \
- sha256 be864f2f1807e1b870697f646294e997d221d5984a135245543b719e501cef8e
</del><ins>+checksums rmd160 34f28bc54b8331a8a110471a9b58c27fb4aa43ce \
+ sha256 a676c587a28f784ec2096775460cd29fafc3f0216c53e0821641bcd9126b6935
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -54,7 +53,8 @@
</span><span class="cx"> patchfiles patch-configure.ac.diff \
</span><span class="cx"> patch-python-cflags.diff \
</span><span class="cx"> python-ldflags.patch \
</span><del>- patch-ltmain.sh.diff
</del><ins>+ patch-ltmain.sh.diff \
+ patch-plugins-python-loader-plugin.c.diff
</ins><span class="cx">
</span><span class="cx"> gobject_introspection yes
</span><span class="cx">
</span><span class="lines">@@ -106,17 +106,22 @@
</span><span class="cx"> depends_lib-append port:vala
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant python27 conflicts python34 description {Use Python 2.7} {
</del><ins>+variant python27 conflicts python34 python35 description {Use Python 2.7} {
</ins><span class="cx"> configure.python ${prefix}/bin/python2.7
</span><span class="cx"> depends_lib-append port:py27-gobject3
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant python34 conflicts python27 description {Use Python 3.4} {
</del><ins>+variant python34 conflicts python27 python35 description {Use Python 3.4} {
</ins><span class="cx"> configure.python ${prefix}/bin/python3.4
</span><span class="cx"> depends_lib-append port:py34-gobject3
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset python27]} {
</del><ins>+variant python35 conflicts python27 python34 description {Use Python 3.5} {
+ configure.python ${prefix}/bin/python3.5
+ depends_lib-append port:py35-gobject3
+}
+
+if {![variant_isset python27] && ![variant_isset python35]} {
</ins><span class="cx"> default_variants +python34
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgnomeanjutafilespatchpluginspythonloaderplugincdifffromrev149603usersdevansGNOME3stabledportsgnomeanjutafilespatchpluginspythonloaderplugincdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/anjuta/files/patch-plugins-python-loader-plugin.c.diff (from rev 149603, users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-python-loader-plugin.c.diff) (0 => 149606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/anjuta/files/patch-plugins-python-loader-plugin.c.diff (rev 0)
+++ trunk/dports/gnome/anjuta/files/patch-plugins-python-loader-plugin.c.diff 2016-06-27 22:12:54 UTC (rev 149606)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+--- plugins/python-loader/plugin.c.orig 2016-06-13 21:39:50.000000000 -0700
++++ plugins/python-loader/plugin.c 2016-06-13 22:11:53.000000000 -0700
+@@ -93,6 +93,12 @@
+ /* AnjutaPlugin functions
+ *---------------------------------------------------------------------------*/
+
++#if PY_MAJOR_VERSION >= 3
++#include <stdlib.h>
++
++static wchar_t *wargv;
++#endif
++
+ static gboolean
+ pyl_plugin_activate (AnjutaPlugin *plugin)
+ {
+@@ -112,7 +118,15 @@
+ return FALSE;
+ }
+
++#if PY_MAJOR_VERSION >= 3
++ char *s = argv[0];
++ size_t slen = sizeof (s);
++ wargv = (wchar_t *) calloc (slen + 1, sizeof (wchar_t));
++ mbstowcs (wargv, s, slen);
++ PySys_SetArgv (1, &wargv);
++#else
+ PySys_SetArgv (1, argv);
++#endif
+
+ /* Retrieve the Python type for anjuta plugin */
+ m = PyImport_ImportModule ("gi.repository.Anjuta");
+@@ -136,6 +150,10 @@
+ while (PyGC_Collect ())
+
+
++#if PY_MAJOR_VERSION >= 3
++ free (wargv);
++#endif
++
+ Py_Finalize ();
+ }
+
</ins></span></pre>
</div>
</div>
</body>
</html>