[SCM] baloo packaging branch, master, updated. ubuntu/5.13.0-0ubuntu1-90-g484cab4

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/baloo.git;a=commitdiff;h=d1a7802

The following commit has been merged in the master branch:
commit d1a78024adf60eefcfa369d4dfbd4bc837a630c7
Author: Pino Toscano <pino at debian.org>
Date:   Thu May 29 09:07:08 2014 +0200

    fix build on glibc-based OSes different than Linux
    
    backport upstream commit b538865e6069a61c8cf467622f3dccef2bac115e
---
 debian/changelog                                   |  4 ++
 debian/patches/series                              |  1 +
 ...he-linux-xattr-impl-on-any-glibc-based-OS.patch | 52 ++++++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 84dfdb6..66d8666 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 baloo (4:4.13.1-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit b538865e6069a61c8cf467622f3dccef2bac115e to fix
+    build on glibc-based OSes different than Linux; patch
+    upstream_xattr-use-the-linux-xattr-impl-on-any-glibc-based-OS.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 May 2014 09:02:51 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index fd393f8..589aa7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable_tests_depending_on_revdep
+upstream_xattr-use-the-linux-xattr-impl-on-any-glibc-based-OS.patch
diff --git a/debian/patches/upstream_xattr-use-the-linux-xattr-impl-on-any-glibc-based-OS.patch b/debian/patches/upstream_xattr-use-the-linux-xattr-impl-on-any-glibc-based-OS.patch
new file mode 100644
index 0000000..4208dc3
--- /dev/null
+++ b/debian/patches/upstream_xattr-use-the-linux-xattr-impl-on-any-glibc-based-OS.patch
@@ -0,0 +1,52 @@
+From b538865e6069a61c8cf467622f3dccef2bac115e Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Thu, 29 May 2014 09:00:52 +0200
+Subject: [PATCH] xattr: use the linux xattr impl on any glibc-based OS
+
+---
+ src/file/lib/baloo_xattr_p.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/file/lib/baloo_xattr_p.h b/src/file/lib/baloo_xattr_p.h
+index c323dfe..0dc963d 100644
+--- a/src/file/lib/baloo_xattr_p.h
++++ b/src/file/lib/baloo_xattr_p.h
+@@ -25,7 +25,7 @@
+ #include <QFile>
+ #include <QString>
+ 
+-#if defined(Q_OS_LINUX)
++#if defined(Q_OS_LINUX) || defined(__GLIBC__)
+ #include <sys/types.h>
+ #include <sys/xattr.h>
+ #elif defined(Q_OS_MAC)
+@@ -45,7 +45,7 @@ inline ssize_t baloo_getxattr(const QString& path, const QString& name, QString*
+     const char* attributeName = n.constData();
+ 
+     // First get the size of the data we are going to get to reserve the right amount of space.
+-#if defined(Q_OS_LINUX)
++#if defined(Q_OS_LINUX) || defined(__GLIBC__)
+     const ssize_t size = getxattr(encodedPath, attributeName, NULL, 0);
+ #elif defined(Q_OS_MAC)
+     const ssize_t size = getxattr(encodedPath, attributeName, NULL, 0, 0, 0);
+@@ -64,7 +64,7 @@ inline ssize_t baloo_getxattr(const QString& path, const QString& name, QString*
+ 
+     QByteArray data(size, Qt::Uninitialized);
+ 
+-#if defined(Q_OS_LINUX)
++#if defined(Q_OS_LINUX) || defined(__GLIBC__)
+     const ssize_t r = getxattr(encodedPath, attributeName, data.data(), size);
+ #elif defined(Q_OS_MAC)
+     const ssize_t r = getxattr(encodedPath, attributeName, data.data(), size, 0, 0);
+@@ -91,7 +91,7 @@ inline int baloo_setxattr(const QString& path, const QString& name, const QStrin
+ 
+     const size_t valueSize = v.size();
+ 
+-#if defined(Q_OS_LINUX)
++#if defined(Q_OS_LINUX) || defined(__GLIBC__)
+     return setxattr(encodedPath, attributeName, attributeValue, valueSize, 0);
+ #elif defined(Q_OS_MAC)
+     return setxattr(encodedPath, attributeName, attributeValue, valueSize, 0, 0);
+-- 
+2.0.0.rc2
+

-- 
baloo packaging