Hello, Andreas Beckmann, on sam. 25 nov. 2017 16:41:41 +0100, wrote: > attached are two patches to fix this FTBFS. > Build-tested on falla and exodar.
I have uploaded the attached debdiff to DELAYED/5. Thanks, Samuel
diff -Nru libglvnd-1.0.0/debian/changelog libglvnd-1.0.0/debian/changelog --- libglvnd-1.0.0/debian/changelog 2018-01-13 09:24:37.000000000 +0000 +++ libglvnd-1.0.0/debian/changelog 2018-01-13 09:16:09.000000000 +0000 @@ -1,3 +1,15 @@ +libglvnd (1.0.0-1.1) unstable; urgency=medium + + [ Samuel Thibault ] + * Non-maintainer upload. + + [ Andreas Beckmann ] + * Use source format 3.0 (quilt). + * kfreebsd-hurd.patch: New, fix FTBFS on kFreeBSD and Hurd. + (Closes: #870445) + + -- Samuel Thibault <sthiba...@debian.org> Sat, 13 Jan 2018 09:16:09 +0000 + libglvnd (1.0.0-1) unstable; urgency=high [ Andreas Boll ] diff -Nru libglvnd-1.0.0/debian/patches/kfreebsd-hurd.patch libglvnd-1.0.0/debian/patches/kfreebsd-hurd.patch --- libglvnd-1.0.0/debian/patches/kfreebsd-hurd.patch 1970-01-01 00:00:00.000000000 +0000 +++ libglvnd-1.0.0/debian/patches/kfreebsd-hurd.patch 2018-01-13 09:16:09.000000000 +0000 @@ -0,0 +1,14 @@ +Author: Andreas Beckmann <a...@debian.org> +Description: fix FTBFS on kFreeBSD and Hurd + +--- a/src/GLdispatch/vnd-glapi/u_execmem.c ++++ b/src/GLdispatch/vnd-glapi/u_execmem.c +@@ -68,7 +68,7 @@ static unsigned char *exec_mem = NULL; + static unsigned char *write_mem = NULL; + + +-#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__) ++#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__) || defined(__FreeBSD_kernel__) || defined(__GNU__) + + #include <unistd.h> + #include <sys/mman.h> diff -Nru libglvnd-1.0.0/debian/patches/series libglvnd-1.0.0/debian/patches/series --- libglvnd-1.0.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libglvnd-1.0.0/debian/patches/series 2018-01-13 09:16:09.000000000 +0000 @@ -0,0 +1 @@ +kfreebsd-hurd.patch diff -Nru libglvnd-1.0.0/debian/source/format libglvnd-1.0.0/debian/source/format --- libglvnd-1.0.0/debian/source/format 2018-01-13 09:24:37.000000000 +0000 +++ libglvnd-1.0.0/debian/source/format 2018-01-13 09:16:09.000000000 +0000 @@ -1 +1 @@ -1.0 +3.0 (quilt)
