diff options
Diffstat (limited to 'gnome-extra')
5 files changed, 0 insertions, 348 deletions
diff --git a/gnome-extra/geoclue/Manifest b/gnome-extra/geoclue/Manifest deleted file mode 100644 index d98349e..0000000 --- a/gnome-extra/geoclue/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX 0001-Remove-automagic-deps-and-add-switches-to-enable-dis.patch 7048 RMD160 cba53196a9ae95430e2dee9511259f98308132a2 SHA1 8d432e6cdf9e1b409a7307c5829d738b1183b5fd SHA256 1220b53b93972c6f317b6258272ce53a4718cf0070f5a012bc85f3d1d66ee11a -AUX 0002-Fix-NM-pkgcheck.patch 727 RMD160 837959313c457eebfff5262124b01fdcd1943112 SHA1 50bf343fbb0d8bccec77b50c947cb50d8cbb3551 SHA256 17b04dd9a1bc6c3ce9e404b104bc7bf10c3c0a9b920afff5a8880950fc5c45cd -AUX geoclue-hostip-api.diff 1737 RMD160 b808627eabb7b358fb56adf07a495180b397234c SHA1 27b0ee9922fcf4e0abe88a573553999e1d10385c SHA256 8b32518b605e6bf143974944152f6dc16eeeef593ccf2161281b6be84011a7cf -DIST geoclue-0.11.1.tar.gz 557743 RMD160 7727f8ca2278244512068e38daef0653a926b6e5 SHA1 16a2084e2a47cbd4570b2cb31fc13c95c265cec1 SHA256 9c3b38aa8de51063651f93b4d1ba66266605722ecaa436d36791789cae970205 -EBUILD geoclue-0.11.1.ebuild 1426 RMD160 d9af38fbb1a3420858768839f16d6cd0156f9ade SHA1 718e6384984b3359814dd5d496bd33d56ef0facf SHA256 1605c405c828fea00a8f4f91dc1821b529e93e5526baf0e36778b25f495e9180 diff --git a/gnome-extra/geoclue/files/0001-Remove-automagic-deps-and-add-switches-to-enable-dis.patch b/gnome-extra/geoclue/files/0001-Remove-automagic-deps-and-add-switches-to-enable-dis.patch deleted file mode 100644 index 9007911..0000000 --- a/gnome-extra/geoclue/files/0001-Remove-automagic-deps-and-add-switches-to-enable-dis.patch +++ /dev/null @@ -1,227 +0,0 @@ -From 5be732fcd92de66614f434ebeb1bd8ec5905544d Mon Sep 17 00:00:00 2001 -From: Mikel Olasagasti Uranga <mikel@olasagasti.info> -Date: Mon, 22 Jun 2009 17:24:22 +0200 -Subject: [PATCH] Remove automagic deps and add switches to enable/disable them - ---- - configure.ac | 176 +++++++++++++++++++++++++++++++++++++++++++++------------ - 1 files changed, 139 insertions(+), 37 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3109048..8e5e67c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,35 +55,90 @@ AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir - - CFLAGS="$CFLAGS -g -Wall -Werror -Wno-format" - -+# ----------------------------------------------------------- -+# gtk+ -+# ----------------------------------------------------------- -+AC_ARG_ENABLE(gtk, -+ AS_HELP_STRING([--enable-gtk=@<:@no/yes/auto@:>@], -+ [build with gtk support]), , -+ enable_gtk=auto) - -+if test "x$enable_gtk" != "xno"; then -+ PKG_CHECK_MODULES(GTK, -+ [ -+ gtk+-2.0 -+ ], have_gtk="yes", have_gtk="no") - --PKG_CHECK_MODULES(GTK, [ -- gtk+-2.0 --], HAVE_GTK=yes, HAVE_GTK=no) --AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes") -+ if test "x$have_gtk" = "xyes"; then -+ AC_DEFINE(HAVE_GTK, 1, [Define if you have gtk+]) -+ fi -+else -+ have_gtk=no -+fi -+ -+if test "x$enable_gtk" = "xyes" -a "x$have_gtk" != "xyes"; then -+ AC_MSG_ERROR([Couldn't find gtk dependencies.]) -+fi -+ -+AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes") - AC_SUBST(GTK_LIBS) - AC_SUBST(GTK_CFLAGS) - -+# ----------------------------------------------------------- -+# connectivity -+# ----------------------------------------------------------- -+ - CONNECTIVITY="None" - --PKG_CHECK_MODULES(CONIC, [ -- conic --], HAVE_CONIC=yes, HAVE_CONIC=no) --if test "x$HAVE_CONIC" = "xyes"; then -- CONNECTIVITY="Maemo LibConIC" -- CONNECTIVITY_LIBS=${CONIC_LIBS} -- CONNECTIVITY_CFLAGS=${CONIC_CFLAGS} -- AC_DEFINE(HAVE_CONIC, 1, [define if libconic is installed]) -+AC_ARG_ENABLE(conic, -+ AS_HELP_STRING([--enable-conic=@<:@no/yes/auto@:>@], -+ [build with conic support]), , -+ enable_conic=auto) -+ -+if test "x$enable_conic" != "xno"; then -+ PKG_CHECK_MODULES(CONIC, -+ [ -+ conic -+ ], have_conic="yes", have_conic="no") -+ -+ if test "x$have_conic" = "xyes"; then -+ CONNECTIVITY="Maemo LibConIC" -+ CONNECTIVITY_LIBS=${CONIC_LIBS} -+ CONNECTIVITY_CFLAGS=${CONIC_CFLAGS} -+ AC_DEFINE(HAVE_CONIC, 1, [define if libconic is installed]) -+ fi -+else -+ have_conic=no -+fi -+ -+if test "x$enable_conic" = "xyes" -a "x$have_conic" != "xyes"; then -+ AC_MSG_ERROR([Couldn't find conic dependencies.]) - fi - --PKG_CHECK_MODULES(NETWORK_MANAGER, [ -- NetworkManager --], HAVE_NETWORK_MANAGER=yes, HAVE_NETWORK_MANAGER=no) --if test "x$HAVE_NETWORK_MANAGER" = "xyes"; then -- CONNECTIVITY="Network Manager" -- CONNECTIVITY_LIBS=${NETWORK_MANAGER_LIBS} -- CONNECTIVITY_CFLAGS=${NETWORK_MANAGER_CFLAGS} -- AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [define if Network Manager is installed]) -+ -+AC_ARG_ENABLE(networkmanager, -+ AS_HELP_STRING([--enable-networkmanager=@<:@no/yes/auto@:>@], -+ [build with NetworkManager support]), , -+ enable_networkmanager=auto) -+ -+if test "x$enable_networkmanager" != "xno"; then -+ PKG_CHECK_MODULES(NETWORKMANAGER, -+ [ -+ NetworkManager -+ ], have_networkmanager="yes", have_networkmanager="no") -+ -+ if test "x$have_networkmanager" = "xyes"; then -+ CONNECTIVITY="Network Manager" -+ CONNECTIVITY_LIBS=${NETWORK_MANAGER_LIBS} -+ CONNECTIVITY_CFLAGS=${NETWORK_MANAGER_CFLAGS} -+ AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [define if Network Manager is installed]) -+ fi -+else -+ have_networkmanager=no -+fi -+ -+if test "x$enable_networkmanager" = "xyes" -a "x$have_networkmanager" != "xyes"; then -+ AC_MSG_ERROR([Couldn't find Network Manager dependencies.]) - fi - - AC_SUBST(CONNECTIVITY_LIBS) -@@ -92,35 +147,82 @@ AC_SUBST(CONNECTIVITY_CFLAGS) - - PROVIDER_SUBDIRS="example hostip geonames manual plazes localnet yahoo" - --PKG_CHECK_MODULES(GSMLOC, [ -- gammu >= 1.12 --], HAVE_GSMLOC=yes, HAVE_GSMLOC=no) --if test "x$HAVE_GSMLOC" = "xyes"; then -- PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gsmloc" -+# ----------------------------------------------------------- -+# gsmloc / gypsy / gpsd -+# ----------------------------------------------------------- -+ -+AC_ARG_ENABLE(gsmloc, -+ AS_HELP_STRING([--enable-gsmloc=@<:@no/yes/auto@:>@], -+ [build with gsmloc support]), , -+ enable_gsmloc=auto) -+ -+if test "x$enable_gsmloc" != "xno"; then -+ PKG_CHECK_MODULES(GSMLOC, -+ [ -+ gammu >= 1.12 -+ ], have_gsmloc="yes", have_gsmloc="no") -+ -+ if test "x$have_gsmloc" = "xyes"; then -+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gsmloc" -+ else -+ NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gsmloc" -+ fi - else -- NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gsmloc" -+ have_gsmloc=no -+fi -+ -+if test "x$enable_gsmloc" = "xyes" -a "x$have_gsmloc" != "xyes"; then -+ AC_MSG_ERROR([Couldn't find gsmloc dependencies.]) - fi - AC_SUBST(GSMLOC_LIBS) - AC_SUBST(GSMLOC_CFLAGS) - - --PKG_CHECK_MODULES(GYPSY, [ -- gypsy --], HAVE_GYPSY=yes,HAVE_GYPSY=no) --if test "x$HAVE_GYPSY" = "xyes"; then -- PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gypsy" -+AC_ARG_ENABLE(gypsy, -+ AS_HELP_STRING([--enable-gypsy=@<:@no/yes/auto@:>@], -+ [build with gypsy support]), , -+ enable_gypsy=auto) -+ -+if test "x$enable_gypsy" != "xno"; then -+ PKG_CHECK_MODULES(GYPSY, -+ [ -+ gypsy -+ ], have_gypsy="yes", have_gypsy="no") -+ -+ if test "x$have_gypsy" = "xyes"; then -+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gypsy" -+ else -+ NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gypsy" -+ fi - else -- NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gypsy" -+ have_gypsy=no -+fi -+ -+if test "x$enable_gypsy" = "xyes" -a "x$have_gypsy" != "xyes"; then -+ AC_MSG_ERROR([Couldn't find gypsy dependencies.]) - fi - AC_SUBST(GYPSY_LIBS) - AC_SUBST(GYPSY_CFLAGS) - --AC_CHECK_LIB(gps, gps_open,[libgps=yes] ) --if test "x$libgps" = xyes; then -- PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd" -- GPSD_LIBS="-lgps" -+AC_ARG_ENABLE(gpsd, -+ AS_HELP_STRING([--enable-gpsd=@<:@no/yes/auto@:>@], -+ [build with gpsd support]), , -+ enable_gpsd=auto) -+ -+if test "x$enable_gpsd" != "xno"; then -+ AC_CHECK_LIB(gps, gps_open,[libgps=yes] ) -+ if test "x$have_gpsd" = "xyes"; then -+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd" -+ GPSD_LIBS="-lgps" -+ else -+ NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd" -+ fi - else -- NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd" -+ have_gpsd=no -+fi -+ -+if test "x$enable_gpsd" = "xyes" -a "x$have_gpsd" != "xyes"; then -+ AC_MSG_ERROR([Couldn't find gpsd dependencies.]) - fi - AC_SUBST(GPSD_LIBS) - AC_SUBST(GPSD_CFLAGS) --- -1.6.3.1 - diff --git a/gnome-extra/geoclue/files/0002-Fix-NM-pkgcheck.patch b/gnome-extra/geoclue/files/0002-Fix-NM-pkgcheck.patch deleted file mode 100644 index bd03196..0000000 --- a/gnome-extra/geoclue/files/0002-Fix-NM-pkgcheck.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a8b2cf000d91a8ede9f22b1bfd3bbf7845f5e933 Mon Sep 17 00:00:00 2001 -From: Mikel Olasagasti Uranga <mikel@olasagasti.info> -Date: Mon, 22 Jun 2009 19:14:09 +0200 -Subject: [PATCH 2/2] Fix NM pkgcheck - ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8e5e67c..94847f0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -122,7 +122,7 @@ AC_ARG_ENABLE(networkmanager, - enable_networkmanager=auto) - - if test "x$enable_networkmanager" != "xno"; then -- PKG_CHECK_MODULES(NETWORKMANAGER, -+ PKG_CHECK_MODULES(NETWORK_MANAGER, - [ - NetworkManager - ], have_networkmanager="yes", have_networkmanager="no") --- -1.6.3.1 - diff --git a/gnome-extra/geoclue/files/geoclue-hostip-api.diff b/gnome-extra/geoclue/files/geoclue-hostip-api.diff deleted file mode 100644 index 0dc7511..0000000 --- a/gnome-extra/geoclue/files/geoclue-hostip-api.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- a/providers/hostip/geoclue-hostip.c -+++ b/providers/hostip/geoclue-hostip.c -@@ -42,13 +42,11 @@ - - #define HOSTIP_NS_GML_NAME "gml" - #define HOSTIP_NS_GML_URI "http://www.opengis.net/gml" --#define HOSTIP_NS_HOSTIP_NAME "hostip" --#define HOSTIP_NS_HOSTIP_URI "http://www.hostip.info/api" - --#define HOSTIP_COUNTRY_XPATH "//gml:featureMember/hostip:Hostip/hostip:countryName" --#define HOSTIP_COUNTRYCODE_XPATH "//gml:featureMember/hostip:Hostip/hostip:countryAbbrev" --#define HOSTIP_LOCALITY_XPATH "//gml:featureMember/hostip:Hostip/gml:name" --#define HOSTIP_LATLON_XPATH "//gml:featureMember/hostip:Hostip//gml:coordinates" -+#define HOSTIP_COUNTRY_XPATH "//gml:featureMember/Hostip/countryName" -+#define HOSTIP_COUNTRYCODE_XPATH "//gml:featureMember/Hostip/countryAbbrev" -+#define HOSTIP_LOCALITY_XPATH "//gml:featureMember/Hostip/gml:name" -+#define HOSTIP_LATLON_XPATH "//gml:featureMember/Hostip//gml:coordinates" - - static void geoclue_hostip_init (GeoclueHostip *obj); - static void geoclue_hostip_position_init (GcIfacePositionClass *iface); -@@ -101,7 +99,6 @@ geoclue_hostip_get_position (GcIfacePosition *iface, - return FALSE; - } - -- - if (gc_web_service_get_string (obj->web_service, - &coord_str, HOSTIP_LATLON_XPATH)) { - if (sscanf (coord_str, "%lf,%lf", longitude , latitude) == 2) { -@@ -240,8 +237,6 @@ geoclue_hostip_init (GeoclueHostip *obj) - gc_web_service_set_base_url (obj->web_service, HOSTIP_URL); - gc_web_service_add_namespace (obj->web_service, - HOSTIP_NS_GML_NAME, HOSTIP_NS_GML_URI); -- gc_web_service_add_namespace (obj->web_service, -- HOSTIP_NS_HOSTIP_NAME, HOSTIP_NS_HOSTIP_URI); - } - - static void - diff --git a/gnome-extra/geoclue/geoclue-0.11.1.ebuild b/gnome-extra/geoclue/geoclue-0.11.1.ebuild deleted file mode 100644 index 52920ed..0000000 --- a/gnome-extra/geoclue/geoclue-0.11.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools - -DESCRIPTION="A modular geoinformation service built on top of the D-Bus messaging system" -HOMEPAGE="http://freedesktop.org/wiki/Software/GeoClue" -SRC_URI="http://folks.o-hand.com/jku/geoclue-releases/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="dbus doc gpsd gtk networkmanager" - -RDEPEND=">=dev-libs/glib-2 - >=gnome-base/gconf-2 - >=dev-libs/dbus-glib-0.60 - dev-libs/libxml2 - gpsd? ( sci-geosciences/gpsd ) - gtk? ( >=x11-libs/gtk+-2 ) - networkmanager? ( net-misc/networkmanager )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-libs/libxslt - doc? ( >=dev-util/gtk-doc-1 )" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Remove automagic deps b.fd.o #22416 - epatch "${FILESDIR}/0001-Remove-automagic-deps-and-add-switches-to-enable-dis.patch" - epatch "${FILESDIR}/0002-Fix-NM-pkgcheck.patch" - epatch "${FILESDIR}/geoclue-hostip-api.diff" - - eautoreconf -} - -src_compile() { - # gross hack to make it build - LDFLAGS="" - econf --disable-conic --disable-gypsy --disable-gsmloc \ - $(use_enable gpsd) \ - $(use_enable gtk) \ - $(use_enable networkmanager) || die "econf failed" - emake || die "Make failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS README || die "dodoc failed" -} |