[packages/kf5-kfilemetadata] - rel 3; fix build with newer attr-devel
arekm
arekm at pld-linux.org
Sun Apr 29 21:44:38 CEST 2018
commit 85bda07c152e76a5434cf435e36791b8999ca793
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Apr 29 21:44:30 2018 +0200
- rel 3; fix build with newer attr-devel
kf5-kfilemetadata.spec | 4 +++-
xattr.patch | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 1 deletion(-)
---
diff --git a/kf5-kfilemetadata.spec b/kf5-kfilemetadata.spec
index 3692c1b..4726aea 100644
--- a/kf5-kfilemetadata.spec
+++ b/kf5-kfilemetadata.spec
@@ -11,11 +11,12 @@
Summary: File metadata and extraction library
Name: kf5-%{kfname}
Version: 5.39.0
-Release: 2
+Release: 3
License: GPL v2+/LGPL v2.1+
Group: X11/Libraries
Source0: http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
# Source0-md5: 1d3c50629123cf5eabf94fba87ff0be9
+Patch0: xattr.patch
URL: http://www.kde.org/
BuildRequires: Qt5Core-devel >= %{qtver}
BuildRequires: Qt5Gui-devel >= %{qtver}
@@ -58,6 +59,7 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
%prep
%setup -q -n %{kfname}-%{version}
+%patch0 -p1
%build
install -d build
diff --git a/xattr.patch b/xattr.patch
new file mode 100644
index 0000000..8594c6d
--- /dev/null
+++ b/xattr.patch
@@ -0,0 +1,53 @@
+From 4bbc7a2f5c77921e687f33e84e79776859eddfdb Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c at gentoo.org>
+Date: Tue, 16 Jan 2018 18:57:31 +0100
+Subject: [PATCH] Fix build with >=attr-2.4.48
+
+Summary: It was looking for long deprecated attr/xattr.h header.
+
+Test Plan: Built fine with attr-2.4.47 and 2.4.48.
+
+Reviewers: #frameworks, mgallien
+
+Reviewed By: mgallien
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D9880
+---
+ 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>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kf5-kfilemetadata.git/commitdiff/85bda07c152e76a5434cf435e36791b8999ca793
More information about the pld-cvs-commit
mailing list