From 11bc22f45271c4f1113637466582a02077d291aa Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Sun, 2 Aug 2015 15:37:19 +0000 Subject: [PATCH] Update zeitgeist to 0.9.14 [1] This version of zeitgeist now bundles libzeitgeist in the port. The new libzeitgeist was bumped to libzeitgeist-1.0.so -> libzeitgeist-2.0.so. * deskutils/cairo-dock-plugins: supports both zeitgeist versions. * net-im/folks: Only supports the new 2.0 libzeitgeist library version. And this went unnoticed, woops. * sysutils/libzeitgeist: Remove since it is now bundled in zeitgeist. * sysutils/qzeitgeist: Update the port for the new zeitgeist API. * www/midori: Mark the zeitgeist option (non-default) broken until midori can be updated to a version that supports the new libzeitgeist 2.0 PR: 190729 [1] Submitted by: olivierd@ [1] --- MOVED | 1 + deskutils/cairo-dock-plugins/Makefile | 4 +- net-im/folks/Makefile | 4 +- sysutils/Makefile | 1 - sysutils/libzeitgeist/Makefile | 23 ---- sysutils/libzeitgeist/distinfo | 2 - sysutils/libzeitgeist/pkg-descr | 3 - sysutils/libzeitgeist/pkg-plist | 59 -------- sysutils/qzeitgeist/Makefile | 25 +--- sysutils/qzeitgeist/distinfo | 4 +- .../files/patch-scripts__PythonSerializer.py | 13 -- sysutils/zeitgeist/Makefile | 41 ++++-- sysutils/zeitgeist/distinfo | 4 +- .../files/patch-extra__PythonSerializer.py | 13 -- sysutils/zeitgeist/pkg-plist | 127 +++--------------- www/midori/Makefile | 3 +- 16 files changed, 65 insertions(+), 262 deletions(-) delete mode 100644 sysutils/libzeitgeist/Makefile delete mode 100644 sysutils/libzeitgeist/distinfo delete mode 100644 sysutils/libzeitgeist/pkg-descr delete mode 100644 sysutils/libzeitgeist/pkg-plist delete mode 100644 sysutils/qzeitgeist/files/patch-scripts__PythonSerializer.py delete mode 100644 sysutils/zeitgeist/files/patch-extra__PythonSerializer.py diff --git a/MOVED b/MOVED index a9a1c5df19e7..0fbc3e5b079f 100644 --- a/MOVED +++ b/MOVED @@ -7750,3 +7750,4 @@ net/py-soapy|net/py-soappy|2015-08-01|Has expired: Abandonware depending on anci net-p2p/btqueue||2015-08-01|Has expired: Runtime broken (does not download anything) sysutils/vhdtool||2015-08-01|Has expired: Use mkimg(1) instead www/rubygem-modernizr||2015-08-01|Has expired: This gem has been removed from rubygems.org by upstream +sysutils/libzeitgeist|sysutils/zeitgeist|2015-07-26|Merged into zeitgeist diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile index e2f16f1cfeac..ef1e1b41c5d8 100644 --- a/deskutils/cairo-dock-plugins/Makefile +++ b/deskutils/cairo-dock-plugins/Makefile @@ -2,7 +2,7 @@ PORTNAME= cairo-dock-plugins PORTVERSION= 3.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MAINTAINER= fidaj@ukr.net @@ -155,7 +155,7 @@ XFCE_INTEGRATION_LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif XFCE_INTEGRATION_CMAKE_ON= -Denable-xfce-integration:BOOL=TRUE XFCE_INTEGRATION_CMAKE_OFF= -Denable-xfce-integration:BOOL=FALSE -ZEITGEIST_LIB_DEPENDS= libzeitgeist-1.0.so:${PORTSDIR}/sysutils/libzeitgeist +ZEITGEIST_LIB_DEPENDS= libzeitgeist-2.0.so:${PORTSDIR}/sysutils/zeitgeist ZEITGEIST_CMAKE_ON= -Denable-recent-events:BOOL=TRUE ZEITGEIST_CMAKE_OFF= -Denable-recent-events:BOOL=FALSE diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile index a3d6b63359f6..452bb21ddb02 100644 --- a/net-im/folks/Makefile +++ b/net-im/folks/Makefile @@ -3,7 +3,7 @@ PORTNAME= folks PORTVERSION= 0.10.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= GNOME @@ -13,7 +13,7 @@ COMMENT= library to aggregates people from multiple sources BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala LIB_DEPENDS= libgee-0.8.so:${PORTSDIR}/devel/libgee \ libgcr-3.so:${PORTSDIR}/security/gcr \ - libzeitgeist-1.0.so:${PORTSDIR}/sysutils/libzeitgeist \ + libzeitgeist-2.0.so:${PORTSDIR}/sysutils/zeitgeist \ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib CONFLICTS= folks-0.4.[0-9]* diff --git a/sysutils/Makefile b/sysutils/Makefile index 8979d591e8e3..a180f7042d3e 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -472,7 +472,6 @@ SUBDIR += libsunacl SUBDIR += liburcu SUBDIR += libutempter - SUBDIR += libzeitgeist SUBDIR += life-preserver SUBDIR += lineak-defaultplugin SUBDIR += lineak-xosdplugin diff --git a/sysutils/libzeitgeist/Makefile b/sysutils/libzeitgeist/Makefile deleted file mode 100644 index 341c7d6fd444..000000000000 --- a/sysutils/libzeitgeist/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# $FreeBSD$ - -PORTNAME= libzeitgeist -PORTVERSION= 0.3.18 -PORTREVISION= 2 -CATEGORIES= sysutils -MASTER_SITES= https://launchpadlibrarian.net/100152436/ \ - https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ \ - LOCAL/olivierd - -MAINTAINER= olivierd@FreeBSD.org -COMMENT= Zeitgeist client library - -GNU_CONFIGURE= yes -USES= gettext gmake libtool pathfix pkgconfig -USE_GNOME= glib20 intltool intlhack -USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc -INSTALL_TARGET= install-strip - -OPTIONS_DEFINE= DOCS - -.include diff --git a/sysutils/libzeitgeist/distinfo b/sysutils/libzeitgeist/distinfo deleted file mode 100644 index 6da9dff986d3..000000000000 --- a/sysutils/libzeitgeist/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (libzeitgeist-0.3.18.tar.gz) = 82c128d97a68600518b8e3e65ef4d5b123c57f3d5dfa977c7ff733c0fdf80f73 -SIZE (libzeitgeist-0.3.18.tar.gz) = 527117 diff --git a/sysutils/libzeitgeist/pkg-descr b/sysutils/libzeitgeist/pkg-descr deleted file mode 100644 index 4e8a5d5ec05b..000000000000 --- a/sysutils/libzeitgeist/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Client library for interacting with Zeitgeist daemon. - -WWW: https://launchpad.net/libzeitgeist diff --git a/sysutils/libzeitgeist/pkg-plist b/sysutils/libzeitgeist/pkg-plist deleted file mode 100644 index ddaa1d25e7db..000000000000 --- a/sysutils/libzeitgeist/pkg-plist +++ /dev/null @@ -1,59 +0,0 @@ -include/zeitgeist-1.0/zeitgeist-data-source-registry.h -include/zeitgeist-1.0/zeitgeist-data-source.h -include/zeitgeist-1.0/zeitgeist-enums.h -include/zeitgeist-1.0/zeitgeist-enumtypes.h -include/zeitgeist-1.0/zeitgeist-event.h -include/zeitgeist-1.0/zeitgeist-index.h -include/zeitgeist-1.0/zeitgeist-log.h -include/zeitgeist-1.0/zeitgeist-mimetypes.h -include/zeitgeist-1.0/zeitgeist-monitor.h -include/zeitgeist-1.0/zeitgeist-ontology-interpretations.h -include/zeitgeist-1.0/zeitgeist-ontology-manifestations.h -include/zeitgeist-1.0/zeitgeist-result-set.h -include/zeitgeist-1.0/zeitgeist-subject.h -include/zeitgeist-1.0/zeitgeist-symbols.h -include/zeitgeist-1.0/zeitgeist-timerange.h -include/zeitgeist-1.0/zeitgeist-timestamp.h -include/zeitgeist-1.0/zeitgeist.h -lib/libzeitgeist-1.0.a -lib/libzeitgeist-1.0.so -lib/libzeitgeist-1.0.so.1 -lib/libzeitgeist-1.0.so.1.1.4 -libdata/pkgconfig/zeitgeist-1.0.pc -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistDataSource.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistDataSourceRegistry.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistEvent.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistIndex.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistLog.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistMonitor.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistResultSet.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistSubject.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistTimeRange.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/annotation-glossary.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/api-index-full.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/ch01.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/ch02.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/ch03.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/ch04.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/home.png -%%PORTDOCS%%share/doc/zeitgeist-1.0/index.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/index.sgml -%%PORTDOCS%%share/doc/zeitgeist-1.0/left.png -%%PORTDOCS%%share/doc/zeitgeist-1.0/object-tree.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/right.png -%%PORTDOCS%%share/doc/zeitgeist-1.0/style.css -%%PORTDOCS%%share/doc/zeitgeist-1.0/up.png -%%PORTDOCS%%share/doc/zeitgeist-1.0/zeitgeist-1.0-Enumerations.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/zeitgeist-1.0-Interpretation-Ontology.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/zeitgeist-1.0-Manifestation-Ontology.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/zeitgeist-1.0-Mimetype-mapping-and-URI-comprehension.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/zeitgeist-1.0-Symbol-comprehension.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/zeitgeist-1.0-Timestamp-handling.html -%%PORTDOCS%%share/doc/zeitgeist-1.0/zeitgeist-1.0.devhelp2 -share/vala/vapi/zeitgeist-1.0.deps -share/vala/vapi/zeitgeist-1.0.vapi diff --git a/sysutils/qzeitgeist/Makefile b/sysutils/qzeitgeist/Makefile index 7ee6bf6f3d0c..9dfea15f86bb 100644 --- a/sysutils/qzeitgeist/Makefile +++ b/sysutils/qzeitgeist/Makefile @@ -2,13 +2,13 @@ PORTNAME= qzeitgeist PORTVERSION= 0.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= KDE/stable/lib${PORTNAME}/${PORTVERSION}/src/:kde \ http://launchpad.net/zeitgeist/${ZEITGEIST_VERSION:R}/${ZEITGEIST_VERSION}/+download/ DISTNAME= lib${PORTNAME}-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:kde \ - zeitgeist-${ZEITGEIST_VERSION}.tar.gz + zeitgeist-${ZEITGEIST_VERSION}.tar.xz EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= avilla@FreeBSD.org @@ -27,17 +27,15 @@ USES= cmake python:build tar:bzip2 USE_LDCONFIG= yes # To be kept in sync with sysutils/zeitgeist. -ZEITGEIST_VERSION= 0.8.2 +ZEITGEIST_VERSION= 0.9.16 post-extract: @(cd ${WRKDIR} && ${TAR} ${EXTRACT_BEFORE_ARGS} \ - ${_DISTDIR}/zeitgeist-${ZEITGEIST_VERSION}.tar.gz \ + ${_DISTDIR}/zeitgeist-${ZEITGEIST_VERSION}.tar.xz \ ${EXTRACT_AFTER_ARGS}) cd ${WRKDIR}/zeitgeist-${ZEITGEIST_VERSION} && \ - ${CP} zeitgeist/datamodel.py \ - extra/ontology/*.trig \ - extra/rdfxml2py \ - extra/PythonSerializer.py \ + ${CP} -r python/*.py \ + data/ontology \ ${WRKSRC}/scripts post-patch: @@ -47,20 +45,9 @@ post-patch: ${WRKSRC}/CMakeLists.txt \ ${WRKSRC}/src/CMakeLists.txt \ ${WRKSRC}/QZeitgeistConfig.cmake.in - ${REINPLACE_CMD} -e '/import _config/ d' \ - -e 's|_config.datadir, "zeitgeist/ontology/zeitgeist.py"|runpath, "zeitgeist.py"|' \ - ${WRKSRC}/scripts/datamodel.py ${REINPLACE_CMD} -e 's|zeitgeist.datamodel|datamodel|' \ ${WRKSRC}/scripts/onto2cpp.py ${REINPLACE_CMD} -e 's|env python|env ${PYTHON_CMD}|g' \ ${WRKSRC}/scripts/onto2cpp.py - ${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \ - ${WRKSRC}/scripts/rdfxml2py - -pre-build: - cd ${WRKSRC}/scripts && \ - ${CAT} *.trig | \ - ${LOCALBASE}/bin/rapper -i trig -o rdfxml -I ZeitgeistNamespace - | \ - ./rdfxml2py >> zeitgeist.py .include diff --git a/sysutils/qzeitgeist/distinfo b/sysutils/qzeitgeist/distinfo index c1cb12a99763..88c256b44a49 100644 --- a/sysutils/qzeitgeist/distinfo +++ b/sysutils/qzeitgeist/distinfo @@ -1,4 +1,4 @@ SHA256 (libqzeitgeist-0.8.0.tar.bz2) = 0a8aa980d64549cce93691705807681fd7e3e079a48aee68fc4b2653f17d61ad SIZE (libqzeitgeist-0.8.0.tar.bz2) = 29459 -SHA256 (zeitgeist-0.8.2.tar.gz) = 6155611ee182f642cc1fe9f8aadc25c7e2942fdef2565b1f29e8388bc4643703 -SIZE (zeitgeist-0.8.2.tar.gz) = 358781 +SHA256 (zeitgeist-0.9.16.tar.xz) = 6ed3e60d0cd82ea58ee134c19beccafac10eb0f71977f3848755dacbf0927d3a +SIZE (zeitgeist-0.9.16.tar.xz) = 807092 diff --git a/sysutils/qzeitgeist/files/patch-scripts__PythonSerializer.py b/sysutils/qzeitgeist/files/patch-scripts__PythonSerializer.py deleted file mode 100644 index ce4b5020e6c4..000000000000 --- a/sysutils/qzeitgeist/files/patch-scripts__PythonSerializer.py +++ /dev/null @@ -1,13 +0,0 @@ ---- ./scripts/PythonSerializer.py.orig 2012-04-04 17:46:44.385371264 +0200 -+++ ./scripts/PythonSerializer.py 2012-04-05 00:32:11.175489615 +0200 -@@ -85,8 +85,8 @@ - assert root_type - #TODO: displayname, how are translation handled? on trig level or on python level? - stream.write( -- "Symbol('%s', parent=%r, uri='%s', display_name='%s', doc='%s', auto_resolve=False)\n" %(name, -- root_type, symbol, display_name, doc) -+ str("Symbol('%s', parent=%r, uri='%s', display_name='%s', doc='%s', auto_resolve=False)\n" %(name, -+ root_type, symbol, display_name, doc)) - ) - - diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile index 139ff2ee07ea..cc71283805c1 100644 --- a/sysutils/zeitgeist/Makefile +++ b/sysutils/zeitgeist/Makefile @@ -1,31 +1,46 @@ # Created by: Koop Mast # $FreeBSD$ +# NOTE: please keep zeitgeist in sysutils/qzeitgeist in sync PORTNAME= zeitgeist -PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTVERSION= 0.9.16 CATEGORIES= sysutils -MASTER_SITES= http://launchpad.net/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/${PORTVERSION}/+download/ +MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/${PORTVERSION}/+download/ MAINTAINER= kwm@FreeBSD.org -COMMENT= Event logging framework - engine +COMMENT= Event logging framework -BUILD_DEPENDS= python:${PORTSDIR}/lang/python \ +LICENSE= GPLv2 LGPL21 +LICENSE_COMB= multi + +BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala \ + dee-tool:${PORTSDIR}/devel/dee \ rapper:${PORTSDIR}/textproc/raptor2 \ - ${PYTHON_SITELIBDIR}/rdflib/__init__.py:${PORTSDIR}/textproc/py-rdflib -RUN_DEPENDS= python:${PORTSDIR}/lang/python \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ - ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \ + ${PYTHON_PKGNAMEPREFIX}rdflib>=4.1.1:${PORTSDIR}/textproc/py-rdflib +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \ ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus -USE_GNOME= intlhack pygobject +USE_GNOME= intlhack glib20 introspection:build GNU_CONFIGURE= yes -USES= gmake gettext pathfix python +USES= gmake gettext pathfix python:2 pkgconfig libtool tar:xz +USE_SQLITE= 3 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +INSTALL_TARGET= install-strip + +CONFIGURE_ARGS= --disable-fts --disable-telepathy \ + --disable-downloads-monitor + +OPTIONS_SUB= yes +OPTIONS_DEFINE= DATAHUB +OPTIONS_DEFAULT=DATAHUB +DATAHUB_LIB_DEPENDS= libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib +DATAHUB_USE= gnome=gtk30 +DATAHUB_CONFIGURE_ENABLE= datahub +DATAHUB_DESC= Passive loggers for Zeitgeist post-patch: - @${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \ - ${WRKSRC}/extra/rdfxml2py + @${REINPLACE_CMD} -e 's|python -|${PYTHON_CMD} -|g' \ + ${WRKSRC}/configure .include diff --git a/sysutils/zeitgeist/distinfo b/sysutils/zeitgeist/distinfo index d1137bb3691f..21e840bcd54f 100644 --- a/sysutils/zeitgeist/distinfo +++ b/sysutils/zeitgeist/distinfo @@ -1,2 +1,2 @@ -SHA256 (zeitgeist-0.8.2.tar.gz) = 6155611ee182f642cc1fe9f8aadc25c7e2942fdef2565b1f29e8388bc4643703 -SIZE (zeitgeist-0.8.2.tar.gz) = 358781 +SHA256 (zeitgeist-0.9.16.tar.xz) = 6ed3e60d0cd82ea58ee134c19beccafac10eb0f71977f3848755dacbf0927d3a +SIZE (zeitgeist-0.9.16.tar.xz) = 807092 diff --git a/sysutils/zeitgeist/files/patch-extra__PythonSerializer.py b/sysutils/zeitgeist/files/patch-extra__PythonSerializer.py deleted file mode 100644 index d7f9ef494b48..000000000000 --- a/sysutils/zeitgeist/files/patch-extra__PythonSerializer.py +++ /dev/null @@ -1,13 +0,0 @@ ---- extra/PythonSerializer.py.orig 2011-09-21 13:57:53.000000000 -0400 -+++ extra/PythonSerializer.py 2012-04-07 05:36:04.507729012 -0400 -@@ -85,8 +85,8 @@ - assert root_type - #TODO: displayname, how are translation handled? on trig level or on python level? - stream.write( -- "Symbol('%s', parent=%r, uri='%s', display_name='%s', doc='%s', auto_resolve=False)\n" %(name, -- root_type, symbol, display_name, doc) -+ str("Symbol('%s', parent=%r, uri='%s', display_name='%s', doc='%s', auto_resolve=False)\n" %(name, -+ root_type, symbol, display_name, doc)) - ) - - diff --git a/sysutils/zeitgeist/pkg-plist b/sysutils/zeitgeist/pkg-plist index 9b7c0401b683..e27c3abe9f7e 100644 --- a/sysutils/zeitgeist/pkg-plist +++ b/sysutils/zeitgeist/pkg-plist @@ -1,10 +1,18 @@ bin/zeitgeist-daemon +%%DATAHUB%%bin/zeitgeist-datahub +%%DATAHUB%%etc/xdg/autostart/zeitgeist-datahub.desktop +include/zeitgeist-2.0/zeitgeist-datamodel.h +include/zeitgeist-2.0/zeitgeist.h +lib/girepository-1.0/Zeitgeist-2.0.typelib +lib/libzeitgeist-2.0.so +lib/libzeitgeist-2.0.so.0 +lib/libzeitgeist-2.0.so.0.0.0 %%PYTHON_SITELIBDIR%%/zeitgeist/__init__.py %%PYTHON_SITELIBDIR%%/zeitgeist/__init__.pyc %%PYTHON_SITELIBDIR%%/zeitgeist/__init__.pyo -%%PYTHON_SITELIBDIR%%/zeitgeist/_config.py -%%PYTHON_SITELIBDIR%%/zeitgeist/_config.pyc -%%PYTHON_SITELIBDIR%%/zeitgeist/_config.pyo +%%PYTHON_SITELIBDIR%%/zeitgeist/_ontology.py +%%PYTHON_SITELIBDIR%%/zeitgeist/_ontology.pyc +%%PYTHON_SITELIBDIR%%/zeitgeist/_ontology.pyo %%PYTHON_SITELIBDIR%%/zeitgeist/client.py %%PYTHON_SITELIBDIR%%/zeitgeist/client.pyc %%PYTHON_SITELIBDIR%%/zeitgeist/client.pyo @@ -14,117 +22,22 @@ bin/zeitgeist-daemon %%PYTHON_SITELIBDIR%%/zeitgeist/mimetypes.py %%PYTHON_SITELIBDIR%%/zeitgeist/mimetypes.pyc %%PYTHON_SITELIBDIR%%/zeitgeist/mimetypes.pyo -libdata/pkgconfig/zeitgeist-daemon.pc +libdata/pkgconfig/zeitgeist-2.0.pc man/man1/zeitgeist-daemon.1.gz +%%DATAHUB%%man/man1/zeitgeist-datahub.1.gz +share/bash-completion/completions/zeitgeist-daemon share/dbus-1/services/org.gnome.zeitgeist.service -share/locale/bg/LC_MESSAGES/zeitgeist.mo -share/locale/ca/LC_MESSAGES/zeitgeist.mo -share/locale/cs/LC_MESSAGES/zeitgeist.mo -share/locale/da/LC_MESSAGES/zeitgeist.mo -share/locale/de/LC_MESSAGES/zeitgeist.mo -share/locale/el/LC_MESSAGES/zeitgeist.mo -share/locale/en_AU/LC_MESSAGES/zeitgeist.mo -share/locale/en_CA/LC_MESSAGES/zeitgeist.mo -share/locale/en_GB/LC_MESSAGES/zeitgeist.mo -share/locale/eo/LC_MESSAGES/zeitgeist.mo -share/locale/es/LC_MESSAGES/zeitgeist.mo -share/locale/eu/LC_MESSAGES/zeitgeist.mo -share/locale/fi/LC_MESSAGES/zeitgeist.mo -share/locale/fr/LC_MESSAGES/zeitgeist.mo -share/locale/gl/LC_MESSAGES/zeitgeist.mo -share/locale/hu/LC_MESSAGES/zeitgeist.mo -share/locale/id/LC_MESSAGES/zeitgeist.mo -share/locale/it/LC_MESSAGES/zeitgeist.mo -share/locale/ja/LC_MESSAGES/zeitgeist.mo -share/locale/lt/LC_MESSAGES/zeitgeist.mo -share/locale/mk/LC_MESSAGES/zeitgeist.mo -share/locale/ml/LC_MESSAGES/zeitgeist.mo -share/locale/nb/LC_MESSAGES/zeitgeist.mo -share/locale/nl/LC_MESSAGES/zeitgeist.mo -share/locale/nn/LC_MESSAGES/zeitgeist.mo -share/locale/oc/LC_MESSAGES/zeitgeist.mo -share/locale/pl/LC_MESSAGES/zeitgeist.mo -share/locale/pt/LC_MESSAGES/zeitgeist.mo -share/locale/pt_BR/LC_MESSAGES/zeitgeist.mo -share/locale/ro/LC_MESSAGES/zeitgeist.mo -share/locale/ru/LC_MESSAGES/zeitgeist.mo -share/locale/sv/LC_MESSAGES/zeitgeist.mo -share/locale/te/LC_MESSAGES/zeitgeist.mo -share/locale/tr/LC_MESSAGES/zeitgeist.mo -share/locale/uk/LC_MESSAGES/zeitgeist.mo -share/locale/ur/LC_MESSAGES/zeitgeist.mo -share/locale/zh_CN/LC_MESSAGES/zeitgeist.mo -%%DATADIR%%/_zeitgeist/__init__.py -%%DATADIR%%/_zeitgeist/__init__.pyc -%%DATADIR%%/_zeitgeist/__init__.pyo -%%DATADIR%%/_zeitgeist/engine/__init__.py -%%DATADIR%%/_zeitgeist/engine/__init__.pyc -%%DATADIR%%/_zeitgeist/engine/__init__.pyo -%%DATADIR%%/_zeitgeist/engine/datamodel.py -%%DATADIR%%/_zeitgeist/engine/datamodel.pyc -%%DATADIR%%/_zeitgeist/engine/datamodel.pyo -%%DATADIR%%/_zeitgeist/engine/extension.py -%%DATADIR%%/_zeitgeist/engine/extension.pyc -%%DATADIR%%/_zeitgeist/engine/extension.pyo -%%DATADIR%%/_zeitgeist/engine/extensions/__init__.py -%%DATADIR%%/_zeitgeist/engine/extensions/__init__.pyc -%%DATADIR%%/_zeitgeist/engine/extensions/__init__.pyo -%%DATADIR%%/_zeitgeist/engine/extensions/blacklist.py -%%DATADIR%%/_zeitgeist/engine/extensions/blacklist.pyc -%%DATADIR%%/_zeitgeist/engine/extensions/blacklist.pyo -%%DATADIR%%/_zeitgeist/engine/extensions/datasource_registry.py -%%DATADIR%%/_zeitgeist/engine/extensions/datasource_registry.pyc -%%DATADIR%%/_zeitgeist/engine/extensions/datasource_registry.pyo -%%DATADIR%%/_zeitgeist/engine/extensions/storagemonitor.py -%%DATADIR%%/_zeitgeist/engine/extensions/storagemonitor.pyc -%%DATADIR%%/_zeitgeist/engine/extensions/storagemonitor.pyo -%%DATADIR%%/_zeitgeist/engine/main.py -%%DATADIR%%/_zeitgeist/engine/main.pyc -%%DATADIR%%/_zeitgeist/engine/main.pyo -%%DATADIR%%/_zeitgeist/engine/notify.py -%%DATADIR%%/_zeitgeist/engine/notify.pyc -%%DATADIR%%/_zeitgeist/engine/notify.pyo -%%DATADIR%%/_zeitgeist/engine/remote.py -%%DATADIR%%/_zeitgeist/engine/remote.pyc -%%DATADIR%%/_zeitgeist/engine/remote.pyo -%%DATADIR%%/_zeitgeist/engine/sql.py -%%DATADIR%%/_zeitgeist/engine/sql.pyc -%%DATADIR%%/_zeitgeist/engine/sql.pyo -%%DATADIR%%/_zeitgeist/engine/upgrades/__init__.py -%%DATADIR%%/_zeitgeist/engine/upgrades/__init__.pyc -%%DATADIR%%/_zeitgeist/engine/upgrades/__init__.pyo -%%DATADIR%%/_zeitgeist/engine/upgrades/core_0_1.py -%%DATADIR%%/_zeitgeist/engine/upgrades/core_0_1.pyc -%%DATADIR%%/_zeitgeist/engine/upgrades/core_0_1.pyo -%%DATADIR%%/_zeitgeist/engine/upgrades/core_1_2.py -%%DATADIR%%/_zeitgeist/engine/upgrades/core_1_2.pyc -%%DATADIR%%/_zeitgeist/engine/upgrades/core_1_2.pyo -%%DATADIR%%/_zeitgeist/engine/upgrades/core_2_3.py -%%DATADIR%%/_zeitgeist/engine/upgrades/core_2_3.pyc -%%DATADIR%%/_zeitgeist/engine/upgrades/core_2_3.pyo -%%DATADIR%%/_zeitgeist/engine/upgrades/core_3_4.py -%%DATADIR%%/_zeitgeist/engine/upgrades/core_3_4.pyc -%%DATADIR%%/_zeitgeist/engine/upgrades/core_3_4.pyo -%%DATADIR%%/_zeitgeist/lrucache.py -%%DATADIR%%/_zeitgeist/lrucache.pyc -%%DATADIR%%/_zeitgeist/lrucache.pyo -%%DATADIR%%/_zeitgeist/singleton.py -%%DATADIR%%/_zeitgeist/singleton.pyc -%%DATADIR%%/_zeitgeist/singleton.pyo -%%DATADIR%%/ontology/nao.py +share/gir-1.0/Zeitgeist-2.0.gir +share/vala/vapi/zeitgeist-2.0.deps +share/vala/vapi/zeitgeist-2.0.vapi +share/vala/vapi/zeitgeist-datamodel-2.0.vapi +%%DATADIR%%/doc/AUTHORS +%%DATADIR%%/doc/NEWS %%DATADIR%%/ontology/nao.trig -%%DATADIR%%/ontology/ncal.py %%DATADIR%%/ontology/ncal.trig -%%DATADIR%%/ontology/nco.py %%DATADIR%%/ontology/nco.trig -%%DATADIR%%/ontology/nfo.py %%DATADIR%%/ontology/nfo.trig -%%DATADIR%%/ontology/nie.py %%DATADIR%%/ontology/nie.trig -%%DATADIR%%/ontology/nmm.py %%DATADIR%%/ontology/nmm.trig -%%DATADIR%%/ontology/nmo.py %%DATADIR%%/ontology/nmo.trig -%%DATADIR%%/ontology/zeitgeist.py -%%DATADIR%%/ontology/zg.py %%DATADIR%%/ontology/zg.trig diff --git a/www/midori/Makefile b/www/midori/Makefile index 29208a189c4f..831f78ce8220 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -61,7 +61,8 @@ CMAKE_ARGS+= -DUSE_GTK3:BOOL=ON \ .endif .if ${PORT_OPTIONS:MZEITGEIST} -LIB_DEPENDS+= libzeitgeist-1.0.so:${PORTSDIR}/sysutils/libzeitgeist +BROKEN= Doesn't build with zeitgeist >= 0.9.0 +LIB_DEPENDS+= libzeitgeist-2.0.so:${PORTSDIR}/sysutils/zeitgeist CMAKE_ARGS+= -DUSE_ZEITGEIST:BOOL=ON .else CMAKE_ARGS+= -DUSE_ZEITGEIST:BOOL=OFF