diff --git a/debian/changelog b/debian/changelog index 52ae651..2258179 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lxqt-globalkeys (0.10.0-4) unstable; urgency=medium + + * cast some error_t's to make hurd happy + + -- Alf Gaida Sun, 27 Dec 2015 23:26:32 +0100 + lxqt-globalkeys (0.10.0-3) unstable; urgency=medium * some cleanup in debian/rules diff --git a/debian/patches/error_t.patch b/debian/patches/error_t.patch new file mode 100644 index 0000000..fbd2018 --- /dev/null +++ b/debian/patches/error_t.patch @@ -0,0 +1,61 @@ +Description: cast return values to error_t +Author: Alf Gaida + +Bug: +Last-Update: 2015-12-27 + +--- lxqt-globalkeys-0.10.0.orig/daemon/pipe_utils.cpp ++++ lxqt-globalkeys-0.10.0/daemon/pipe_utils.cpp +@@ -39,10 +39,10 @@ void initBothPipeEnds(int fd[2]) + + error_t createPipe(int fd[2]) + { +- error_t result = 0; ++ error_t result = (error_t) 0; + if (pipe(fd) < 0) + { +- result = errno; ++ result = (error_t) errno; + } + if (!result) + { +@@ -59,16 +59,16 @@ error_t readAll(int fd, void *data, size + ssize_t bytes_read = read(fd, data, length); + if (bytes_read < 0) + { +- return errno; ++ return (error_t) errno; + } + if (!bytes_read) + { +- return -1; ++ return (error_t) -1; + } + data = reinterpret_cast(data) + bytes_read; + length -= bytes_read; + } +- return 0; ++ return (error_t) 0; + } + + error_t writeAll(int fd, const void *data, size_t length) +@@ -78,16 +78,16 @@ error_t writeAll(int fd, const void *dat + ssize_t bytes_written = write(fd, data, length); + if (bytes_written < 0) + { +- return errno; ++ return (error_t) errno; + } + if (!bytes_written) + { +- return -1; ++ return (error_t) -1; + } + data = reinterpret_cast(data) + bytes_written; + length -= bytes_written; + } +- return 0; ++ return (error_t) 0; + } + + void closeBothPipeEnds(int fd[2]) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..35becee --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +error_t.patch