[viking] fix compile against curl 7.21.7
Tom Callaway
spot at fedoraproject.org
Tue Aug 23 17:14:20 UTC 2011
commit c1d391601885a58cea741f849bca9c4b1fb00e68
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Tue Aug 23 13:14:08 2011 -0400
fix compile against curl 7.21.7
viking-1.2.1-curl-7.21.7.patch | 14 ++++++++++++++
viking.spec | 2 ++
2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/viking-1.2.1-curl-7.21.7.patch b/viking-1.2.1-curl-7.21.7.patch
new file mode 100644
index 0000000..c897a01
--- /dev/null
+++ b/viking-1.2.1-curl-7.21.7.patch
@@ -0,0 +1,14 @@
+diff -up viking-1.2.1/src/osm-traces.c.curl viking-1.2.1/src/osm-traces.c
+--- viking-1.2.1/src/osm-traces.c.curl 2011-08-23 13:12:41.964732806 -0400
++++ viking-1.2.1/src/osm-traces.c 2011-06-15 15:30:06.000000000 -0400
+@@ -27,10 +27,7 @@
+ #include <errno.h>
+
+ #include <curl/curl.h>
+-#if LIBCURL_VERSION_NUM < 0x071507
+-/* types.h has been removed in 7.21.7 */
+ #include <curl/types.h>
+-#endif
+ #include <curl/easy.h>
+
+ #include <glib.h>
diff --git a/viking.spec b/viking.spec
index deef96b..3dd171b 100644
--- a/viking.spec
+++ b/viking.spec
@@ -8,6 +8,7 @@ License: GPLv2+
URL: http://viking.sourceforge.net/
Source0: http://downloads.sourceforge.net/viking/viking-%{version}.tar.gz
Patch0: viking-1.2.1-gpsd-2.96.patch
+Patch1: viking-1.2.1-curl-7.21.7.patch
BuildRequires: intltool
BuildRequires: expat-devel
@@ -89,6 +90,7 @@ fi
* Tue Aug 23 2011 Tom Callaway <spot at fedoraproject.org> - 1.2.1-1
- update to 1.2.1
- enable gpsd 2.96+ support
+- fix compile with curl 7.21.7 (curl/types.h is gone)
* Fri Jun 03 2011 Fabian Affolter <fabian at bernewireless.net> - 1.2-1
- Updated to new upstream version 1.2
More information about the scm-commits
mailing list