cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major update to zeitgeist-0.9.14.

Browse Source 
Based on jasper@'s work which got reverted several months ago.

ok jasper@ (maintainer)
This commit is contained in:
ajacoutot 2013-09-12 06:49:53 +00:00
parent 918e77edda
commit 714bb59dad
7 changed files with 117 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
productivity/zeitgeist/Makefile
View File

@ -1,11 +1,12 @@
# $OpenBSD: Makefile,v 1.13 2013/09/10 13:26:51 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.14 2013/09/12 06:49:53 ajacoutot Exp $
COMMENT = event logging framework
V = 0.9.5
V = 0.9.14
DISTNAME = zeitgeist-${V}
EPOCH = 0
REVISION = 0
SHARED_LIBS += zeitgeist-2.0 0.0 # 0.0
CATEGORIES = productivity
@ -13,38 +14,42 @@ HOMEPAGE = http://zeitgeist-project.com/
MAINTAINER = Jasper Lievisse Adriaanse <jasper@openbsd.org>
# LGPLv2.1
# GPLv2 - LGPLv2.1
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
WANTLIB += c cairo cairo-gobject dbus-1 dbus-glib-1 expat ffi
WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
WANTLIB += harfbuzz json-glib-1.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs sqlite3 telepathy-glib
WANTLIB += xcb xcb-render xcb-shm z
MASTER_SITES = http://edge.launchpad.net/zeitgeist/${V:R}/${V}/+download/
EXTRACT_SUFX = .tar.bz2
EXTRACT_SUFX = .tar.xz
MODULES = devel/gettext \
lang/python \
x11/gnome
BUILD_DEPENDS = lang/vala \
textproc/p5-XML-Parser \
textproc/py-rdflib \
textproc/raptor \
x11/dbus
MODGNOME_TOOLS = gi vala
RUN_DEPENDS = devel/py-gobject \
devel/py-xdg \
x11/dbus-python
BUILD_DEPENDS = textproc/py-rdflib \
textproc/raptor
WANTLIB += c ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += pcre pthread sqlite3 z
RUN_DEPENDS = x11/dbus-python
LIB_DEPENDS = devel/glib2
TEST_DEPENDS = devel/py-gobject3
FAKE_FLAGS += zeitgeistdocdir="${PREFIX}/share/doc/zeitgeist/"
LIB_DEPENDS = devel/json-glib \
net/telepathy/telepathy-glib \
x11/gtk+3
MAKE_FLAGS= LIBZEITGEIST_LT_VERSION=${LIBzeitgeist-2.0_VERSION:R}:${LIBzeitgeist-2.0_VERSION:E}
FAKE_FLAGS= zeitgeistdocdir="${PREFIX}/share/doc/zeitgeist/" \
sysconfdir="${PREFIX}/share/examples/zeitgeist/"
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += ${CONFIGURE_SHARED}
# XXX: FTS++ fails to build in controller.cpp; needs fixing.
CONFIGURE_ARGS += --disable-fts
# XXX: Requires dee-icu which has not been ported yet
CONFIGURE_ARGS += --without-dee-icu
.include <bsd.port.mk>

4
productivity/zeitgeist/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (zeitgeist-0.9.5.tar.bz2) = 5cy3X/cFv7OCdQxSDCllO24PQK6s0wrfIzFiEyEUvlU=
SIZE (zeitgeist-0.9.5.tar.bz2) = 856757
SHA256 (zeitgeist-0.9.14.tar.xz) = dptav+Z+9jJBTvodNaFGLFzYbIeSu0Y1tMPZOl8V8GE=
SIZE (zeitgeist-0.9.14.tar.xz) = 780324

17
productivity/zeitgeist/patches/patch-configure
View File

@ -1,16 +1,7 @@
$OpenBSD: patch-configure,v 1.6 2013/03/28 21:37:34 jasper Exp $
--- configure.orig Mon Aug 27 04:03:58 2012
+++ configure Tue Jan 29 16:35:33 2013
@@ -17493,7 +17493,7 @@ fi
LIBZEITGEIST_VERSION_MAJOR="2"
LIBZEITGEIST_VERSION_MINOR="0"
LIBZEITGEIST_VERSION_PATCH="0"
-LIBZEITGEIST_VERSION="$(LIBZEITGEIST_VERSION_MAJOR).$(LIBZEITGEIST_VERSION_MINOR).$(LIBZEITGEIST_VERSION_PATCH)"
+LIBZEITGEIST_VERSION="${LIBZEITGEIST_VERSION_MAJOR}.${LIBZEITGEIST_VERSION_MINOR}.${LIBZEITGEIST_VERSION_PATCH}"
@@ -17549,7 +17549,7 @@ fi
$OpenBSD: patch-configure,v 1.7 2013/09/12 06:49:53 ajacoutot Exp $
--- configure.orig Tue Jun 18 04:43:42 2013
+++ configure Tue Sep 10 15:51:09 2013
@@ -18205,7 +18205,7 @@ fi
# check for python-rdflib
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python-rdflib" >&5
$as_echo_n "checking for python-rdflib... " >&6; }

