diff --git a/debian/changelog b/debian/changelog index 9558816..1fcb36f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ dvdisaster (0.79.5-2) UNRELEASED; urgency=medium * Remove unnecessary calls to dpkg-parsechangelog from debian/rules. * debian/watch: Avoid repacking upstream tarballs unnecessarily. * Fix more typos in error messages and docs. + * Fix FTBFS on Hurd and kFreeBSD. -- Carlos Maddela Sat, 05 Aug 2017 20:03:21 +1000 diff --git a/debian/patches/30-hurd-kfreebsd-ftbfs.patch b/debian/patches/30-hurd-kfreebsd-ftbfs.patch new file mode 100644 index 0000000..1c0c37d --- /dev/null +++ b/debian/patches/30-hurd-kfreebsd-ftbfs.patch @@ -0,0 +1,46 @@ +From: Carlos Maddela +Date: Sun, 6 Aug 2017 02:40:33 +1000 +Subject: Fix FTBFS on Hurd and kFreeBSD. + +Description: Fix FTBFS on Hurd and kFreeBSD. + Make sure MMAP_FLAGS gets defined. +Author: Carlos Maddela +Last-Update: 2017-08-06 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + rs03-create.c | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +diff --git a/rs03-create.c b/rs03-create.c +index b2c6033..b14e326 100644 +--- a/rs03-create.c ++++ b/rs03-create.c +@@ -39,16 +39,19 @@ + #ifdef HAVE_MMAP + #include + +-#ifdef SYS_LINUX +- #define MMAP_FLAGS (MAP_SHARED | MAP_POPULATE | MAP_NORESERVE) +-#endif ++#if defined(SYS_LINUX) + +-#ifdef SYS_FREEBSD +- #define MMAP_FLAGS (MAP_SHARED | MAP_PREFAULT_READ) +-#endif ++ #define MMAP_FLAGS (MAP_SHARED | MAP_POPULATE | MAP_NORESERVE) ++ ++#elif defined(SYS_FREEBSD) ++ ++ #define MMAP_FLAGS (MAP_SHARED | MAP_PREFAULT_READ) ++ ++#else ++ ++ /* SYS_NETBSD and others. */ ++ #define MMAP_FLAGS (MAP_SHARED) + +-#ifdef SYS_NETBSD +- #define MMAP_FLAGS (MAP_SHARED) + #endif + + #endif diff --git a/debian/patches/series b/debian/patches/series index afe379c..89700d5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,3 +21,4 @@ 27-allow-opening-in-browser-again.patch 28-fudge-pdf-doc-ids.patch 29-fix-more-typos.patch +30-hurd-kfreebsd-ftbfs.patch