diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-16 17:34:21 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-16 17:34:21 +0000 |
commit | 02e2208f46f4e2c00fb9743cbc47350bdd233bfa (patch) | |
tree | 132dd60828854db4f65f30f9230f43d9602507ff /kde-frameworks/kfilemetadata | |
parent | 8be70107efbb417f839292165ee39d07a062046f (diff) |
gentoo resync : 16.01.2018
Diffstat (limited to 'kde-frameworks/kfilemetadata')
-rw-r--r-- | kde-frameworks/kfilemetadata/Manifest | 5 | ||||
-rw-r--r-- | kde-frameworks/kfilemetadata/files/kfilemetadata-5.42.0-xattr-header.patch | 46 | ||||
-rw-r--r-- | kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild (renamed from kde-frameworks/kfilemetadata/kfilemetadata-5.41.0.ebuild) | 6 |
3 files changed, 51 insertions, 6 deletions
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest index 04de2de1cc6f..a241aeb91bc6 100644 --- a/kde-frameworks/kfilemetadata/Manifest +++ b/kde-frameworks/kfilemetadata/Manifest @@ -1,5 +1,6 @@ +AUX kfilemetadata-5.42.0-xattr-header.patch 1287 BLAKE2B fbd50deb4236630eddaaed84c3ea89c8b4a41efb1ef5c960f7668a03a5bb6f152239cc88e6e4d3957986f21ec4958ba202cee5c43fe97191f3f169f5443d89bd SHA512 f18b3b336b913abcb4fb6428aad9a4b32f094f1760454d9fd366d659889fda3bcc549f0ce81bdde084cc40d95db013e9fd869927c1d579d386d1e040f7bd7621 DIST kfilemetadata-5.40.0.tar.xz 219196 BLAKE2B abeda591043350e1b11de352f897f76110b1ea472ccfc210739c68d50715fb8687fae4d9c6281c48592f563a82ad8f454660349dee020a80bab2b967e598367f SHA512 b3f632af0847dd3bed8bf0214e3786fe72ffbdc90454d7a2117e8b30023c43b594a27c5811a6e77d1e46a68261e950a5dc016b9ae6f80f3db539c29eaa53297d -DIST kfilemetadata-5.41.0.tar.xz 220236 BLAKE2B 366866964b44e02c61f9918860e8582fa8a55e9f1e0ad80aeb4361afcfc7f6738709a211cc6ffdbf0fa63cfbd91753c6d1846e5c9c1b4f104f514e2824ab74d9 SHA512 79d9322b1b7c21809f287a555b4577eb885248becb7bd7236b40d446c0e5fe154778d9784d3bc06efd8697c485b01a2bfa042aee2911d49b2f31faca0706af15 +DIST kfilemetadata-5.42.0.tar.xz 218916 BLAKE2B 03d5ac621d4cd032ff58756069861a045c5a2236ad3c1dc75f82cef9b6dc3eb7c263cf98865899a4d69c31582afd221373a07ca8538c718ff6ef91c2b7267547 SHA512 496876dde432e0884b883e112daaa11c2fe85d2a97bde2124b04571e4f9d1516cc81ef1d80eb3043a5d43f2febe79481f1a2c299ee9e96883342f8563002c62f EBUILD kfilemetadata-5.40.0.ebuild 1613 BLAKE2B 174f3bb47d94cb4af9c302d0523e21436f1f1d0c9f177ad2b157346b1ff8633db8c429b795c5c0ae539870d9d893487d34b499ccdbdd2bece9f96006cf561e58 SHA512 65aa9bbfa840db315245a0cfbe9ad51ac4d791fec92d1d7e29a9fa91189703a962a9aa530220828efaf0e4a3e3af09b617ba22280440e89ce46481a851b6760f -EBUILD kfilemetadata-5.41.0.ebuild 1601 BLAKE2B ddd062e337c1c37df3b18bef67e2d2c5289bc0935e840f6e700fdad4c66e75d564c29c2936f532fc2560b936483b7b28292c8055deccc8cc5ce0d7f3d900187d SHA512 36a1dcf40cba78fd4fb8ecdc133ee458ab16f2d290fce3811e0da01d886bb3fb0a65c1577abc4fbf7662cf1a88ae1d6f8cddb4fd661c12b5f52082dc36b5e22f +EBUILD kfilemetadata-5.42.0.ebuild 1536 BLAKE2B 6e77df2ddde0969548b5fc84475b1b507c87d58f246c3ccd9307b83bf955080098560915704f1eb74a942ce4bd0e17adfce48b8f5d54748d6a8b7e7485f8b888 SHA512 0404bedf61583d6f844f8f037e140676d8b7a4c303eebceca9db7de09fe65bce6c4f218beaf5934af78a2a2b121cfbe9f5124b7a21329fd543cc890b4f1f5d9b MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1 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 000000000000..4d86297b19ca --- /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 <polynomial-c@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.41.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild index c9b9c841b040..5b26202d02f7 100644 --- a/kde-frameworks/kfilemetadata/kfilemetadata-5.41.0.ebuild +++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,14 +22,13 @@ RDEPEND=" office? ( $(add_frameworks_dep karchive) ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) - !taglib? ( $(add_qt_dep qtmultimedia) ) " DEPEND="${RDEPEND} kernel_linux? ( sys-apps/attr ) test? ( ${PYTHON_DEPS} ) " -RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${P}-xattr-header.patch" ) pkg_setup() { use test && python-any-r1_pkg_setup @@ -44,7 +43,6 @@ src_configure() { $(cmake-utils_use_find_package office KF5Archive) $(cmake-utils_use_find_package pdf Poppler) $(cmake-utils_use_find_package taglib Taglib) - $(cmake-utils_use_find_package !taglib Qt5Multimedia) ) kde5_src_configure |