r28301 - in /desktop/unstable/d-conf/debian: changelog patches/ patches/01-sys-mount-h-include-fix.patch patches/series rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Jun  5 17:45:57 2011
New Revision: 28301

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28301
Log:
Include headers in a proper way to fix FTBFS on hurd and kfreebsd.

This also makes the CFLAGS workaround obsolete, so remove it again.

Added:
    desktop/unstable/d-conf/debian/patches/
    desktop/unstable/d-conf/debian/patches/01-sys-mount-h-include-fix.patch
    desktop/unstable/d-conf/debian/patches/series
Modified:
    desktop/unstable/d-conf/debian/changelog
    desktop/unstable/d-conf/debian/rules

Modified: desktop/unstable/d-conf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/d-conf/debian/changelog?rev=28301&op=diff
==============================================================================
--- desktop/unstable/d-conf/debian/changelog [utf-8] (original)
+++ desktop/unstable/d-conf/debian/changelog [utf-8] Sun Jun  5 17:45:57 2011
@@ -2,10 +2,11 @@
 
   * Strip leading debian/tmp/ from .install files.
   * Bump Standards-Version to 3.9.2. No further changes.
-  * Set CFLAGS+=-std=gnu99 in debian/rules to work around the FTBFS on
-    kfreebsd. (Closes: #629211).
   * Temporarily disable dconf-editor so we can bootstrap d-conf on kfreebsd.
   * Don't install bash completion file as executable shell script.
+  * debian/patches/01-sys-mount-h-include-fix.patch
+    - Include headers in a proper way to fix FTBFS on hurd and kfreebsd.
+      (Closes: #629211)
 
  -- Michael Biebl <biebl at debian.org>  Sun, 05 Jun 2011 16:20:49 +0200
 

Added: desktop/unstable/d-conf/debian/patches/01-sys-mount-h-include-fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/d-conf/debian/patches/01-sys-mount-h-include-fix.patch?rev=28301&op=file
==============================================================================
--- desktop/unstable/d-conf/debian/patches/01-sys-mount-h-include-fix.patch (added)
+++ desktop/unstable/d-conf/debian/patches/01-sys-mount-h-include-fix.patch [utf-8] Sun Jun  5 17:45:57 2011
@@ -1,0 +1,35 @@
+Description: Fix includes for GNU/Hurd and GNU/kFreeBSD
+ d-conf 0.7.5 fails to build on GNU/Hurd and GNU/kFreeBSD.
+ The problem is the <sys/mount.h> system include, which is not present in Hurd.
+ Looking at the statfs(2) man page, it would seem that statfs() is present in
+ <sys/mount.h> on FreeBSD only, while in <sys/vfs.h> or <sys/statfs.h> in other
+ systems.
+ The attached patch does that, i.e include <sys/param.h> and <sys/mount.h> on
+ FreeBSD only, while <sys/statfs.h> and <sys/vfs.h> elsewhere.
+ It has been successfully tested on GNU/Hurd and GNU/Linux.
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=651944
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629273
+
+diff --git a/common/dconf-shmdir.c b/common/dconf-shmdir.c
+index d87d6d7..399db8e 100644
+--- a/common/dconf-shmdir.c
++++ b/common/dconf-shmdir.c
+@@ -21,13 +21,14 @@
+ 
+ #include "dconf-shmdir.h"
+ 
+-#ifndef __FreeBSD__
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#include <sys/mount.h>
++#else
+ #include <sys/statfs.h>
+ #include <sys/vfs.h>
+ #endif
+ 
+-#include <sys/param.h>
+-#include <sys/mount.h>
+ #include <errno.h>
+ 
+ #ifndef NFS_SUPER_MAGIC

Added: desktop/unstable/d-conf/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/d-conf/debian/patches/series?rev=28301&op=file
==============================================================================
--- desktop/unstable/d-conf/debian/patches/series (added)
+++ desktop/unstable/d-conf/debian/patches/series [utf-8] Sun Jun  5 17:45:57 2011
@@ -1,0 +1,1 @@
+01-sys-mount-h-include-fix.patch

Modified: desktop/unstable/d-conf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/d-conf/debian/rules?rev=28301&op=diff
==============================================================================
--- desktop/unstable/d-conf/debian/rules [utf-8] (original)
+++ desktop/unstable/d-conf/debian/rules [utf-8] Sun Jun  5 17:45:57 2011
@@ -5,8 +5,6 @@
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-CFLAGS += -std=gnu99
 
 GNOME_MODULE=dconf
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --disable-editor