From 191657885267265e1d19d1044ed6c913df6dfa9c Mon Sep 17 00:00:00 2001
From: Piotr Pietraszkiewicz <ppietrasa@googlemail.com>
Date: Sat, 5 Nov 2011 22:12:18 +0000
Subject: made sword build against current curl (v7.22.0) by removing
 deprecated includes

svn path=/nixpkgs/trunk/; revision=30248
---
 pkgs/development/libraries/sword/default.nix       |  3 +++
 .../sword/dont_include_curl_types_h.patch          | 24 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/sword/dont_include_curl_types_h.patch

(limited to 'pkgs/development/libraries/sword')

diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index 06bd5823e872..a3684194c0f4 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig icu cluceneCore curl ];
 
+  # because curl/types.h disappeared since at least curl 7.21.7
+  patches = [ ./dont_include_curl_types_h.patch ];
+
   prePatch = ''
     patchShebangs .;
   '';
diff --git a/pkgs/development/libraries/sword/dont_include_curl_types_h.patch b/pkgs/development/libraries/sword/dont_include_curl_types_h.patch
new file mode 100644
index 000000000000..233d59a32435
--- /dev/null
+++ b/pkgs/development/libraries/sword/dont_include_curl_types_h.patch
@@ -0,0 +1,24 @@
+diff --git a/src/mgr/curlftpt.cpp b/src/mgr/curlftpt.cpp
+index 7d2fd3c..046291e 100644
+--- a/src/mgr/curlftpt.cpp
++++ b/src/mgr/curlftpt.cpp
+@@ -26,7 +26,6 @@
+ #include <fcntl.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
+diff --git a/src/mgr/curlhttpt.cpp b/src/mgr/curlhttpt.cpp
+index b736050..229d4dd 100644
+--- a/src/mgr/curlhttpt.cpp
++++ b/src/mgr/curlhttpt.cpp
+@@ -25,7 +25,6 @@
+ #include <cctype>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
-- 
cgit 1.4.1