[SCM] libkcompactdisc packaging branch, master, updated. debian/4.10.2-2-2-g5203612

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/libkcompactdisc.git;a=commitdiff;h=5203612

The following commit has been merged in the master branch:
commit 52036120656d2d2516f24496b167e91529109db9
Author: Pino Toscano <pino at debian.org>
Date:   Tue Apr 9 10:30:46 2013 +0200

    try a better fix for the kfreebsd issue with sys/mount.h
---
 debian/changelog                                   |    4 ++++
 ...sd_extra_include.diff => kfreebsd_include.diff} |   14 ++++++++++----
 debian/patches/series                              |    2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc161ca..3fef0a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 libkcompactdisc (4:4.10.2-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Instead of just removing the sys/mount.h include from plat_freebsd.c,
+    replace it with sys/statfs.h; replace patch kfreebsd_extra_include.diff
+    with kfreebsd_include.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 09 Apr 2013 10:27:24 +0200
 
diff --git a/debian/patches/kfreebsd_extra_include.diff b/debian/patches/kfreebsd_include.diff
similarity index 58%
rename from debian/patches/kfreebsd_extra_include.diff
rename to debian/patches/kfreebsd_include.diff
index 1bd02f4..e80f234 100644
--- a/debian/patches/kfreebsd_extra_include.diff
+++ b/debian/patches/kfreebsd_include.diff
@@ -1,19 +1,25 @@
 Author: Pino Toscano <toscano.pino at tiscali.it>
-Description: Remove extra include on GNU/kFreeBSD.
+Description: Replace sys/mount.h include with sys/statfs.h on GNU/kFreeBSD.
  Due to Debian #704598, GNU/kFreeBSD' sys/mount.h cannot be used in
  C90 C sources, such as plat_freebsd.c when compiled with default CFLAGS
  provided with kdelibs.
- It seems redundant, so just remove it.
+ When using GNU libc, use sys/statfs.h instead of sys/mount.h; the former
+ should provide fstatfs.
 Forwarded: no
-Last-Update: 2014-04-08
+Last-Update: 2014-04-09
 
 --- a/wmlib/plat_freebsd.c
 +++ b/wmlib/plat_freebsd.c
-@@ -36,7 +36,6 @@
+@@ -36,7 +36,11 @@
  #include <unistd.h>
  #include <sys/types.h>
  #include <sys/param.h>
 -#include <sys/mount.h>
++#ifdef __GLIBC__
++# include <sys/statfs.h>
++#else
++# include <sys/mount.h>
++#endif
  #include <sys/stat.h>
  
  #include "include/wm_config.h"
diff --git a/debian/patches/series b/debian/patches/series
index d6cfa52..7367c2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 fix_target_link_libraries.diff
 upstream_disable-wmlib-on-GNU-Hurd.patch
-kfreebsd_extra_include.diff
+kfreebsd_include.diff

-- 
libkcompactdisc packaging