[SCM] baloo packaging branch, master, updated. ubuntu/5.13.0-0ubuntu1-90-g484cab4
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Sep 1 07:57:36 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/baloo.git;a=commitdiff;h=ddcdce4
The following commit has been merged in the master branch:
commit ddcdce4be6bdf74a9a4cf4f3974411aa811e648e
Author: Pino Toscano <pino at debian.org>
Date: Thu Jun 19 12:15:22 2014 +0200
really fix xattr build on !linux OSes
backport also upstream 01f3fff52d63302e6970a088710ec6b692b1b470 and
07278894f3a00a3c4ca5ce7d62721c0edfddfb69
---
debian/changelog | 10 +++--
debian/patches/series | 2 +
...r-do-not-use-on-glibc-if-not-implemented.patch} | 37 ++++++++-----------
...tream_xattr-fix-fallback-in-no-xattr-OSes.patch | 43 ++++++++++++++++++++++
4 files changed, 67 insertions(+), 25 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 66d8666..0ad0c67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
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.
+ * Backport upstream commits 01f3fff52d63302e6970a088710ec6b692b1b470,
+ b538865e6069a61c8cf467622f3dccef2bac115e and
+ 07278894f3a00a3c4ca5ce7d62721c0edfddfb69 to fix build on glibc-based OSes
+ different than Linux; patches
+ upstream_xattr-fix-fallback-in-no-xattr-OSes.patch,
+ upstream_xattr-use-the-linux-xattr-impl-on-any-glibc-based-OS.patch, and
+ upstream_xattr-do-not-use-on-glibc-if-not-implemented.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 589aa7c..6d88dfe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
disable_tests_depending_on_revdep
+upstream_xattr-fix-fallback-in-no-xattr-OSes.patch
upstream_xattr-use-the-linux-xattr-impl-on-any-glibc-based-OS.patch
+upstream_xattr-do-not-use-on-glibc-if-not-implemented.patch
diff --git a/debian/patches/upstream_xattr-use-the-linux-xattr-impl-on-any-glibc-based-OS.patch b/debian/patches/upstream_xattr-do-not-use-on-glibc-if-not-implemented.patch
similarity index 63%
copy from debian/patches/upstream_xattr-use-the-linux-xattr-impl-on-any-glibc-based-OS.patch
copy to debian/patches/upstream_xattr-do-not-use-on-glibc-if-not-implemented.patch
index 4208dc3..ce9b65d 100644
--- a/debian/patches/upstream_xattr-use-the-linux-xattr-impl-on-any-glibc-based-OS.patch
+++ b/debian/patches/upstream_xattr-do-not-use-on-glibc-if-not-implemented.patch
@@ -1,31 +1,24 @@
-From b538865e6069a61c8cf467622f3dccef2bac115e Mon Sep 17 00:00:00 2001
+From 07278894f3a00a3c4ca5ce7d62721c0edfddfb69 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
+Date: Thu, 19 Jun 2014 12:05:30 +0200
+Subject: [PATCH] xattr: do not use on glibc if not implemented
+check for the defines that mark the functions as stubs, avoid using
+them in that case
---
- src/file/lib/baloo_xattr_p.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ src/file/lib/baloo_xattr_p.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/file/lib/baloo_xattr_p.h b/src/file/lib/baloo_xattr_p.h
-index c323dfe..0dc963d 100644
+index 0dc963d..87dc55f 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__)
+-#if defined(Q_OS_LINUX) || defined(__GLIBC__)
++#if defined(Q_OS_LINUX) || (defined(__GLIBC__) && !defined(__stub_getxattr))
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);
@@ -33,8 +26,8 @@ index c323dfe..0dc963d 100644
QByteArray data(size, Qt::Uninitialized);
--#if defined(Q_OS_LINUX)
-+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
+-#if defined(Q_OS_LINUX) || defined(__GLIBC__)
++#if defined(Q_OS_LINUX) || (defined(__GLIBC__) && !defined(__stub_getxattr))
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);
@@ -42,11 +35,11 @@ index c323dfe..0dc963d 100644
const size_t valueSize = v.size();
--#if defined(Q_OS_LINUX)
-+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
+-#if defined(Q_OS_LINUX) || defined(__GLIBC__)
++#if defined(Q_OS_LINUX) || (defined(__GLIBC__) && !defined(__stub_setxattr))
return setxattr(encodedPath, attributeName, attributeValue, valueSize, 0);
#elif defined(Q_OS_MAC)
return setxattr(encodedPath, attributeName, attributeValue, valueSize, 0, 0);
--
-2.0.0.rc2
+2.0.0
diff --git a/debian/patches/upstream_xattr-fix-fallback-in-no-xattr-OSes.patch b/debian/patches/upstream_xattr-fix-fallback-in-no-xattr-OSes.patch
new file mode 100644
index 0000000..9ef3de0
--- /dev/null
+++ b/debian/patches/upstream_xattr-fix-fallback-in-no-xattr-OSes.patch
@@ -0,0 +1,43 @@
+From 01f3fff52d63302e6970a088710ec6b692b1b470 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Thu, 29 May 2014 08:55:00 +0200
+Subject: [PATCH] xattr: fix fallback in no-xattr OSes
+
+---
+ src/file/lib/baloo_xattr_p.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/file/lib/baloo_xattr_p.h b/src/file/lib/baloo_xattr_p.h
+index de7bb42..c323dfe 100644
+--- a/src/file/lib/baloo_xattr_p.h
++++ b/src/file/lib/baloo_xattr_p.h
+@@ -51,7 +51,7 @@ inline ssize_t baloo_getxattr(const QString& path, const QString& name, QString*
+ const ssize_t size = getxattr(encodedPath, attributeName, NULL, 0, 0, 0);
+ #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+ const ssize_t size = extattr_get_file(encodedPath, EXTATTR_NAMESPACE_USER, attributeName, NULL, 0);
+-#elif defined(Q_OS_WIN)
++#else
+ const ssize_t size = 0;
+ #endif
+
+@@ -70,7 +70,7 @@ inline ssize_t baloo_getxattr(const QString& path, const QString& name, QString*
+ const ssize_t r = getxattr(encodedPath, attributeName, data.data(), size, 0, 0);
+ #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+ const ssize_t r = extattr_get_file(encodedPath, EXTATTR_NAMESPACE_USER, attributeName, data.data(), size);
+-#elif defined(Q_OS_WIN)
++#else
+ const ssize_t r = 0;
+ #endif
+
+@@ -98,7 +98,7 @@ inline int baloo_setxattr(const QString& path, const QString& name, const QStrin
+ #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+ const ssize_t count = extattr_set_file(encodedPath, EXTATTR_NAMESPACE_USER, attributeName, attributeValue, valueSize);
+ return count == -1 ? -1 : 0;
+-#elif defined(Q_OS_WIN)
++#else
+ return -1;
+ #endif
+ }
+--
+2.0.0
+
--
baloo packaging
More information about the pkg-kde-commits
mailing list