From 332b07afca5b120ee8a5ce41274f84ea006eacd4 Mon Sep 17 00:00:00 2001 From: jasper Date: Wed, 7 Sep 2016 06:40:02 +0000 Subject: [PATCH] - update to geoclue-2.4.4 - drop gettext module - remove our local patch yet again, this time because upstream applied it too. neither antoine nor myself could remember why it was added, but it seems upstream did figure it out in the end.. --- geo/geoclue2/Makefile | 12 +++++------- geo/geoclue2/distinfo | 4 ++-- geo/geoclue2/patches/patch-libgeoclue_Makefile_in | 15 --------------- 3 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 geo/geoclue2/patches/patch-libgeoclue_Makefile_in diff --git a/geo/geoclue2/Makefile b/geo/geoclue2/Makefile index 8c1011f898b..901bd34635f 100644 --- a/geo/geoclue2/Makefile +++ b/geo/geoclue2/Makefile @@ -1,14 +1,13 @@ -# $OpenBSD: Makefile,v 1.30 2016/08/31 15:00:03 sthen Exp $ +# $OpenBSD: Makefile,v 1.31 2016/09/07 06:40:02 jasper Exp $ COMMENT= modular geoinformation service on top of D-Bus -VERSION= 2.4.3 +VERSION= 2.4.4 DISTNAME= geoclue-${VERSION} PKGNAME= geoclue2-${VERSION} CATEGORIES= geo devel -REVISION= 2 -SHARED_LIBS += geoclue-2 0.0 # 0.0 +SHARED_LIBS += geoclue-2 0.1 # 0.0 HOMEPAGE= http://geoclue.freedesktop.org/ @@ -22,11 +21,10 @@ MASTER_SITES= http://freedesktop.org/software/geoclue/releases/${VERSION:R}/ EXTRACT_SUFX= .tar.xz WANTLIB += c ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 json-glib-1.0 -WANTLIB += lzma m pcre pthread soup-2.4 sqlite3 xml2 z +WANTLIB += lzma m pcre pthread soup-2.4 sqlite3 xml2 z iconv intl WANTLIB += avahi-client avahi-common avahi-glib dbus-1 -MODULES= devel/gettext \ - textproc/intltool \ +MODULES= textproc/intltool \ x11/gnome LIB_DEPENDS= devel/libsoup \ diff --git a/geo/geoclue2/distinfo b/geo/geoclue2/distinfo index 5bb4070a5e2..79ff3a90773 100644 --- a/geo/geoclue2/distinfo +++ b/geo/geoclue2/distinfo @@ -1,2 +1,2 @@ -SHA256 (geoclue-2.4.3.tar.xz) = ranbqHDdeeGyGSOu2k2Ctmy9o55Xl4++PYPTVsw8YF4= -SIZE (geoclue-2.4.3.tar.xz) = 389260 +SHA256 (geoclue-2.4.4.tar.xz) = nEP7nQwSBn6mRABQCrsGQBlJR9TCxV44VFr+XZxcMVw= +SIZE (geoclue-2.4.4.tar.xz) = 392340 diff --git a/geo/geoclue2/patches/patch-libgeoclue_Makefile_in b/geo/geoclue2/patches/patch-libgeoclue_Makefile_in deleted file mode 100644 index bfc9f4ab9e3..00000000000 --- a/geo/geoclue2/patches/patch-libgeoclue_Makefile_in +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-libgeoclue_Makefile_in,v 1.3 2016/08/31 15:00:03 sthen 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 \