<!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>[125775] trunk/dports/devel/geany</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/125775">125775</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-09-25 16:07:23 -0700 (Thu, 25 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>geany: update to version 1.24.1, add a +gtk3 variant to enable experimental gtk3 build, fix livecheck (#45129, maintainer timeout).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelgeanyPortfile">trunk/dports/devel/geany/Portfile</a></li>
<li><a href="#trunkdportsdevelgeanyfilesvtesonamesdiff">trunk/dports/devel/geany/files/vte-sonames.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelgeanyfilespatchnoexportdynamicdiff">trunk/dports/devel/geany/files/patch-no-export-dynamic.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelgeanyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/geany/Portfile (125774 => 125775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/geany/Portfile 2014-09-25 23:00:11 UTC (rev 125774)
+++ trunk/dports/devel/geany/Portfile 2014-09-25 23:07:23 UTC (rev 125775)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name geany
</span><del>-version 1.22
-revision 2
</del><ins>+version 1.24.1
</ins><span class="cx"> license GPL-2+
</span><span class="cx"> categories devel
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -24,8 +23,8 @@
</span><span class="cx"> master_sites http://download.geany.org/
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 d0296f2930aa6e6b4dd7a95061c58645d9c4c1ba \
- sha256 901a35a7395ef10a80fb10b3ab63bae3871693a4e82d56388e9521a27877577e
</del><ins>+checksums rmd160 f5fd46ed83451147a95516812628a1a6b459a98c \
+ sha256 7fb505d9b01fe6874890525f837644a6a38c23a372bb068c65ef3673108a8c33
</ins><span class="cx">
</span><span class="cx"> depends_build \
</span><span class="cx"> port:pkgconfig \
</span><span class="lines">@@ -35,8 +34,6 @@
</span><span class="cx"> port:gtk2 \
</span><span class="cx"> port:vte-gtk2-compat
</span><span class="cx">
</span><del>-patchfiles patch-no-export-dynamic.diff
-
</del><span class="cx"> # update m4/intltool.m4 and autoreconf
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span><span class="lines">@@ -46,8 +43,23 @@
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><del>-configure.args --disable-silent-rules
</del><ins>+configure.args --disable-silent-rules \
+ --enable-vte
</ins><span class="cx">
</span><span class="cx"> platform darwin {
</span><span class="cx"> patchfiles-append vte-sonames.diff
</span><ins>+
+ post-patch {
+ reinplace "s|@@MP_PREFIX@@|${prefix}|" ${worksrcpath}/src/vte.c
+ }
</ins><span class="cx"> }
</span><ins>+
+variant gtk3 description {Enable experimental gtk3 support} {
+ depends_lib-replace port:gtk2 port:gtk3
+ depends_lib-replace port:vte-gtk2-compat port:vte
+ configure.args-append --enable-gtk3
+}
+
+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</ins></span></pre></div>
<a id="trunkdportsdevelgeanyfilespatchnoexportdynamicdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/geany/files/patch-no-export-dynamic.diff (125774 => 125775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/geany/files/patch-no-export-dynamic.diff 2014-09-25 23:00:11 UTC (rev 125774)
+++ trunk/dports/devel/geany/files/patch-no-export-dynamic.diff 2014-09-25 23:07:23 UTC (rev 125775)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>-https://github.com/geany/geany/commit/d11f9a51b939bf39c3c1676ab823147d460ede75
---- wscript.orig 2012-06-17 17:24:32.000000000 -0500
-+++ wscript 2012-10-24 21:28:41.000000000 -0500
-@@ -309,7 +309,6 @@
- source = geany_sources,
- includes = ['.', 'scintilla/include/', 'tagmanager/include/'],
- defines = ['G_LOG_DOMAIN="Geany"', 'GEANY_PRIVATE'],
-- linkflags = [] if is_win32 else ['-Wl,--export-dynamic'],
- uselib = ['GTK', 'GLIB', 'GMODULE', 'GIO', 'GTHREAD', 'WIN32', 'SUNOS_SOCKET'],
- use = ['scintilla', 'tagmanager', 'mio'])
-
---- src/Makefile.am.orig 2014-07-17 21:00:18.000000000 -0700
-+++ src/Makefile.am 2014-07-17 21:01:10.000000000 -0700
-@@ -126,7 +126,7 @@
- -DGTK \
- -DG_LOG_DOMAIN=\""Geany"\"
-
--geany_LDFLAGS = -Wl,--export-dynamic
-+geany_LDFLAGS =
-
- clean-local:
-
</del></span></pre></div>
<a id="trunkdportsdevelgeanyfilesvtesonamesdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/geany/files/vte-sonames.diff (125774 => 125775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/geany/files/vte-sonames.diff 2014-09-25 23:00:11 UTC (rev 125774)
+++ trunk/dports/devel/geany/files/vte-sonames.diff 2014-09-25 23:07:23 UTC (rev 125775)
</span><span class="lines">@@ -1,17 +1,18 @@
</span><del>---- src/vte.c.orig 2012-06-17 17:47:13.000000000 -0500
-+++ src/vte.c 2012-10-24 21:28:41.000000000 -0500
-@@ -199,8 +199,8 @@
- if (module == NULL)
- {
</del><ins>+--- src/vte.c.orig 2014-04-16 08:20:13.000000000 -0700
++++ src/vte.c 2014-09-22 09:04:22.000000000 -0700
+@@ -203,9 +203,9 @@
</ins><span class="cx"> gint i;
</span><del>-- const gchar *sonames[] = { "libvte.so", "libvte.so.4",
-- "libvte.so.8", "libvte.so.9", NULL };
-+ const gchar *sonames[] = { "libvte.dylib", "libvte.4.dylib",
-+ "libvte.8.dylib", "libvte.9.dylib", NULL };
-
- for (i = 0; sonames[i] != NULL && module == NULL; i++)
- {
-@@ -211,7 +211,7 @@
</del><ins>+ const gchar *sonames[] = {
+ #if GTK_CHECK_VERSION(3, 0, 0)
+- "libvte2_90.so", "libvte2_90.so.9",
++ "@@MP_PREFIX@@/lib/libvte2_90.dylib",
+ #else
+- "libvte.so", "libvte.so.4", "libvte.so.8", "libvte.so.9",
++ "@@MP_PREFIX@@/lib/libvte.dylib",
+ #endif
+ NULL
+ };
+@@ -219,7 +219,7 @@
</ins><span class="cx"> if (module == NULL)
</span><span class="cx"> {
</span><span class="cx"> vte_info.have_vte = FALSE;
</span><span class="lines">@@ -20,9 +21,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> else
</span><del>---- src/main.c.orig 2012-06-17 17:44:36.000000000 -0500
-+++ src/main.c 2012-10-24 21:28:41.000000000 -0500
-@@ -139,7 +139,7 @@
</del><ins>+--- src/main.c.orig 2014-04-16 08:20:13.000000000 -0700
++++ src/main.c 2014-09-22 09:08:22.000000000 -0700
+@@ -140,7 +140,7 @@
</ins><span class="cx"> { "no-session", 's', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &cl_options.load_session, N_("Don't load the previous session's files"), NULL },
</span><span class="cx"> #ifdef HAVE_VTE
</span><span class="cx"> { "no-terminal", 't', 0, G_OPTION_ARG_NONE, &no_vte, N_("Don't load terminal support"), NULL },
</span></span></pre>
</div>
</div>
</body>
</html>