<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/53de4336ff0a72f5f7b877bcc669677c2b59811a">https://github.com/macports/macports-ports/commit/53de4336ff0a72f5f7b877bcc669677c2b59811a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 53de4336ff0 zeitgeist: update to version 1.0.2, fix introspection
</span>53de4336ff0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 53de4336ff0a72f5f7b877bcc669677c2b59811a
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Mar 15 12:13:44 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> zeitgeist: update to version 1.0.2, fix introspection
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * switch to freedesktop.org GitLab repo
</span><span style='display:block; white-space:pre;color:#404040;'> * update homepage, master_sites, livecheck
</span><span style='display:block; white-space:pre;color:#404040;'> * switch python module to python38
</span>---
devel/zeitgeist/Portfile | 37 ++++++++++++++--------
.../files/patch-doc-libzeitgeist-Makefile.am.diff | 12 +++++++
.../files/patch-libzeitgeist-Makefile.am.diff | 20 ++++++++++++
.../zeitgeist/files/patch-python_Makefile.am.diff | 6 ++--
4 files changed, 58 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zeitgeist/Portfile b/devel/zeitgeist/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 382a11e2251..ec2abba8b7e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/zeitgeist/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/zeitgeist/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup gobject_introspection 1.0
name zeitgeist
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.0.2
</span> license LGPL-2.1
set branch [join [lrange [split ${version} .] 0 1] .]
description Zeitgeist is a service which logs the users's activities and \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,29 +15,38 @@ long_description {*}${description}
</span> maintainers nomaintainer
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://cgit.freedesktop.org/zeitgeist/zeitgeist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://cgit.freedesktop.org/zeitgeist/zeitgeist/snapshot/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://zeitgeist.freedesktop.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/archive/v${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fd76e340913ffe20b99b210ace88049b0838074f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 29078c1e2a92fbb355bd8011052d8a4b82a66ee21fe3d0bd9535b9fc846c087e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 305825
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-v${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 222928c9d0ec69c9bf3d897ca938e4d733d7751e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6a827cd027543da6f9d61e2f4bc8a4682169bef3d791a17d9370be40ae98fa45 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 247881
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk-doc
</span>
depends_lib port:gtk3 \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:dbus \
port:json-glib \
port:telepathy-glib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-rdflib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py38-rdflib \
</span> port:raptor2 \
port:vala
gobject_introspection yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python3.8
</span>
patchfiles patch-configure.ac.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-doc-libzeitgeist-Makefile.am.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libzeitgeist-Makefile.am.diff \
</span> patch-python_Makefile.am.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,11 +74,11 @@ post-patch {
</span> ${worksrcpath}/tools/zeitgeist-explorer/zeitgeist-explorer
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ./autogen.sh
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-docs
</span>
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}/refs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "\\?h=v(\\d+(?:\\.\\d+)*)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/tags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "tags/v(\\d+(?:\\.\\d+)*)"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zeitgeist/files/patch-doc-libzeitgeist-Makefile.am.diff b/devel/zeitgeist/files/patch-doc-libzeitgeist-Makefile.am.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1367a38fbe1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/zeitgeist/files/patch-doc-libzeitgeist-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/libzeitgeist/Makefile.am.orig 2020-03-14 20:22:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/libzeitgeist/Makefile.am 2020-03-14 20:24:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # with the "--doclet" option (it only works if the directory doesn't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # exist prior to invocation).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ docs_c: $(FILES) $(srcdir)/zeitgeist-gtkdoc-index.sgml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install -D $(srcdir)/zeitgeist-gtkdoc-index.sgml $@/zeitgeist-2.0-docs.xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install -d $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install $(srcdir)/zeitgeist-gtkdoc-index.sgml $@/zeitgeist-2.0-docs.xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(VALADOC) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -X $(top_builddir)/libzeitgeist/zeitgeist-datamodel.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -X $(top_builddir)/libzeitgeist/zeitgeist.h \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff b/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..38494fdfee5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libzeitgeist/Makefile.am.orig 2020-03-14 20:51:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libzeitgeist/Makefile.am 2020-03-14 20:57:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -188,6 +188,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is what g-ir-scanner does.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libzeitgeist_dlname = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\{1,\}\)'/\1/p" libzeitgeist-2.0.la`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++libzeitgeist_libdir = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ `$(SED) -n "s/^libdir='\([A-Za-z0-9.+-/]\{1,\}\)'/\1/p" libzeitgeist-2.0.la`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if HAVE_INTROSPECTION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libzeitgeist_2_0_gir_VALASOURCES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -211,7 +213,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Zeitgeist-2.0.typelib: libzeitgeist-2.0.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Zeitgeist-2.0.typelib: Zeitgeist-2.0.gir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${INTROSPECTION_COMPILER} -l ${libzeitgeist_dlname} --includedir ${INTROSPECTION_GIRDIR} -o $@ $^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${INTROSPECTION_COMPILER} -l ${libzeitgeist_libdir}/${libzeitgeist_dlname} --includedir ${INTROSPECTION_GIRDIR} -o $@ $^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GIRS = Zeitgeist-2.0.gir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zeitgeist/files/patch-python_Makefile.am.diff b/devel/zeitgeist/files/patch-python_Makefile.am.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e24549b6959..cb7c63d3712 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/zeitgeist/files/patch-python_Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/zeitgeist/files/patch-python_Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- python/Makefile.am.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ python/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- python/Makefile.am.orig 2019-01-31 10:32:27.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ python/Makefile.am 2020-03-14 19:33:13.000000000 -0700
</span> @@ -15,7 +15,7 @@
$(NULL)
_ontology.py: $(ONTOLOGY) $(top_srcdir)/data/ontology2code
- @echo -e "#\n# Auto-generated from .trig files. Do not edit.\n#" > $@
+ @echo "#\n# Auto-generated from .trig files. Do not edit.\n#" > $@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AM_V_GEN)$(top_srcdir)/data/ontology2code --dump-python >> $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(AM_V_GEN)$(PYTHON) $(top_srcdir)/data/ontology2code --dump-python >> $@
</span>
CLEANFILES = \
</pre><pre style='margin:0'>
</pre>