<!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>[126149] trunk/dports/devel/zeitgeist</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/126149">126149</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-10-04 08:03:40 -0700 (Sat, 04 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>zeitgeist: update to version 0.9.15, now hosted by freedesktop.org, build from git snapshot, drop +python25 variant, livecheck.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelzeitgeistPortfile">trunk/dports/devel/zeitgeist/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelzeitgeistfilespatchupstreamthru20140703diff">trunk/dports/devel/zeitgeist/files/patch-upstream-thru-20140703.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelzeitgeistfilespatchlibzeitgeistMakefileamdiff">trunk/dports/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsdevelzeitgeist">trunk/dports/devel/zeitgeist/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelzeitgeist"></a>
<div class="propset"><h4>Property changes: trunk/dports/devel/zeitgeist</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/cal/ports/devel/zeitgeist:96570-97031
</span><span class="cx">/users/devans/GNOME-3/stable/dports/devel/zeitgeist:118243-118732
</span><span class="cx"> + /users/devans/GNOME-3/stable/dports/devel/zeitgeist:118243-126096
</span><a id="trunkdportsdevelzeitgeistPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/zeitgeist/Portfile (126148 => 126149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/zeitgeist/Portfile 2014-10-04 14:58:38 UTC (rev 126148)
+++ trunk/dports/devel/zeitgeist/Portfile 2014-10-04 15:03:40 UTC (rev 126149)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name zeitgeist
</span><del>-version 0.9.14
-revision 6
</del><ins>+version 0.9.15
</ins><span class="cx"> license LGPL-2.1
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Zeitgeist is a service which logs the users's activities and \
</span><span class="lines">@@ -16,11 +15,11 @@
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> categories devel
</span><span class="cx"> platforms darwin
</span><del>-homepage https://launchpad.net/zeitgeist-project
-master_sites http://ftp.heanet.ie/mirrors/gnome/teams/releng/tarballs-needing-help/${name}/
</del><ins>+homepage http://cgit.freedesktop.org/zeitgeist/zeitgeist
+master_sites http://cgit.freedesktop.org/zeitgeist/zeitgeist/snapshot/
</ins><span class="cx">
</span><del>-checksums rmd160 fad3efc670a627e7494fe179b8afcbd612152a05 \
- sha256 64affdf543ca16c688845ac053bbacd8cb6021991afa7b27c4545efc5d86033f
</del><ins>+checksums rmd160 cb21562654ede86fb5857359f092057cd35f523c \
+ sha256 e08a300fe2cc5c8d1cb0a0519ab628f4935bbc1dda7c312ab3a05d59e761f61e
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -38,8 +37,8 @@
</span><span class="cx"> port:raptor2 \
</span><span class="cx"> port:vala
</span><span class="cx">
</span><del>-patchfiles patch-configure.ac.diff \
- patch-libzeitgeist-Makefile.am.diff
</del><ins>+patchfiles patch-upstream-thru-20140703.diff \
+ patch-configure.ac.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|^#\!.*|#!${configure.python}|" \
</span><span class="lines">@@ -74,25 +73,20 @@
</span><span class="cx"> build.args-append CC="${configure.cc} ${configure.cc_archflags}"
</span><span class="cx"> destroot.args-append CC="${configure.cc} ${configure.cc_archflags}"
</span><span class="cx">
</span><del>-variant python25 conflicts python26 python27 description {Build using Python 2.5} {
- depends_lib-append port:py25-rdflib
- configure.python ${prefix}/bin/python2.5
-}
-
-variant python26 conflicts python25 python27 description {Build using Python 2.6} {
</del><ins>+variant python26 conflicts python27 description {Build using Python 2.6} {
</ins><span class="cx"> depends_lib-append port:py26-rdflib
</span><span class="cx"> configure.python ${prefix}/bin/python2.6
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant python27 conflicts python25 python26 description {Build using Python 2.7} {
</del><ins>+variant python27 conflicts python26 description {Build using Python 2.7} {
</ins><span class="cx"> depends_lib-append port:py27-rdflib
</span><span class="cx"> configure.python ${prefix}/bin/python2.7
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset python25] && ![variant_isset python26]} {
</del><ins>+if {![variant_isset python26]} {
</ins><span class="cx"> default_variants +python27
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><del>-livecheck.url ${master_sites}
-livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</del><ins>+livecheck.url ${homepage}/refs
+livecheck.regex "id=v(\\d+(?:\\.\\d+)*)"
</ins></span></pre></div>
<a id="trunkdportsdevelzeitgeistfilespatchlibzeitgeistMakefileamdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff (126148 => 126149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff 2014-10-04 14:58:38 UTC (rev 126148)
+++ trunk/dports/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff 2014-10-04 15:03:40 UTC (rev 126149)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-=== modified file 'libzeitgeist/Makefile.am'
---- libzeitgeist/Makefile.am 2013-03-18 12:56:51 +0000
-+++ libzeitgeist/Makefile.am 2014-01-27 21:45:42 +0000
-@@ -186,7 +186,7 @@
- # We have to extract our own dlname from libzeitgeist-2.0.la; see bgo#658002.
- # This is what g-ir-scanner does.
- libzeitgeist_dlname = \
-- `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeist-2.0.la`
-+ `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\{1,\}\)'/\1/p" libzeitgeist-2.0.la`
-
- if HAVE_INTROSPECTION
- libzeitgeist_2_0_gir_VALASOURCES = \
-
</del></span></pre></div>
<a id="trunkdportsdevelzeitgeistfilespatchupstreamthru20140703difffromrev126096usersdevansGNOME3stabledportsdevelzeitgeistfilespatchupstreamthru20140703diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/zeitgeist/files/patch-upstream-thru-20140703.diff (from rev 126096, users/devans/GNOME-3/stable/dports/devel/zeitgeist/files/patch-upstream-thru-20140703.diff) (0 => 126149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/zeitgeist/files/patch-upstream-thru-20140703.diff (rev 0)
+++ trunk/dports/devel/zeitgeist/files/patch-upstream-thru-20140703.diff 2014-10-04 15:03:40 UTC (rev 126149)
</span><span class="lines">@@ -0,0 +1,219 @@
</span><ins>+From b1e82de434a7b63fe1290d0051de58350b069991 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <philip@tecnocode.co.uk>
+Date: Sun, 16 Feb 2014 15:08:49 +0000
+Subject: libzeitgeist: Add a missing dependency on gio-2.0
+
+This actually makes the zeitgeist vapi file usable.
+
+Signed-off-by: Seif Lotfy <seif@lotfy.com>
+
+diff --git a/libzeitgeist/zeitgeist-2.0.deps b/libzeitgeist/zeitgeist-2.0.deps
+index ff8d39b..59eec5d 100644
+--- libzeitgeist/zeitgeist-2.0.deps
++++ libzeitgeist/zeitgeist-2.0.deps
+@@ -1 +1,2 @@
+ zeitgeist-datamodel-2.0
++gio-2.0
+--
+cgit v0.10.2
+
+From 3fe95cdb5a4c48d3b6606ffb1f60fae3e375fdff Mon Sep 17 00:00:00 2001
+From: Seif Lotfy <seif@lotfy.com>
+Date: Tue, 4 Mar 2014 20:55:53 +0100
+Subject: Replace get_nprocs_conf with g_get_num_processors()
+
+
+diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala
+index 02b16ca..f0b65cb 100644
+--- libzeitgeist/log.vala
++++ libzeitgeist/log.vala
+@@ -40,6 +40,7 @@
+ * Zeitgeist also comes with a blacklist extension to make sure the user
+ * always stays in control of what information is logged.
+ */
++
+ namespace Zeitgeist
+ {
+
+@@ -58,8 +59,8 @@ namespace Zeitgeist
+ */
+ public class Log : QueuedProxyWrapper
+ {
+- [CCode (cheader_filename = "sys/sysinfo.h", cname = "get_nprocs_conf")]
+- extern static int get_nprocs_conf ();
++ [CCode (cname = "g_get_num_processors")]
++ private extern static uint get_num_processors ();
+
+ class DbWorker
+ {
+@@ -141,7 +142,7 @@ public class Log : QueuedProxyWrapper
+ try {
+ threads = new ThreadPool<DbWorker>.with_owned_data ((worker) => {
+ worker.run ();
+- }, get_nprocs_conf (), true);
++ }, (int) get_num_processors (), true);
+ } catch (ThreadError err) {
+ warning ("%s", err.message);
+ threads = null;
+@@ -637,4 +638,3 @@ public class Log : QueuedProxyWrapper
+
+ }
+
+-// vim:expandtab:ts=4:sw=4
+--
+cgit v0.10.2
+
+From 201bd67de450320520a12e2b0c465c8eb6818bd2 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Mon, 17 Mar 2014 20:57:49 +0100
+Subject: WhereClause: Fix array-length to work with string.joinv of vala-0.24
+
+
+diff --git a/libzeitgeist/where-clause.vala b/libzeitgeist/where-clause.vala
+index a830599..d981914 100644
+--- libzeitgeist/where-clause.vala
++++ libzeitgeist/where-clause.vala
+@@ -211,7 +211,11 @@ namespace Zeitgeist
+ */
+ private T[] generic_array_to_unowned_array<T> (GenericArray<T> gptrarr)
+ {
++#if VALA_0_24
++ long[] pointers = new long[gptrarr.length];
++#else
+ long[] pointers = new long[gptrarr.length + 1];
++#endif
+ Memory.copy(pointers, ((PtrArray *) gptrarr)->pdata,
+ (gptrarr.length) * sizeof (void *));
+ return (T[]) pointers;
+--
+cgit v0.10.2
+
+From d2c966faf4979b5745ea0df8062795fc82b9fcc1 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Mon, 17 Mar 2014 21:02:01 +0100
+Subject: Require glib >= 2.35.4 according to the usage of
+ g_get_num_processors()
+
+Bump vala buildflags accordingly
+
+diff --git a/configure.ac b/configure.ac
+index acf7daa..45f50c7 100644
+--- configure.ac
++++ configure.ac
+@@ -29,7 +29,7 @@ AC_SUBST(CFLAGS)
+ AC_SUBST(CPPFLAGS)
+ AC_SUBST(LDFLAGS)
+
+-GLIB_REQUIRED=2.26.0
++GLIB_REQUIRED=2.35.4
+ SQLITE_REQUIRED=3.7.11
+ VALADOC_REQUIRED=0.2
+
+diff --git a/datahub/Makefile.am b/datahub/Makefile.am
+index 9629baa..19bcb3b 100644
+--- datahub/Makefile.am
++++ datahub/Makefile.am
+@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
+ $(NULL)
+
+ AM_VALAFLAGS = \
+- --target-glib=2.26 \
++ --target-glib=2.36 \
+ --pkg gio-2.0 \
+ --pkg gio-unix-2.0 \
+ --pkg gtk+-3.0 \
+diff --git a/examples/vala/Makefile.am b/examples/vala/Makefile.am
+index 99584e6..b7cd7c2 100644
+--- examples/vala/Makefile.am
++++ examples/vala/Makefile.am
+@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
+ $(NULL)
+
+ AM_VALAFLAGS = \
+- --target-glib=2.26 \
++ --target-glib=2.36 \
+ --pkg gio-2.0 \
+ $(top_builddir)/libzeitgeist/zeitgeist-datamodel-2.0.vapi \
+ $(top_builddir)/libzeitgeist/zeitgeist-2.0.vapi \
+diff --git a/extensions/Makefile.am b/extensions/Makefile.am
+index 20139aa..72b9e24 100644
+--- extensions/Makefile.am
++++ extensions/Makefile.am
+@@ -24,7 +24,7 @@ AM_CPPFLAGS = \
+ $(NULL)
+
+ AM_VALAFLAGS = \
+- --target-glib=2.26 \
++ --target-glib=2.36 \
+ --pkg gio-2.0 \
+ --pkg sqlite3 \
+ --pkg gmodule-2.0 \
+diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am
+index 8bd9936..0ebf206 100644
+--- extensions/fts++/Makefile.am
++++ extensions/fts++/Makefile.am
+@@ -21,7 +21,7 @@ AM_CPPFLAGS = \
+ $(NULL)
+
+ AM_VALAFLAGS = \
+- --target-glib=2.26 \
++ --target-glib=2.36 \
+ --pkg gio-2.0 \
+ --pkg sqlite3 \
+ --pkg posix \
+diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am
+index f44e950..9af0cb4 100644
+--- libzeitgeist/Makefile.am
++++ libzeitgeist/Makefile.am
+@@ -27,7 +27,7 @@ AM_CPPFLAGS = \
+ $(NULL)
+
+ AM_VALAFLAGS = \
+- --target-glib=2.26 \
++ --target-glib=2.36 \
+ --pkg gio-2.0 \
+ --pkg gio-unix-2.0 \
+ --pkg sqlite3 \
+diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala
+index f0b65cb..3de1c7d 100644
+--- libzeitgeist/log.vala
++++ libzeitgeist/log.vala
+@@ -59,9 +59,6 @@ namespace Zeitgeist
+ */
+ public class Log : QueuedProxyWrapper
+ {
+- [CCode (cname = "g_get_num_processors")]
+- private extern static uint get_num_processors ();
+-
+ class DbWorker
+ {
+ private unowned ThreadFunc<void*> func;
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3deb6c2..65751ef 100644
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
+ $(NULL)
+
+ AM_VALAFLAGS = \
+- --target-glib=2.26 \
++ --target-glib=2.36 \
+ --pkg gio-2.0 \
+ --pkg sqlite3 \
+ --pkg posix \
+diff --git a/test/direct/Makefile.am b/test/direct/Makefile.am
+index 80279d4..59e9f5f 100644
+--- test/direct/Makefile.am
++++ test/direct/Makefile.am
+@@ -8,7 +8,7 @@ EXTRA_DIST = \
+ $(NULL)
+
+ AM_VALAFLAGS = \
+- --target-glib=2.26 \
++ --target-glib=2.36 \
+ --pkg gio-2.0 \
+ --pkg gio-unix-2.0 \
+ --pkg sqlite3 \
+--
+cgit v0.10.2
+
</ins></span></pre>
</div>
</div>
</body>
</html>