- obsolete, fixed upstream

diff --git a/geoclue-configure.patch b/geoclue-configure.patch
deleted file mode 100644 (file)
index 8a4cac7..0000000
--- a/geoclue-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- geoclue/configure.ac~      2010-03-25 23:40:43.000000000 +0200
-+++ geoclue/configure.ac       2010-05-26 13:39:14.000000000 +0300
-@@ -123,7 +123,7 @@
- if test "x$enable_networkmanager" != "xno"; then
-    PKG_CHECK_MODULES(NETWORK_MANAGER,
-    [
--      NetworkManager libnm_glib
-+      NetworkManager libnm-glib
-    ], have_networkmanager="yes", have_networkmanager="no")
- 
-    if test "x$have_networkmanager" = "xyes"; then

diff --git a/geoclue-nm09.patch b/geoclue-nm09.patch
deleted file mode 100644 (file)
index fdec5ac..0000000
--- a/geoclue-nm09.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f2f988bfdda6a347a8190612af1501466b64d76b Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Mon, 07 Mar 2011 23:45:45 +0000
-Subject: master: Support NetworkManager 0.9
-
----
-diff --git a/src/connectivity-networkmanager.c b/src/connectivity-networkmanager.c
-index a545073..09630a0 100644
---- a/src/connectivity-networkmanager.c
-+++ b/src/connectivity-networkmanager.c
-@@ -38,6 +38,10 @@
- #include <nm-device-wifi.h>
- #include <nm-setting-ip4-config.h>
- 
-+#if !defined(NM_CHECK_VERSION)
-+#define NM_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #include "connectivity-networkmanager.h"
- 
- static void geoclue_networkmanager_connectivity_init (GeoclueConnectivityInterface *iface);
-@@ -285,10 +289,19 @@ nmstate_to_geocluenetworkstatus (NMState status)
-                       return GEOCLUE_CONNECTIVITY_UNKNOWN;
-               case NM_STATE_ASLEEP:
-               case NM_STATE_DISCONNECTED:
-+#if NM_CHECK_VERSION(0,8,992)
-+              case NM_STATE_DISCONNECTING:
-+#endif
-                       return GEOCLUE_CONNECTIVITY_OFFLINE;
-               case NM_STATE_CONNECTING:
-                       return GEOCLUE_CONNECTIVITY_ACQUIRING;
-+#if NM_CHECK_VERSION(0,8,992)
-+              case NM_STATE_CONNECTED_LOCAL:
-+              case NM_STATE_CONNECTED_SITE:
-+              case NM_STATE_CONNECTED_GLOBAL:
-+#else
-               case NM_STATE_CONNECTED:
-+#endif
-                       return GEOCLUE_CONNECTIVITY_ONLINE;
-               default:
-                       g_warning ("Unknown NMStatus: %d", status);
---
-cgit v0.8.3-6-g21f6

diff --git a/geoclue-unused-var.patch b/geoclue-unused-var.patch
deleted file mode 100644 (file)
index 21c5d05..0000000
--- a/geoclue-unused-var.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up geoclue-0.12.0/src/master-provider.c.blah geoclue-0.12.0/src/master-provider.c
---- geoclue-0.12.0/src/master-provider.c.blah  2011-03-07 17:32:55.926713653 -0600
-+++ geoclue-0.12.0/src/master-provider.c       2011-03-07 17:33:02.177635505 -0600
-@@ -846,10 +846,6 @@ gc_master_provider_initialize_interfaces
- static gboolean
- gc_master_provider_initialize (GcMasterProvider *provider)
- {
--      GcMasterProviderPrivate *priv;
--       
--      priv = GET_PRIVATE (provider);
--      
-       if (!gc_master_provider_initialize_interfaces (provider)) {
-               return FALSE;
-       }