[Pkg-owncloud-commits] [SCM] ocsync.git branch, master, updated. debian/0.70.3-1-16-g06b1903

[Sandro Knauß]

The following commit has been merged in the master branch:
commit 17f2a480346bc39bbba523c6d2a61ea28bcd8449
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Apr 8 02:09:14 2013 +0200

    adding patch for freebsd

diff --git a/debian/patches/freebsd_patch b/debian/patches/freebsd_patch
new file mode 100644
index 0000000..8750d7c
--- /dev/null
+++ b/debian/patches/freebsd_patch
@@ -0,0 +1,38 @@
+Index: ocsync/src/std/c_private.h
+===================================================================
+--- ocsync.orig/src/std/c_private.h	2013-03-05 04:20:45.753318629 +0100
++++ ocsync/src/std/c_private.h	2013-04-08 02:01:57.997112541 +0200
+@@ -50,6 +50,11 @@
+ #define geteuid() 0
+ #endif
+ 
++#ifndef ENODATA
++#define ENODATA EPIPE
++#endif
++
++
+ #ifdef _WIN32
+ typedef struct stat64 csync_stat_t;
+ #define _FILE_OFFSET_BITS 64
+Index: ocsync/src/std/c_string.c
+===================================================================
+--- ocsync.orig/src/std/c_string.c	2013-04-08 02:07:02.577922400 +0200
++++ ocsync/src/std/c_string.c	2013-04-08 02:07:52.951811061 +0200
+@@ -293,7 +293,7 @@
+ #ifdef WITH_ICONV
+   dst = c_iconv(wstr, iconv_from_native);
+ #else
+-  dst = wstr;
++  dst = (char*) wstr;
+ #endif
+ #endif
+   return dst;
+@@ -317,7 +317,7 @@
+ #ifdef WITH_ICONV
+   dst = c_iconv(str, iconv_to_native);
+ #else
+-  dst = str;
++  dst = (_TCHAR*) str;
+ #endif
+ #endif
+   return dst;
diff --git a/debian/patches/series b/debian/patches/series
index d39ebf4..fb390b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 update_manpage
 0001-csync_config-Drop-iniparser-dependency.patch
+freebsd_patch

-- 
ocsync.git