diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
commit | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch) | |
tree | cee0a97398040001220ece3cd48c3d568bcddb4a /kde-frameworks/kcoreaddons | |
parent | 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff) |
gentoo resync : 10.02.2019
Diffstat (limited to 'kde-frameworks/kcoreaddons')
-rw-r--r-- | kde-frameworks/kcoreaddons/Manifest | 7 | ||||
-rw-r--r-- | kde-frameworks/kcoreaddons/files/kcoreaddons-5.52.0-xdg_cache_home-nospace-crash.patch | 54 | ||||
-rw-r--r-- | kde-frameworks/kcoreaddons/kcoreaddons-5.54.0.ebuild | 2 | ||||
-rw-r--r-- | kde-frameworks/kcoreaddons/kcoreaddons-5.55.0.ebuild (renamed from kde-frameworks/kcoreaddons/kcoreaddons-5.52.0-r1.ebuild) | 18 |
4 files changed, 12 insertions, 69 deletions
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest index 12fa440932f7..3aa4838818c4 100644 --- a/kde-frameworks/kcoreaddons/Manifest +++ b/kde-frameworks/kcoreaddons/Manifest @@ -1,6 +1,5 @@ -AUX kcoreaddons-5.52.0-xdg_cache_home-nospace-crash.patch 2167 BLAKE2B 0460d3d0ef902149b2f40be6f5a1270415eece9b188c5daeb33f8a6bf46e4df55298fb9b8731297fe2f02bc0129cc2a2fd55e8cc4aab537cf15041cde30ad182 SHA512 e6a1fdaaabecea193a55c9768d5efe4cf8562fee20a62e4fed01f1f8a549f3fb40057db6942d5a865acafc34c762524d62319ac2473a48e3e5e9fc0ebbfff34a -DIST kcoreaddons-5.52.0.tar.xz 351716 BLAKE2B 041ead718713beaea9d87fcdbf124e1379eb3b7f9d6c82e43f60b74d23a87de7f55565b722e63db789eb5b11c0a7cf8b975ae42306297583979d8ab9c5257b49 SHA512 0f82e703e9071645cde95a89a5dd3b12da8a477be5d2e01a70c7f42a749d46d86ef44b4ccd4557bf3e23d1794607fa990eadcef6f4a431b775cbaa909e5b8442 DIST kcoreaddons-5.54.0.tar.xz 359608 BLAKE2B ceb4acda8bfb0d8dfbe31ae693bd069212267d18966be488632981b651d180aca2b4a581d2c73203584da922a698de14ab4a2632dcaf6d269618c0d53e044573 SHA512 8e4a2cd59a0ecdf09317e67aa20b96f37562035beb744d189856094bcb06944e175c78515374a8a090446e63c8174b2a949b744dff36f0e21c455a2cb5df5df9 -EBUILD kcoreaddons-5.52.0-r1.ebuild 813 BLAKE2B c3b431ecbc103ad7f2f82eac493f9d94809394532eb7b5e34100e1c994568bd629901d9b81b24985479ad2cf984bfc25ed2503209196914d58605ac943693000 SHA512 d7bb4ce4253e8d6e9c0206224661d7550d4b31f6a99e86fc82e56ce73b5a3f3953b445fe076c082437ed94933226a4290fe7c739f820875817e0f91b5ef51a7f -EBUILD kcoreaddons-5.54.0.ebuild 748 BLAKE2B a769e056354673caedaa2902678eaa1d67b9b70baba0651a7128d8f5c1124e2278b4a651afcc2dc209df352691cae0b275debba54da98e173c378028977d31d1 SHA512 375de64df818b4d13b8e1921499e31fa40354cdcef911548d68c13bd9b0974b48a2811f7ac899b7d97e9b2ab98b56462a0761cc3f73ecd6e1ffaccfc5b8086e5 +DIST kcoreaddons-5.55.0.tar.xz 359124 BLAKE2B 4778d0643c56152e55f8c585c14454aee355608787f9dc5b75a9bf802f84378943e57d3a292dc40392b962250d6cd52cc1071c5dea43cc05a71185fb82d158b5 SHA512 d643248abe8769eb19a4c443edcf8dd488cea18de80be1b9669dac09cefc6aaa9b2aa68decb7abc66f9ade6cf099246face692f1eb99b84244b3cdefec11bdb6 +EBUILD kcoreaddons-5.54.0.ebuild 746 BLAKE2B bbfe913d38e0c5495d428705e4399ceb23130048600fa90420314406f2cd4698614b51e5327a9e8cdb0f85db36ac113da715b185b75a1087d5f44fbc73d08cf5 SHA512 60b2d8cc90e06d7039395412d3bb58802c1b2aa174aef00726bdb13e8b076b1a4518fe765dc77b1188bed61d00880dc6fb0a154634aee4d89da5ba95cbe0a5b0 +EBUILD kcoreaddons-5.55.0.ebuild 731 BLAKE2B 5b81bbe4154a76b977a6b71f0c82b50c947eba0c273dfdf81f34f8dda1289b202cb5806c64a093cb5b2adcc834644709d0abf1123811ff6e0646c28c0cc0f124 SHA512 2045acf1f5671b89baf068538954ea1129e58bb38b6eee14c6ad2e28685c9bcb95fcabf62ddf475a0d59a6f0cf418a28ffd98cd779694278576639396f470596 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.52.0-xdg_cache_home-nospace-crash.patch b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.52.0-xdg_cache_home-nospace-crash.patch deleted file mode 100644 index 7b1a79652927..000000000000 --- a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.52.0-xdg_cache_home-nospace-crash.patch +++ /dev/null @@ -1,54 +0,0 @@ -From eb916c305a5cd8683e7e8f955740a7c810220e19 Mon Sep 17 00:00:00 2001 -From: Alexey Min <alexey.min@gmail.com> -Date: Thu, 8 Nov 2018 00:28:30 +0300 -Subject: Fix crash if XDG_CACHE_HOME directory is too small or out of space - -Summary: -Incorrect checking for error return code of posix_fallocate() causes function to think that everything is OK, while it is not, causing crash in some cases. - -BUG: 400610 -CCBUG: 339829 - -Test Plan: -good test plan provided in https://bugs.kde.org/show_bug.cgi?id=400610 . Works like a charm, tested in KDE Neon dev-ustable - -The reason for bug was that return value of posix_fallocate() was assumed to be negative on error, but in fact it is a positive integer. The check was `< 0`, whi should be `!= 0`. ( http://man7.org/linux/man-pages/man3/posix_fallocate.3.html ) - -With this fix applied test application does not crash, and the output in console widow is: -``` -No space left on device. Check filesystem free space at your XDG_CACHE_HOME! -The operating system is unable to promise 10547304 bytes for mapped cache, abandoning the cache for crash-safety. -org.kde.kcoreaddons: Failed to establish shared memory mapping, will fallback to private memory -- memory usage will increase -``` - -Reviewers: dfaure, #frameworks, mpyne - -Reviewed By: dfaure - -Subscribers: cfeck, kde-frameworks-devel - -Tags: #frameworks - -Differential Revision: https://phabricator.kde.org/D16744 ---- - src/lib/caching/kshareddatacache_p.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/lib/caching/kshareddatacache_p.h b/src/lib/caching/kshareddatacache_p.h -index 625bc5d..c13275b 100644 ---- a/src/lib/caching/kshareddatacache_p.h -+++ b/src/lib/caching/kshareddatacache_p.h -@@ -472,7 +472,10 @@ static bool ensureFileAllocated(int fd, size_t fileSize) - ; - } - -- if (result < 0) { -+ if (result != 0) { -+ if (result == ENOSPC) { -+ qCritical() << "No space left on device. Check filesystem free space at your XDG_CACHE_HOME!"; -+ } - qCritical() << "The operating system is unable to promise" - << fileSize - << "bytes for mapped cache, " --- -cgit v0.11.2 diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.54.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.54.0.ebuild index 0fc33e985d53..85f48f9e83c8 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-5.54.0.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.54.0.ebuild @@ -7,7 +7,7 @@ inherit kde5 DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="fam nls" RDEPEND=" diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.52.0-r1.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.55.0.ebuild index 57a2101a0929..8edceeab04a8 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-5.52.0-r1.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.55.0.ebuild @@ -1,25 +1,23 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit kde5 DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more" LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="fam nls" -RDEPEND=" +BDEPEND=" + nls? ( $(add_qt_dep linguist-tools) ) +" +DEPEND=" $(add_qt_dep qtcore 'icu') fam? ( virtual/fam ) " -DEPEND="${RDEPEND} - x11-misc/shared-mime-info - nls? ( $(add_qt_dep linguist-tools) ) -" - -PATCHES=( "${FILESDIR}/${P}-xdg_cache_home-nospace-crash.patch" ) +RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( |