diff options
| author | John Marino <marino@FreeBSD.org> | 2015-01-03 16:12:00 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2015-01-03 16:12:00 +0000 |
| commit | 96feb3ebb12dee3f335b948e1712606dc0c3a080 (patch) | |
| tree | 300d3a462031a2a48080ea0635248e336e48fcb6 /deskutils/cairo-dock/files | |
| parent | 9a83b8b08e01bb8e36c598f9bbb516805670c7f3 (diff) | |
| download | ports-96feb3ebb12dee3f335b948e1712606dc0c3a080.tar.gz ports-96feb3ebb12dee3f335b948e1712606dc0c3a080.zip | |
deskutils/cairo-dock: Unbreak DragonFly
Extend the current patch - DragonFly needs the same handling as FreeBSD.
Since the entire patch changed and didn't use the UTC timestamp, the
patch was renamed to confirm with "make makepatch" standards.
Notes
Notes:
svn path=/head/; revision=376124
Diffstat (limited to 'deskutils/cairo-dock/files')
| -rw-r--r-- | deskutils/cairo-dock/files/patch-cairo-dock-file-manager.c | 14 | ||||
| -rw-r--r-- | deskutils/cairo-dock/files/patch-src_gldit_cairo-dock-file-manager.c | 23 |
2 files changed, 23 insertions, 14 deletions
diff --git a/deskutils/cairo-dock/files/patch-cairo-dock-file-manager.c b/deskutils/cairo-dock/files/patch-cairo-dock-file-manager.c deleted file mode 100644 index 6a764949e1e8..000000000000 --- a/deskutils/cairo-dock/files/patch-cairo-dock-file-manager.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/gldit/cairo-dock-file-manager.c.orig 2014-11-22 18:39:10.000000000 +0200 -+++ src/gldit/cairo-dock-file-manager.c 2014-11-22 18:41:30.000000000 +0200 -@@ -21,7 +21,11 @@ - #include <string.h> // memset - #include <sys/stat.h> // stat - #include <fcntl.h> // open -+#ifndef __FreeBSD__ - #include <sys/sendfile.h> // sendfile -+#else -+#include <sys/socket.h> -+#endif - #include <errno.h> // errno - - #include "gldi-config.h" diff --git a/deskutils/cairo-dock/files/patch-src_gldit_cairo-dock-file-manager.c b/deskutils/cairo-dock/files/patch-src_gldit_cairo-dock-file-manager.c new file mode 100644 index 000000000000..01e6666506ea --- /dev/null +++ b/deskutils/cairo-dock/files/patch-src_gldit_cairo-dock-file-manager.c @@ -0,0 +1,23 @@ +--- src/gldit/cairo-dock-file-manager.c.orig 2014-10-15 14:16:34 UTC ++++ src/gldit/cairo-dock-file-manager.c +@@ -21,7 +21,11 @@ + #include <string.h> // memset + #include <sys/stat.h> // stat + #include <fcntl.h> // open ++#if defined (__FreeBSD__) || defined (__DragonFly__) ++#include <sys/socket.h> ++#else + #include <sys/sendfile.h> // sendfile ++#endif + #include <errno.h> // errno + + #include "gldi-config.h" +@@ -500,7 +504,7 @@ gboolean cairo_dock_copy_file (const gch + { + // perform in-kernel transfer (zero copy to user space) + int size; +- #ifdef __FreeBSD__ ++ #if defined (__FreeBSD__) || defined (__DragonFly__) + size = sendfile (src_fd, dest_fd, 0, stat.st_size, NULL, NULL, 0); + #else // Linux >= 2.6.33 for being able to have a regular file as the output socket + size = sendfile (dest_fd, src_fd, NULL, stat.st_size); // note the inversion between both calls ^_^; |