davfs2: - Use previous version of neon library. - Add patch to find ISDIR macros.

svn path=/nixpkgs/trunk/; revision=26865

+32 -2
+1 -1
pkgs/tools/filesystems/davfs2/default.nix
··· 10 10 11 11 buildInputs = [ neon zlib ]; 12 12 13 - patches = [ ./davfs2-install.patch ]; 13 + patches = [ ./davfs2-install.patch ./isdir.patch ]; 14 14 15 15 meta = { 16 16 longDescription = "Web Distributed Authoring and Versioning (WebDAV), an extension to the HTTP-protocol, allows authoring of resources on a remote web server. davfs2 provides the ability to access such resources like a typical filesystem, allowing for use by standard applications with no built-in support for WebDAV.";
+30
pkgs/tools/filesystems/davfs2/isdir.patch
··· 1 + diff -ur davfs2-1.4.5-old/src/dav_coda.c davfs2-1.4.5-new/src/dav_coda.c 2 + --- davfs2-1.4.5-old/src/dav_coda.c 2009-06-04 20:30:32.000000000 +0200 3 + +++ davfs2-1.4.5-new/src/dav_coda.c 2011-02-09 19:51:22.260530572 +0100 4 + @@ -52,6 +52,10 @@ 5 + #ifdef HAVE_SYS_TYPES_H 6 + #include <sys/types.h> 7 + #endif 8 + +#ifdef HAVE_SYS_STAT_H 9 + +#include <sys/stat.h> 10 + +#endif 11 + + 12 + 13 + #include "defaults.h" 14 + #include "mount_davfs.h" 15 + diff -ur davfs2-1.4.5-old/src/dav_fuse.c davfs2-1.4.5-new/src/dav_fuse.c 16 + --- davfs2-1.4.5-old/src/dav_fuse.c 2009-06-30 20:06:44.000000000 +0200 17 + +++ davfs2-1.4.5-new/src/dav_fuse.c 2011-02-09 19:52:23.938220524 +0100 18 + @@ -41,6 +41,12 @@ 19 + #ifdef HAVE_UNISTD_H 20 + #include <unistd.h> 21 + #endif 22 + +#ifdef HAVE_SYS_TYPES_H 23 + +#include <sys/types.h> 24 + +#endif 25 + +#ifdef HAVE_SYS_STAT_H 26 + +#include <sys/stat.h> 27 + +#endif 28 + 29 + #include "defaults.h" 30 + #include "mount_davfs.h"
+1 -1
pkgs/top-level/all-packages.nix
··· 529 529 dar = callPackage ../tools/archivers/dar { }; 530 530 531 531 davfs2 = callPackage ../tools/filesystems/davfs2 { 532 - neon = neon028; 532 + neon = neon029; 533 533 }; 534 534 535 535 dcraw = callPackage ../tools/graphics/dcraw { };