21
productivity/zeitgeist/patches/patch-libzeitgeist_Makefile_in Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-libzeitgeist_Makefile_in,v 1.3 2013/09/12 06:49:54 ajacoutot Exp $
--- libzeitgeist/Makefile.in.orig Tue Jun 18 04:43:44 2013
+++ libzeitgeist/Makefile.in Tue Sep 10 15:51:09 2013
@@ -406,7 +406,7 @@ AM_CPPFLAGS = \
$(NULL)
AM_VALAFLAGS = --target-glib=2.26 --pkg gio-2.0 --pkg gio-unix-2.0 \
- --pkg sqlite3 $(top_srcdir)/config.vapi -C $(NULL) \
+ --pkg sqlite3 --pkg linux $(top_srcdir)/config.vapi -C $(NULL) \
$(am__append_1)
libzeitgeist_internal_la_VALAFLAGS = \
$(builddir)/zeitgeist-datamodel-2.0.vapi \
@@ -518,7 +518,7 @@ MAINTAINERCLEANFILES =
# 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) -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libzeitgeist-2.0.la`
@HAVE_INTROSPECTION_TRUE@libzeitgeist_2_0_gir_VALASOURCES = \
@HAVE_INTROSPECTION_TRUE@ $(libzeitgeist_2_0_la_VALASOURCES) \

37
productivity/zeitgeist/patches/patch-libzeitgeist_log_vala Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-libzeitgeist_log_vala,v 1.3 2013/09/12 06:49:54 ajacoutot Exp $
get_nprocs_conf() is a glibc-extension equivalent to sysconf(_SC_NPROCESSORS_CONF).
https://bugs.launchpad.net/libzeitgeist/+bug/1161565
--- libzeitgeist/log.vala.orig Tue Mar 19 07:01:48 2013
+++ libzeitgeist/log.vala Thu Mar 28 20:03:52 2013
@@ -40,6 +40,10 @@
* Zeitgeist also comes with a blacklist extension to make sure the user
* always stays in control of what information is logged.
*/
+
+using Posix;
+using Linux;
+
namespace Zeitgeist
{
@@ -58,9 +62,6 @@ namespace Zeitgeist
*/
public class Log : QueuedProxyWrapper
{
- [CCode (cheader_filename = "sys/sysinfo.h", cname = "get_nprocs_conf")]
- extern static int get_nprocs_conf ();
-
class DbWorker
{
private unowned ThreadFunc<void*> func;
@@ -141,7 +142,7 @@ public class Log : QueuedProxyWrapper
try {
threads = new ThreadPool<DbWorker>.with_owned_data ((worker) => {
worker.run ();
- }, get_nprocs_conf (), true);
+ }, (int) Posix.sysconf(Linux._SC_NPROCESSORS_CONF), true);
} catch (ThreadError err) {
warning ("%s", err.message);
threads = null;

4
productivity/zeitgeist/pkg/DESCR
View File

@ -1,5 +1,3 @@
Zeitgeist is a service which logs the users's activities and events
(files opened, websites visites, conversations held with other people,
etc.) and makes relevant information available to other applications. It
is able to establish relationships between items based on similarity and
usage patterns.
etc.) and makes relevant information available to other applications.

26
productivity/zeitgeist/pkg/PLIST
View File

@ -1,5 +1,16 @@
@comment $OpenBSD: PLIST,v 1.5 2013/03/28 21:37:34 jasper Exp $
@comment $OpenBSD: PLIST,v 1.6 2013/09/12 06:49:54 ajacoutot Exp $
@conflict libzeitgeist-*
@pkgpath productivity/libzeitgeist
@bin bin/zeitgeist-daemon
@bin bin/zeitgeist-datahub
include/zeitgeist-2.0/
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.a
lib/libzeitgeist-2.0.la
@lib lib/libzeitgeist-2.0.so.${LIBzeitgeist-2.0_VERSION}
lib/pkgconfig/zeitgeist-2.0.pc
lib/python${MODPY_VERSION}/site-packages/zeitgeist/
lib/python${MODPY_VERSION}/site-packages/zeitgeist/__init__.py
lib/python${MODPY_VERSION}/site-packages/zeitgeist/__init__.pyc
@ -17,10 +28,23 @@ lib/python${MODPY_VERSION}/site-packages/zeitgeist/mimetypes.py
lib/python${MODPY_VERSION}/site-packages/zeitgeist/mimetypes.pyc
lib/python${MODPY_VERSION}/site-packages/zeitgeist/mimetypes.pyo
@man man/man1/zeitgeist-daemon.1
@man man/man1/zeitgeist-datahub.1
share/bash-completion/completions/zeitgeist-daemon
share/dbus-1/services/org.gnome.zeitgeist.service
share/doc/zeitgeist/
share/doc/zeitgeist/AUTHORS
share/doc/zeitgeist/NEWS
share/examples/zeitgeist/
share/examples/zeitgeist/xdg/
@sample ${SYSCONFDIR}/xdg/
share/examples/zeitgeist/xdg/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/zeitgeist/xdg/autostart/zeitgeist-datahub.desktop
@sample ${SYSCONFDIR}/xdg/autostart/zeitgeist-datahub.desktop
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
share/zeitgeist/
share/zeitgeist/ontology/
share/zeitgeist/ontology/nao.trig