| 1 |
commit: 88d063fca542cf1a5b271ee80bf97087107de261 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jan 31 18:13:32 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 1 22:40:00 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88d063fc |
| 7 |
|
| 8 |
sci-geosciences/viking: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/3742 |
| 11 |
|
| 12 |
sci-geosciences/viking/files/1.3-autoreconf.patch | 12 ----- |
| 13 |
.../viking/files/viking-1.5.1-gpsd-3.13.patch | 53 ---------------------- |
| 14 |
2 files changed, 65 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-geosciences/viking/files/1.3-autoreconf.patch b/sci-geosciences/viking/files/1.3-autoreconf.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index c8ddd6f..00000000 |
| 19 |
--- a/sci-geosciences/viking/files/1.3-autoreconf.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,12 +0,0 @@ |
| 22 |
---- configure.ac.orig 2012-05-31 09:40:33.543090992 +0200 |
| 23 |
-+++ configure.ac 2012-05-31 09:40:44.372640811 +0200 |
| 24 |
-@@ -350,9 +350,6 @@ |
| 25 |
- help/Makefile |
| 26 |
- doc/Makefile |
| 27 |
- doc/examples/Makefile]) |
| 28 |
--if test x$enable_gtk_doc = xyes; then |
| 29 |
--AC_CONFIG_FILES([doc/reference/Makefile]) |
| 30 |
--fi |
| 31 |
- AC_OUTPUT([ |
| 32 |
- viking.spec |
| 33 |
- ]) |
| 34 |
|
| 35 |
diff --git a/sci-geosciences/viking/files/viking-1.5.1-gpsd-3.13.patch b/sci-geosciences/viking/files/viking-1.5.1-gpsd-3.13.patch |
| 36 |
deleted file mode 100644 |
| 37 |
index d559746..00000000 |
| 38 |
--- a/sci-geosciences/viking/files/viking-1.5.1-gpsd-3.13.patch |
| 39 |
+++ /dev/null |
| 40 |
@@ -1,53 +0,0 @@ |
| 41 |
-commit 25043ca24a55468dc9eeaa7335a24d132c51b07d |
| 42 |
-Author: Rob Norris <rw_norris@×××××××.com> |
| 43 |
-Date: Mon Mar 9 23:25:15 2015 +0000 |
| 44 |
- |
| 45 |
- SF Bugs#117: Confirm capability with GPSD_API_MAJOR_VERSION=6 (gpsd 3.12 / libgps.so.22) |
| 46 |
- |
| 47 |
-diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c |
| 48 |
-index daf6d42..ca4be29 100644 |
| 49 |
---- a/src/vikgpslayer.c |
| 50 |
-+++ b/src/vikgpslayer.c |
| 51 |
-@@ -1673,7 +1673,7 @@ static gboolean gpsd_data_available(GIOChannel *source, GIOCondition condition, |
| 52 |
- if (condition == G_IO_IN) { |
| 53 |
- #if GPSD_API_MAJOR_VERSION == 3 || GPSD_API_MAJOR_VERSION == 4 |
| 54 |
- if (!gps_poll(&vgl->vgpsd->gpsd)) { |
| 55 |
--#elif GPSD_API_MAJOR_VERSION == 5 |
| 56 |
-+#elif GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6 |
| 57 |
- if (gps_read(&vgl->vgpsd->gpsd) > -1) { |
| 58 |
- // Reuse old function to perform operations on the new GPS data |
| 59 |
- gpsd_raw_hook(vgl->vgpsd, NULL); |
| 60 |
-@@ -1718,7 +1718,7 @@ static gboolean rt_gpsd_try_connect(gpointer *data) |
| 61 |
- vgl->vgpsd = g_malloc(sizeof(VglGpsd)); |
| 62 |
- |
| 63 |
- if (gps_open_r(vgl->gpsd_host, vgl->gpsd_port, /*(struct gps_data_t *)*/vgl->vgpsd) != 0) { |
| 64 |
--#elif GPSD_API_MAJOR_VERSION == 5 |
| 65 |
-+#elif GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6 |
| 66 |
- vgl->vgpsd = g_malloc(sizeof(VglGpsd)); |
| 67 |
- if (gps_open(vgl->gpsd_host, vgl->gpsd_port, &vgl->vgpsd->gpsd) != 0) { |
| 68 |
- #else |
| 69 |
-@@ -1757,7 +1757,7 @@ static gboolean rt_gpsd_try_connect(gpointer *data) |
| 70 |
- #if GPSD_API_MAJOR_VERSION == 3 |
| 71 |
- gps_query(&vgl->vgpsd->gpsd, "w+x"); |
| 72 |
- #endif |
| 73 |
--#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 |
| 74 |
-+#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6 |
| 75 |
- gps_stream(&vgl->vgpsd->gpsd, WATCH_ENABLE, NULL); |
| 76 |
- #endif |
| 77 |
- |
| 78 |
-@@ -1813,13 +1813,13 @@ static void rt_gpsd_disconnect(VikGpsLayer *vgl) |
| 79 |
- vgl->realtime_io_channel = NULL; |
| 80 |
- } |
| 81 |
- if (vgl->vgpsd) { |
| 82 |
--#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 |
| 83 |
-+#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6 |
| 84 |
- gps_stream(&vgl->vgpsd->gpsd, WATCH_DISABLE, NULL); |
| 85 |
- #endif |
| 86 |
- gps_close(&vgl->vgpsd->gpsd); |
| 87 |
- #if GPSD_API_MAJOR_VERSION == 3 |
| 88 |
- free(vgl->vgpsd); |
| 89 |
--#elif GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 |
| 90 |
-+#elif GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6 |
| 91 |
- g_free(vgl->vgpsd); |
| 92 |
- #endif |
| 93 |
- vgl->vgpsd = NULL; |
Archives