From 04055c389673d606e77c0a04c3a462ce3031b191 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Aug 25 2015 20:14:10 +0000 Subject: Remove unused patches --- diff --git a/viking-1.6-gpsd.patch b/viking-1.6-gpsd.patch deleted file mode 100644 index 3fb8433..0000000 --- a/viking-1.6-gpsd.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up viking-1.5.1/src/vikgpslayer.c.orig viking-1.5.1/src/vikgpslayer.c ---- viking-1.5.1/src/vikgpslayer.c.orig 2015-03-27 16:27:21.352450583 +0100 -+++ viking-1.5.1/src/vikgpslayer.c 2015-03-27 16:30:07.474912841 +0100 -@@ -1712,7 +1712,7 @@ static gboolean gpsd_data_available(GIOC - if (condition == G_IO_IN) { - #if GPSD_API_MAJOR_VERSION == 3 || GPSD_API_MAJOR_VERSION == 4 - if (!gps_poll(&vgl->vgpsd->gpsd)) { --#elif GPSD_API_MAJOR_VERSION == 5 -+#elif GPSD_API_MAJOR_VERSION >= 5 && GPSD_API_MAJOR_VERSION <= 6 - if (gps_read(&vgl->vgpsd->gpsd) > -1) { - // Reuse old function to perform operations on the new GPS data - gpsd_raw_hook(vgl->vgpsd, NULL); -@@ -1757,7 +1757,7 @@ static gboolean rt_gpsd_try_connect(gpoi - vgl->vgpsd = g_malloc(sizeof(VglGpsd)); - - if (gps_open_r(vgl->gpsd_host, vgl->gpsd_port, /*(struct gps_data_t *)*/vgl->vgpsd) != 0) { --#elif GPSD_API_MAJOR_VERSION == 5 -+#elif GPSD_API_MAJOR_VERSION >= 5 && GPSD_API_MAJOR_VERSION <= 6 - vgl->vgpsd = g_malloc(sizeof(VglGpsd)); - if (gps_open(vgl->gpsd_host, vgl->gpsd_port, &vgl->vgpsd->gpsd) != 0) { - #else -@@ -1796,7 +1796,7 @@ static gboolean rt_gpsd_try_connect(gpoi - #if GPSD_API_MAJOR_VERSION == 3 - gps_query(&vgl->vgpsd->gpsd, "w+x"); - #endif --#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 -+#if GPSD_API_MAJOR_VERSION >= 4 && GPSD_API_MAJOR_VERSION <= 6 - gps_stream(&vgl->vgpsd->gpsd, WATCH_ENABLE, NULL); - #endif - -@@ -1852,13 +1852,13 @@ static void rt_gpsd_disconnect(VikGpsLay - vgl->realtime_io_channel = NULL; - } - if (vgl->vgpsd) { --#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 -+#if GPSD_API_MAJOR_VERSION >= 4 && GPSD_API_MAJOR_VERSION <= 6 - gps_stream(&vgl->vgpsd->gpsd, WATCH_DISABLE, NULL); - #endif - gps_close(&vgl->vgpsd->gpsd); - #if GPSD_API_MAJOR_VERSION == 3 - free(vgl->vgpsd); --#elif GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 -+#elif GPSD_API_MAJOR_VERSION >= 4 && GPSD_API_MAJOR_VERSION <= 6 - g_free(vgl->vgpsd); - #endif - vgl->vgpsd = NULL; - diff --git a/viking-gpsdclient.patch b/viking-gpsdclient.patch deleted file mode 100644 index 061adc1..0000000 --- a/viking-gpsdclient.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/vikgpslayer.c.orig 2010-04-27 20:51:31.374705089 +0200 -+++ src/vikgpslayer.c 2010-04-27 20:51:45.206705490 +0200 -@@ -39,6 +39,7 @@ - #include - #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING - #include -+#include - #endif - - #if ! GLIB_CHECK_VERSION(2,14,0)