← Back to branch summary

~ubuntu-branches/ubuntu/wily/wmcdplay/wily

« back to all changes in this revision

Viewing changes to debian/patches/fix_hurd_ftbfs.patch

  • Committer: Package Import Robot
  • Author(s): Doug Torrance
  • Date: 2014-07-30 17:21:08 UTC
  • Revision ID: package-import@ubuntu.com-20140730172108-jsrnmgou9enr1xwy
Tags: 1.0beta1-12
http://bugs.debian.org/632877
http://bugs.debian.org/647964
http://bugs.debian.org/438267
* New maintainer (Closes: #632877).
* Switch to dpkg-source 3.0 (quilt) format.
  - Add debian/source/format.
  - Convert patches from previous versions; now appear in debian/patches.
* debian/control
  - Remove redundant Section and Priority fields.
  - Add Homepage, Vcs-* fields.
* debian/copyright
  - Update to machine-readable format version 1.0.
* debian/dirs
  - Remove file; directories already created by build process.
* debian/install
  - New file; install artwork.
* debian/manpages
  - New file.
* debian/patches/fix_hurd_ftbfs.patch
  - Fix FTBFS on Hurd; thanks to Samuel Thibault <sthibault@debian.org>
    (Closes: #647964).
* debian/rules
  - Simplify to use dh.
  - Previous debian/rules used install -s, which resulted in a stripped binary
    even when DEB_BUILD_OPTIONS=nostrip was specified.  This no longer occurs
    (Closes: #438267).
  - Pass CXXFLAGS and LDFLAGS to make to enable hardening.
* debian/watch
  - New file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix_hurd_ftbfs.patch
 
1
Description: wmcdplay: FTBFS on hurd-i386
 
2
 Hello,
 
3
 .
 
4
 wmcdplay currently FTBFS on hurd-i386, due to inclusion of a linux-specific
 
5
 header <linux/cdrom.h>. The attached patch fixes it by including
 
6
 <sys/cdrom.h> instead, could you please apply it?
 
7
 .
 
8
 Thanks,
 
9
 Samuel
 
10
Author: Samuel Thibault <sthibault@debian.org>
 
11
Bug-Debian: http://bugs.debian.org/647964
 
12
Last-Update: 2014-07-29
 
13
 
 
14
--- a/cdctl.h
 
15
+++ b/cdctl.h
 
16
@@ -30,7 +30,12 @@
 
17
 #include <sys/stat.h>
 
18
 #include <fcntl.h>
 
19
 #include <unistd.h>
 
20
+#ifdef __linux__
 
21
 #include <linux/cdrom.h>
 
22
+#endif
 
23
+#ifdef __GNU__
 
24
+#include <sys/cdrom.h>
 
25
+#endif
 
26
 
 
27
 // CD status values
 
28
 #define ssData     0