[SCM] baloo packaging branch, master, updated. debian/4.13.1-1-24-ga23a630
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jul 30 12:31:25 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/baloo.git;a=commitdiff;h=97d9fe9
The following commit has been merged in the master branch:
commit 97d9fe94ff812c6552711e3dca628457240de24a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Jul 30 00:02:21 2014 +0200
Remove upstream applied patches
---
debian/changelog | 6 +++
debian/patches/series | 3 --
...tr-do-not-use-on-glibc-if-not-implemented.patch | 45 -------------------
...tream_xattr-fix-fallback-in-no-xattr-OSes.patch | 43 ------------------
...he-linux-xattr-impl-on-any-glibc-based-OS.patch | 52 ----------------------
5 files changed, 6 insertions(+), 143 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3e01629..1ab4925 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,12 @@ baloo (4:4.13.3-1) UNRELEASED; urgency=medium
[ Maximiliano Curia ]
* New upstream release.
+ * Remove upstream applied patch: upstream_xattr-do-not-use-on-glibc-
+ if-not-implemented.patch
+ * Remove upstream applied patch: upstream_xattr-fix-fallback-in-no-
+ xattr-OSes.patch
+ * Remove upstream applied patch: upstream_xattr-use-the-linux-xattr-
+ impl-on-any-glibc-based-OS.patch
-- Maximiliano Curia <maxy at debian.org> Wed, 16 Jul 2014 12:52:04 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 6d88dfe..fd393f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
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-do-not-use-on-glibc-if-not-implemented.patch b/debian/patches/upstream_xattr-do-not-use-on-glibc-if-not-implemented.patch
deleted file mode 100644
index ce9b65d..0000000
--- a/debian/patches/upstream_xattr-do-not-use-on-glibc-if-not-implemented.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 07278894f3a00a3c4ca5ce7d62721c0edfddfb69 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-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 | 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 0dc963d..87dc55f 100644
---- a/src/file/lib/baloo_xattr_p.h
-+++ b/src/file/lib/baloo_xattr_p.h
-@@ -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) || 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);
-@@ -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) || 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);
-@@ -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) || 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
-
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
deleted file mode 100644
index 9ef3de0..0000000
--- a/debian/patches/upstream_xattr-fix-fallback-in-no-xattr-OSes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-
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
deleted file mode 100644
index 4208dc3..0000000
--- a/debian/patches/upstream_xattr-use-the-linux-xattr-impl-on-any-glibc-based-OS.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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
More information about the pkg-kde-commits
mailing list