Update geoclue to 0.12.0, which makes it compatible with updated gpsd

OK landry@, jasper@
This commit is contained in:
sebastia 2010-11-25 08:56:57 +00:00
parent feaea6c2be
commit 07b6f62d8e
4 changed files with 37 additions and 38 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2010/11/17 08:05:12 espie Exp $
# $OpenBSD: Makefile,v 1.7 2010/11/25 08:56:57 sebastia Exp $
COMMENT= modular geoinformation service on top of D-Bus
DISTNAME= geoclue-0.11.1
REVISION= 2
SHARED_LIBS += geoclue 0.0 # .0.0
DISTNAME= geoclue-0.12.0
SHARED_LIBS += geoclue 1.0 # .0.0
CATEGORIES= geo devel
HOMEPAGE= http://geoclue.freedesktop.org/
@ -19,16 +18,13 @@ MASTER_SITES= http://folks.o-hand.com/jku/geoclue-releases/
MODULES= devel/gettext
WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1
WANTLIB += dbus-glib-1 expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += dbus-glib-1 tasn1 ORBit-2 c dbus-1 m soup-gnome-2.4
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xml2 z
WANTLIB += pcre pthread xml2 z gconf-2 gcrypt gnome-keyring gnutls
WANTLIB += gps>=19 sqlite3 soup-2.4 proxy gpg-error
LIB_DEPENDS = devel/gconf2 \
LIB_DEPENDS = devel/libsoup,-gnome \
misc/gpsd
WANTLIB += gconf-2 gps
USE_GMAKE= Yes
USE_LIBTOOL= Yes

View File

@ -1,5 +1,5 @@
MD5 (geoclue-0.11.1.tar.gz) = tsquo/3uv16Ylru8KjBv/Q==
RMD160 (geoclue-0.11.1.tar.gz) = dyf4yiJ4JEUSBo442u8GU6kmtuU=
SHA1 (geoclue-0.11.1.tar.gz) = FqIITipHy9RXCyyzH8E8lcJlzsE=
SHA256 (geoclue-0.11.1.tar.gz) = nDs4qo3lEGNlH5O00bpmJmYFci7KpDbTZ5F4nK6XAgU=
SIZE (geoclue-0.11.1.tar.gz) = 557743
MD5 (geoclue-0.12.0.tar.gz) = M6+DB/My4AZa8FbsumX+wg==
RMD160 (geoclue-0.12.0.tar.gz) = 8BmMW2R432mbccWF0n1sidV/SWo=
SHA1 (geoclue-0.12.0.tar.gz) = DH0zIqyA5QMrjdWCatdlF/NMkv0=
SHA256 (geoclue-0.12.0.tar.gz) = D1M/F3rpqjXoB6AcdUhA9m35V59VJFUvFPK1umcKRpY=
SIZE (geoclue-0.12.0.tar.gz) = 567552

View File

@ -1,21 +1,15 @@
$OpenBSD: patch-configure,v 1.1 2009/03/04 20:10:30 jasper Exp $
--- configure.orig Mon Mar 2 18:26:14 2009
+++ configure Mon Mar 2 18:26:17 2009
@@ -21263,7 +21263,7 @@ if test "${ac_cv_lib_gps_gps_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgps $LIBS"
+LIBS="-lgps -pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21324,7 +21324,7 @@ fi
$OpenBSD: patch-configure,v 1.2 2010/11/25 08:56:58 sebastia Exp $
Link against -pthread
--- configure.orig Thu Mar 25 22:41:36 2010
+++ configure Tue Nov 2 12:53:54 2010
@@ -11987,7 +11987,7 @@ fi
if test "x$libgps" = xyes; then
PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd"
- GPSD_LIBS="-lgps"
+ GPSD_LIBS="-lgps -pthread"
else
NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd"
fi
if test "x$have_skyhook" = "xyes"; then
PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS skyhook"
- GPSD_LIBS="-lgps"
+ GPSD_LIBS="-lgps -pthread"
else
NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS skyhook"
fi

View File

@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/02/15 16:35:05 jasper Exp $
@comment $OpenBSD: PLIST,v 1.2 2010/11/25 08:56:58 sebastia Exp $
%%SHARED%%
@bin bin/geoclue-test-gui
include/geoclue/
include/geoclue/gc-iface-address.h
include/geoclue/gc-iface-geoclue.h
@ -13,6 +12,7 @@ include/geoclue/gc-web-service.h
include/geoclue/geoclue-accuracy.h
include/geoclue/geoclue-address-details.h
include/geoclue/geoclue-address.h
include/geoclue/geoclue-enum-types.h
include/geoclue/geoclue-error.h
include/geoclue/geoclue-geocode.h
include/geoclue/geoclue-master-client.h
@ -29,11 +29,14 @@ lib/pkgconfig/geoclue.pc
@bin libexec/geoclue-example
@bin libexec/geoclue-geonames
@bin libexec/geoclue-gpsd
@bin libexec/geoclue-gsmloc
@bin libexec/geoclue-hostip
@bin libexec/geoclue-localnet
@bin libexec/geoclue-manual
@bin libexec/geoclue-master
@bin libexec/geoclue-nominatim
@bin libexec/geoclue-plazes
@bin libexec/geoclue-skyhook
@bin libexec/geoclue-yahoo
share/dbus-1/
share/dbus-1/services/
@ -41,19 +44,25 @@ share/dbus-1/services/org.freedesktop.Geoclue.Master.service
share/dbus-1/services/org.freedesktop.Geoclue.Providers.Example.service
share/dbus-1/services/org.freedesktop.Geoclue.Providers.Geonames.service
share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service
share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service
share/dbus-1/services/org.freedesktop.Geoclue.Providers.Hostip.service
share/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service
share/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service
share/dbus-1/services/org.freedesktop.Geoclue.Providers.Nominatim.service
share/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service
share/dbus-1/services/org.freedesktop.Geoclue.Providers.Skyhook.service
share/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service
share/geoclue-providers/
share/geoclue-providers/geoclue-example.provider
share/geoclue-providers/geoclue-geonames.provider
share/geoclue-providers/geoclue-gpsd.provider
share/geoclue-providers/geoclue-gsmloc.provider
share/geoclue-providers/geoclue-hostip.provider
share/geoclue-providers/geoclue-localnet.provider
share/geoclue-providers/geoclue-manual.provider
share/geoclue-providers/geoclue-nominatim.provider
share/geoclue-providers/geoclue-plazes.provider
share/geoclue-providers/geoclue-skyhook.provider
share/geoclue-providers/geoclue-yahoo.provider
share/gtk-doc/
share/gtk-doc/html/