Fix introspection build, otherwise most GNOME ports using geoclue2 won't

work.
This commit is contained in:
ajacoutot 2016-04-29 18:54:49 +00:00
parent 6a30fa4869
commit 7efe2af825
3 changed files with 21 additions and 9 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.27 2016/03/03 09:22:46 jasper Exp $
# $OpenBSD: Makefile,v 1.28 2016/04/29 18:54:49 ajacoutot Exp $
COMMENT= modular geoinformation service on top of D-Bus
@ -6,6 +6,7 @@ VERSION= 2.4.3
DISTNAME= geoclue-${VERSION}
PKGNAME= geoclue2-${VERSION}
CATEGORIES= geo devel
REVISION= 0
SHARED_LIBS += geoclue-2 0.0 # 0.0
@ -39,11 +40,7 @@ LIB_DEPENDS= devel/libsoup \
# /usr/local/share/dbus-1/system-services/
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
MODGNOME_TOOLS= desktop-file-utils gobject-introspection
USE_GMAKE= Yes

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-libgeoclue_Makefile_in,v 1.1 2016/04/29 18:54:49 ajacoutot Exp $
ERROR: can't resolve libraries to shared libraries: geoclue-2
--- libgeoclue/Makefile.in.orig Fri Apr 29 20:51:42 2016
+++ libgeoclue/Makefile.in Fri Apr 29 20:52:00 2016
@@ -943,7 +943,7 @@ gclue-manager.h: Makefile.am $(MANAGER_INTERFACE_XML)
@HAVE_INTROSPECTION_TRUE@ --symbol-prefix=gclue \
@HAVE_INTROSPECTION_TRUE@ --nsversion=2.0 \
@HAVE_INTROSPECTION_TRUE@ --include=Gio-2.0 \
-@HAVE_INTROSPECTION_TRUE@ --library=geoclue-2 \
+@HAVE_INTROSPECTION_TRUE@ --library=libgeoclue-2.la \
@HAVE_INTROSPECTION_TRUE@ --output $@ \
@HAVE_INTROSPECTION_TRUE@ --pkg=glib-2.0 \
@HAVE_INTROSPECTION_TRUE@ --pkg=gobject-2.0 \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2015/10/29 08:58:20 jasper Exp $
@comment $OpenBSD: PLIST,v 1.10 2016/04/29 18:54:49 ajacoutot Exp $
@newgroup _geoclue:731
@newuser _geoclue:731:_geoclue:daemon:GeoClue service user:/nonexistent:/sbin/nologin
include/libgeoclue-2.0/
@ -10,6 +10,7 @@ include/libgeoclue-2.0/gclue-location.h
include/libgeoclue-2.0/gclue-manager.h
include/libgeoclue-2.0/gclue-simple.h
include/libgeoclue-2.0/geoclue.h
lib/girepository-1.0/Geoclue-2.0.typelib
lib/libgeoclue-2.a
lib/libgeoclue-2.la
@lib lib/libgeoclue-2.so.${LIBgeoclue-2_VERSION}
@ -20,8 +21,6 @@ libexec/geoclue-2.0/
libexec/geoclue-2.0/demos/
@bin libexec/geoclue-2.0/demos/where-am-i
share/applications/geoclue-where-am-i.desktop
share/dbus-1/
share/dbus-1/interfaces/
share/dbus-1/interfaces/org.freedesktop.GeoClue2.Agent.xml
share/dbus-1/interfaces/org.freedesktop.GeoClue2.Client.xml
share/dbus-1/interfaces/org.freedesktop.GeoClue2.Location.xml
@ -40,5 +39,6 @@ share/examples/geoclue/geoclue/
@sample ${SYSCONFDIR}/geoclue/
share/examples/geoclue/geoclue/geoclue.conf
@sample ${SYSCONFDIR}/geoclue/geoclue.conf
share/gir-1.0/Geoclue-2.0.gir
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database