diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-15 16:58:00 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-15 16:58:00 +0000 |
commit | 434d713861b70f6c6563d6ee50a8e64f14c970d9 (patch) | |
tree | b72c523c72e764420f835ba9d63d43ffef687dcf /kde-frameworks/kfilemetadata | |
parent | f78108598211053d41752a83e0345441bb9014ae (diff) |
gentoo resync : 15.02.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.43.0.ebuild (renamed from kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild) | 8 |
3 files changed, 8 insertions, 51 deletions
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest index a241aeb91bc6..ccd58540f00d 100644 --- a/kde-frameworks/kfilemetadata/Manifest +++ b/kde-frameworks/kfilemetadata/Manifest @@ -1,6 +1,5 @@ -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.42.0.tar.xz 218916 BLAKE2B 03d5ac621d4cd032ff58756069861a045c5a2236ad3c1dc75f82cef9b6dc3eb7c263cf98865899a4d69c31582afd221373a07ca8538c718ff6ef91c2b7267547 SHA512 496876dde432e0884b883e112daaa11c2fe85d2a97bde2124b04571e4f9d1516cc81ef1d80eb3043a5d43f2febe79481f1a2c299ee9e96883342f8563002c62f +DIST kfilemetadata-5.43.0.tar.xz 219608 BLAKE2B 5b344ac9990e399cf3b4c8b28b6667e902691541672e811295a7e3ba16f652b4e8dc10728040d2ac60dbc7778e5bd27e64b38ed8f2116589a9899b9b5b86f5ff SHA512 0e669ae832aeef2a54e6a26df5541d607301e13798082e716f6caf682d4e28d87d7eb0a4487c7f2c8bfee0311a5a3342238dfa806413fccb20d3cfbf6b8733be EBUILD kfilemetadata-5.40.0.ebuild 1613 BLAKE2B 174f3bb47d94cb4af9c302d0523e21436f1f1d0c9f177ad2b157346b1ff8633db8c429b795c5c0ae539870d9d893487d34b499ccdbdd2bece9f96006cf561e58 SHA512 65aa9bbfa840db315245a0cfbe9ad51ac4d791fec92d1d7e29a9fa91189703a962a9aa530220828efaf0e4a3e3af09b617ba22280440e89ce46481a851b6760f -EBUILD kfilemetadata-5.42.0.ebuild 1536 BLAKE2B 6e77df2ddde0969548b5fc84475b1b507c87d58f246c3ccd9307b83bf955080098560915704f1eb74a942ce4bd0e17adfce48b8f5d54748d6a8b7e7485f8b888 SHA512 0404bedf61583d6f844f8f037e140676d8b7a4c303eebceca9db7de09fe65bce6c4f218beaf5934af78a2a2b121cfbe9f5124b7a21329fd543cc890b4f1f5d9b +EBUILD kfilemetadata-5.43.0.ebuild 1629 BLAKE2B ac85f92e0de0a01162b6acc7b6eda254d0c1f0b2357b140ee4a30d9bc7bad12d44124d0e95b847ae2444147eb3ef05e489b596c67dc37ef163aea5303bfff181 SHA512 05bd952011ce8ca0fe029fb7a5fa09a5a503d3ff689316776f77244af29da79f53fcda3222e201bf984f6996dbacc67bcbf636958b78c0b142c24f06823223ca 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 deleted file mode 100644 index 4d86297b19ca..000000000000 --- a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.42.0-xattr-header.patch +++ /dev/null @@ -1,46 +0,0 @@ -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.42.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.43.0.ebuild index 5b26202d02f7..eed8f6443f9c 100644 --- a/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild +++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.43.0.ebuild @@ -28,8 +28,6 @@ DEPEND="${RDEPEND} test? ( ${PYTHON_DEPS} ) " -PATCHES=( "${FILESDIR}/${P}-xattr-header.patch" ) - pkg_setup() { use test && python-any-r1_pkg_setup kde5_pkg_setup @@ -48,6 +46,12 @@ src_configure() { kde5_src_configure } +src_test() { + # FIXME: bug 644650, fails on tmpfs (but not for everyone) + local myctestargs=( -E "(usermetadatawritertest)" ) + kde5_src_test +} + pkg_postinst() { kde5_pkg_postinst |