[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.10.5-1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 9d4aa2b76ca2874139af38ecb48571cc96bdec2e
Author: Pino Toscano <pino at debian.org>
Date:   Sun Apr 7 21:44:39 2013 +0200

    kfreebsd_getmntent.diff: force setmntent/getmntent on GNU/kFreeBSD
---
 debian/changelog                       |    2 ++
 debian/patches/kfreebsd_getmntent.diff |   37 ++++++++++++++++++++++++++++++++
 debian/patches/series                  |    1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 84b850b..bbb1b58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ kde4libs (4:4.10.2-2) UNRELEASED; urgency=low
     kmailservice/ktelnetservice in /usr/bin. (Closes: #704669)
   * Extend patch kfreebsd_support.diff with the addition on GNU/kFreeBSD of the
     C-/CXX-/LD-FLAGS used on Linux and Hurd too.
+  * Add patch kfreebsd_getmntent.diff to force the use of setmntent/getmntent
+    on GNU/kFreeBSD.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 03 Apr 2013 20:15:12 +0200
 
diff --git a/debian/patches/kfreebsd_getmntent.diff b/debian/patches/kfreebsd_getmntent.diff
new file mode 100644
index 0000000..28eec8f
--- /dev/null
+++ b/debian/patches/kfreebsd_getmntent.diff
@@ -0,0 +1,37 @@
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: On GNU/kFreeBSD, force the use of the setmntent/getmntent API.
+ Due to the misdetection of sys/mount.h on kFreeBSD (due to Debian #704598),
+ the getmntinfo API seems not be usable. Hence, force te use of
+ setmntent/getmntent.
+ This is kind of hack, so should not be forwarded for now.
+Forwarded: no
+Last-Update: 2013-04-07
+
+--- a/kdecore/io/kmountpoint.cpp
++++ b/kdecore/io/kmountpoint.cpp
+@@ -28,6 +28,11 @@
+ 
+ #include "kstandarddirs.h"
+ 
++/* HACK, make it use setmntent/getmntent */
++#ifdef __FreeBSD_kernel__
++# undef HAVE_GETMNTINFO
++#endif
++
+ #ifdef Q_WS_WIN
+ #include <windows.h>
+ #include <QDir>
+--- a/solid/solid/backends/fstab/fstabhandling.cpp
++++ b/solid/solid/backends/fstab/fstabhandling.cpp
+@@ -32,6 +32,11 @@
+ #include <config.h>
+ #include <stdlib.h>
+ 
++/* HACK, make it use setmntent/getmntent */
++#ifdef __FreeBSD_kernel__
++# undef HAVE_GETMNTINFO
++#endif
++
+ #ifdef HAVE_SYS_MNTTAB_H
+ #include <sys/mnttab.h>
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 576426d..33cc2d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ ktar_longlink_length_in_bytes.diff
 glibc_filesystem.diff
 install_kcookiescfg.pl_with_exec_perms.diff
 upstream_Remove-extra-sys-mount.h-include.patch
+kfreebsd_getmntent.diff

-- 
KDE Development Platform Libraries module packaging