Fix building with curl-7.21.7. Closes bug #376137.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

diff --git a/sci-geosciences/viking/ChangeLog b/sci-geosciences/viking/ChangeLog
index 00346136ab469fd7dfa93814abea99712e08e969..c7943dff3165c9b7e57fa63dca01eba574231b93 100644 (file)
--- a/sci-geosciences/viking/ChangeLog
+++ b/sci-geosciences/viking/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/viking
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.16 2011/06/17 19:47:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.17 2011/07/24 11:20:58 scarabeus Exp $
+
+  24 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> viking-1.2.1.ebuild,
+  +files/viking-curl-7.21.7.patch:
+  Fix building with curl-7.21.7. Closes bug #376137.
 
   17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/1.2.1-autoreconf.patch, viking-1.2.1.ebuild:

diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index ff8ea413522f172ac773d4e0f59c3aeb4f7cf137..f7f47c3f3034fe22dcd4d7652b2883936c865076 100644 (file)
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -2,15 +2,16 @@
 Hash: SHA1
 
 AUX 1.2.1-autoreconf.patch 454 RMD160 079004a3708f909304945dd324d973ef26885278 SHA1 8272b44044578ab39349ab23592877522b1f4a0f SHA256 4cb58f3d86dc10443f9a1cabd7a132797e5eab1d1072ba65fd034970b5d8a400
+AUX viking-curl-7.21.7.patch 279 RMD160 f721a8de9e1d656b764d6bd96c9fb54201d43300 SHA1 1b83fbd1a2e61532943936459157bc85f8b64f55 SHA256 97a473029b67b194607431171e36af1d834b79b5ea52856465558b196104f2c0
 AUX viking-gpsd-2.96.patch 2162 RMD160 39d74daddc7501db65c7208d0080d5cb82ac4462 SHA1 a7c469194ae04535549b7bac65365be0f66c5652 SHA256 7277a6f0bbe7b16440ca92a5975c6f0b38261f13bbbb6f04e4fc684b8965c902
 DIST viking-1.2.1.tar.gz 1054364 RMD160 609b464db5c4035123199cd3a4c8985e381710db SHA1 594e9ee50dfb93a213399ced9dce72b296b9335a SHA256 7c4b36398a9ec121ab11b66f042d17368dd46cf328a2a0e00bda38fd357a9743
-EBUILD viking-1.2.1.ebuild 1370 RMD160 b92770b9733ed541757e726d1ac8534045e08af8 SHA1 883b98f7aa8801758e680ba18fa13b12ae35fc8c SHA256 6f33316e81ee18d9488e91892d57abda60ef2aa46070909c129456666e91002a
-MISC ChangeLog 2597 RMD160 00a1038c85c8ca0f099d99662ea91fd6cc2b3d8b SHA1 5f188b3c8b398d691839c7ab438cbce6d814d95a SHA256 a9a9417149143e34bd065d305e3189563ae84bb6d70604ed41024a43c8feb3ea
+EBUILD viking-1.2.1.ebuild 1409 RMD160 7fa1973407ad378c1d68c86cb0168f956fe9ab6a SHA1 a90f979e794e43174c18f58f7b278d797de9e717 SHA256 bbf8d49b1e262f29999b157b9be02c29e277d0553e299017a6bd20110f45b9f5
+MISC ChangeLog 2762 RMD160 a4ebe51d8ad3671d4941347bf0b28b85f6261d32 SHA1 82be818a2b7fabc8fac2cad96d8a2250a6390f99 SHA256 29118430b7c8074a873a2d6b06ead0606e233e56ad2e4db3833147b6f719b2d6
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk37r2YACgkQHB6c3gNBRYfUwQCgi49FPFRlLrmQzLfDarBnRuyh
-fZoAmgOoCH+gl3mnFDLNNFxTaDNeQx8e
-=jyN7
+iEYEARECAAYFAk4sAA8ACgkQHB6c3gNBRYcVKgCeIiKLreUq+n5kouTJxYPMkeRC
+y0MAn0yBMiRkVLoCen6TEbMQHAmS/jAa
+=iT+d
 -----END PGP SIGNATURE-----

diff --git a/sci-geosciences/viking/files/viking-curl-7.21.7.patch b/sci-geosciences/viking/files/viking-curl-7.21.7.patch
new file mode 100644 (file)
index 0000000..5c79f9d
--- /dev/null
+++ b/sci-geosciences/viking/files/viking-curl-7.21.7.patch
@@ -0,0 +1,10 @@
+--- viking-1.2.1-orig/src/osm-traces.c 2011-07-24 12:00:31.556958069 +0200
++++ viking-1.2.1/src/osm-traces.c      2011-07-24 12:00:44.180631910 +0200
+@@ -27,7 +27,6 @@
+ #include <errno.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <glib.h>

diff --git a/sci-geosciences/viking/viking-1.2.1.ebuild b/sci-geosciences/viking/viking-1.2.1.ebuild
index 7ea7568bf528eabbc82cc4bbd739373b43ff85fc..e99fa2d6952a89a96fb18ee1de34ca38f60c701e 100644 (file)
--- a/sci-geosciences/viking/viking-1.2.1.ebuild
+++ b/sci-geosciences/viking/viking-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-1.2.1.ebuild,v 1.2 2011/06/17 19:47:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-1.2.1.ebuild,v 1.3 2011/07/24 11:20:58 scarabeus Exp $
 
 EAPI=4
 
@@ -38,6 +38,7 @@ DOCS=( README doc/GEOCODED-PHOTOS doc/GETTING-STARTED doc/GPSMAPPER )
 
 PATCHES=(
        "${FILESDIR}"/${PN}-gpsd-2.96.patch
+       "${FILESDIR}"/${PN}-curl-7.21.7.patch
        "${FILESDIR}"/${PV}-autoreconf.patch
 )