commit: 06be4ad32665a4bd1dbc8907ffd94f9ed3ba0d4b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jan 14 21:40:06 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jan 14 21:41:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06be4ad3
kde-frameworks/kfilemetadata: Fix build with >=sys-apps/attr-2.4.48 Thanks-to: Lars Wendler <polynomial-c <AT> gentoo.org> Bug: https://bugs.gentoo.org/644594 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../files/kfilemetadata-5.42.0-xattr-header.patch | 46 ++++++++++++++++++++++ .../kfilemetadata/kfilemetadata-5.42.0.ebuild | 2 + 2 files changed, 48 insertions(+) diff --git a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.42.0-xattr-header.patch b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.42.0-xattr-header.patch new file mode 100644 index 00000000000..4d86297b19c --- /dev/null +++ b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.42.0-xattr-header.patch @@ -0,0 +1,46 @@ +From 6de64a4e3f2713c0096eb7ee1ba52e5fbbbc401f Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomia...@gentoo.org> +Date: Sun, 14 Jan 2018 22:29:25 +0100 +Subject: [PATCH] Fix build with >=attr-2.4.48 + +It was looking for long deprecated attr/xattr.h header. +--- + cmake/FindXattr.cmake | 2 +- + src/xattr_p.h | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/cmake/FindXattr.cmake b/cmake/FindXattr.cmake +index 3004061..a33f316 100644 +--- a/cmake/FindXattr.cmake ++++ b/cmake/FindXattr.cmake +@@ -13,7 +13,7 @@ if (XATTR_INCLUDE_DIRS AND XATTR_LIBRARIES) + set(XATTR_FOUND TRUE) + else () + +- find_path(XATTR_INCLUDE attr/xattr.h ++ find_path(XATTR_INCLUDE sys/xattr.h + /usr/include + /usr/local/include + ${CMAKE_INCLUDE_PATH} +diff --git a/src/xattr_p.h b/src/xattr_p.h +index 4663347..542c021 100644 +--- a/src/xattr_p.h ++++ b/src/xattr_p.h +@@ -32,13 +32,11 @@ + #include <sys/types.h> + #include <sys/xattr.h> + +-#if defined(Q_OS_ANDROID) ++#if defined(Q_OS_ANDROID) || defined(Q_OS_LINUX) + // attr/xattr.h is not available in the Android NDK so we are defining ENOATTR ourself + #ifndef ENOATTR + # define ENOATTR ENODATA /* No such attribute */ + #endif +-#else +-#include <attr/xattr.h> + #endif + + #include <errno.h> +-- +2.15.1 + diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild index 602d33e4a94..5b26202d02f 100644 --- a/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild +++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild @@ -28,6 +28,8 @@ DEPEND="${RDEPEND} test? ( ${PYTHON_DEPS} ) " +PATCHES=( "${FILESDIR}/${P}-xattr-header.patch" ) + pkg_setup() { use test && python-any-r1_pkg_setup kde5_pkg_setup
