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

This suddently needs gtail (from coreutils) to build now... I don't have the

Browse Source 
time to look at why right now, so just depend on coreutils for the time being.
While here, merge a patch from upstream to prevent spamming logs and add a
comment about gobject-introspection.
This commit is contained in:
ajacoutot 2015-11-20 15:44:03 +00:00
parent 5afd92cd6c
commit d0816dea8a
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
geo/geoclue2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2015/10/29 08:58:20 jasper Exp $
# $OpenBSD: Makefile,v 1.23 2015/11/20 15:44:03 ajacoutot Exp $
COMMENT= modular geoinformation service on top of D-Bus
@ -6,6 +6,7 @@ VERSION= 2.4.0
DISTNAME= geoclue-${VERSION}
PKGNAME= geoclue2-${VERSION}
CATEGORIES= geo devel
REVISION= 0
SHARED_LIBS += geoclue-2 0.0 # 0.0
@ -28,6 +29,9 @@ MODULES= devel/gettext \
textproc/intltool \
x11/gnome
# XXX NEEDS FIXING see patches/patch-src_Makefile_in
BUILD_DEPENDS += sysutils/coreutils
LIB_DEPENDS= devel/libsoup \
devel/json-glib \
net/avahi
@ -41,6 +45,10 @@ RUN_DEPENDS += x11/dbus,-suid
MODGNOME_TOOLS += desktop-file-utils
# XXX
# ERROR: can't resolve libraries to shared libraries: geoclue-2
#MODGNOME_TOOLS += gobject-introspection
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu

18
geo/geoclue2/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2015/11/20 15:44:03 ajacoutot Exp $
--- src/Makefile.in.orig Fri Nov 20 16:39:57 2015
+++ src/Makefile.in Fri Nov 20 16:40:06 2015
@@ -1112,11 +1112,11 @@ check-local: test
# At least gnome-settings-daemon currently relies on that.
install-data-hook:
{ (echo "<node>") && \
- (tail -n +10 $(DESTDIR)$(interfacedir)/$(MANAGER_INTERFACE_XML) | \
+ (gtail -n +10 $(DESTDIR)$(interfacedir)/$(MANAGER_INTERFACE_XML) | \
grep -v node) && \
- (tail -n +10 $(DESTDIR)$(interfacedir)/$(CLIENT_INTERFACE_XML) | \
+ (gtail -n +10 $(DESTDIR)$(interfacedir)/$(CLIENT_INTERFACE_XML) | \
grep -v node) && \
- (tail -n +10 $(DESTDIR)$(interfacedir)/$(LOCATION_INTERFACE_XML) | \
+ (gtail -n +10 $(DESTDIR)$(interfacedir)/$(LOCATION_INTERFACE_XML) | \
grep -v node) && \
(echo "</node>") } \
> $(DESTDIR)$(interfacedir)/org.freedesktop.GeoClue2.xml

18
geo/geoclue2/patches/patch-src_gclue-client-info_c Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_gclue-client-info_c,v 1.1 2015/11/20 15:44:03 ajacoutot Exp $
From 45593fe88e9aabcd26fc610dc3963326ed662936 Mon Sep 17 00:00:00 2001
From: Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
Date: Tue, 17 Nov 2015 18:23:47 +0900
Subject: client-info: Don't load props of /org/freedesktop/DBus
--- src/gclue-client-info.c.orig Mon Sep 7 14:17:11 2015
+++ src/gclue-client-info.c Fri Nov 20 16:34:10 2015
@@ -256,7 +256,7 @@ gclue_client_info_init_async (GAsyncInitable *init
task = g_task_new (initable, cancellable, callback, user_data);
g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
- G_DBUS_PROXY_FLAGS_NONE,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
NULL,
"org.freedesktop.DBus",
"/org/freedesktop/DBus",