[Pkg-wmaker-commits] [wmcdplay] 12/79: Add patch to fix FTBFS on Hurd.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmcdplay.

commit 699efd4b568baea175f9f3c5648f9a21a979bd1d
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Tue Jul 29 16:55:10 2014 -0500

    Add patch to fix FTBFS on Hurd.
---
 debian/changelog                    |  3 +++
 debian/patches/fix_hurd_ftbfs.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3c172b6..d698ec6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ wmcdplay (1.0beta1-12) unstable; urgency=low
     - New file; install artwork.
   * debian/manpages
     - New file.
+  * debian/patches/fix_hurd_ftbfs.patch
+    - Fix FTBFS on Hurd; thanks to Samuel Thibault <sthibault at debian.org>
+      (Closes: 647964).
   * debian/rules
     - Simplify to use dh.
     - Pass CXXFLAGS and LDFLAGS to make to enable hardening.
diff --git a/debian/patches/fix_hurd_ftbfs.patch b/debian/patches/fix_hurd_ftbfs.patch
new file mode 100644
index 0000000..bf14363
--- /dev/null
+++ b/debian/patches/fix_hurd_ftbfs.patch
@@ -0,0 +1,28 @@
+From: Samuel Thibault <sthibault at debian.org>
+Subject: wmcdplay: FTBFS on hurd-i386
+ Hello,
+
+ wmcdplay currently FTBFS on hurd-i386, due to inclusion of a linux-specific
+ header <linux/cdrom.h>. The attached patch fixes it by including
+ <sys/cdrom.h> instead, could you please apply it?
+
+ Thanks,
+ Samuel
+Bug-Debian: http://bugs.debian.org/647964
+Last-Update: 2014-07-29
+
+--- a/cdctl.h
++++ b/cdctl.h
+@@ -30,7 +30,12 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#ifdef __linux__
+ #include <linux/cdrom.h>
++#endif
++#ifdef __GNU__
++#include <sys/cdrom.h>
++#endif
+ 
+ // CD status values
+ #define ssData     0
diff --git a/debian/patches/series b/debian/patches/series
index d530221..bf34e65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ set_remain_to_zero.patch
 remove_extra_arg.patch
 add_parentheses.patch
 add_debugging_comments.patch
+fix_hurd_ftbfs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcdplay.git