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

Pino Toscano pino at alioth.debian.org
Sat Dec 3 09:30:51 UTC 2011


The following commit has been merged in the master branch:
commit c27037a61090ebf4bdd50ccfa9e00785588a2c77
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 3 10:30:36 2011 +0100

    add patch glibc_filesystem.diff to fix the kdecore compilation on kFreeBSD
---
 debian/changelog                     |    2 ++
 debian/patches/glibc_filesystem.diff |   18 ++++++++++++++++++
 debian/patches/series                |    1 +
 3 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ec1a7c..330df07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 kde4libs (4:4.7.2-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Add patch glibc_filesystem.diff to fix the kdecore compilation on kFreeBSD.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Dec 2011 10:08:07 +0100
 
diff --git a/debian/patches/glibc_filesystem.diff b/debian/patches/glibc_filesystem.diff
new file mode 100644
index 0000000..48b4740
--- /dev/null
+++ b/debian/patches/glibc_filesystem.diff
@@ -0,0 +1,18 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Correct determineFileSystemTypeImpl() for any glibc-based system
+ Fixes compilation on GNU/kFreeBSD, which has no determineFileSystemTypeImpl()
+ being recognized by default.
+Last-Update: 2011-12-03
+Forwarded: no
+
+--- a/kdecore/io/kfilesystemtype_p.cpp
++++ b/kdecore/io/kfilesystemtype_p.cpp
+@@ -47,7 +47,7 @@
+     return kde_typeFromName(buf.f_fstypename);
+ }
+ 
+-#elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#elif defined(Q_OS_LINUX) || defined(Q_OS_HURD) || defined(__GLIBC__)
+ # include <sys/vfs.h>
+ # ifdef QT_LINUXBASE
+    // LSB 3.2 has statfs in sys/statfs.h, sys/vfs.h is just an empty dummy header
diff --git a/debian/patches/series b/debian/patches/series
index e8e9f45..036cc21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ findpythonlibrary_layout_deb_on_debian.diff
 ktar_header_checksum_fix.diff
 ktar_longlink_length_in_bytes.diff
 nepomuk_unicode.diff
+glibc_filesystem.diff

-- 
KDE Development Platform Libraries module packaging



More information about the pkg-kde-commits mailing list