diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
commit | 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch) | |
tree | 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /kde-frameworks/kcoreaddons | |
parent | 957235cf19a691360c720f7913672adda4258ed0 (diff) |
gentoo resync : 22.10.2018
Diffstat (limited to 'kde-frameworks/kcoreaddons')
-rw-r--r-- | kde-frameworks/kcoreaddons/Manifest | 7 | ||||
-rw-r--r-- | kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch | 56 | ||||
-rw-r--r-- | kde-frameworks/kcoreaddons/kcoreaddons-5.50.0.ebuild | 8 | ||||
-rw-r--r-- | kde-frameworks/kcoreaddons/kcoreaddons-5.51.0.ebuild (renamed from kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild) | 16 |
4 files changed, 11 insertions, 76 deletions
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest index a498019fa0ac..9900295a2069 100644 --- a/kde-frameworks/kcoreaddons/Manifest +++ b/kde-frameworks/kcoreaddons/Manifest @@ -1,6 +1,5 @@ -AUX kcoreaddons-5.46.0-kformattest.patch 3537 BLAKE2B 8f662df8a950c6cd102dc18c67c18628ac1318d1a76a076af08e0e7d6dc7aa92b502196d209b0e544c67ab83bd6cfa6b86098f305b9bbd8f10cd7f6cfdab9d6b SHA512 8cd914a542f5ba35857f8378b28413649fe27761d4a000589972b8ec25d1effda8e4f7d9e07c04f9e168af1d892051b263b8b61da42cb6b7be6a7643c2c31729 -DIST kcoreaddons-5.46.0.tar.xz 350224 BLAKE2B dee0f20b3f35a1f787f263e080a0e4641222b4a9e7f3a8eca736b97a4688ecfa30f26c3040cb655bdb47852381a6810dec712f8a426181bb24b680270a41e6bb SHA512 3c12462729a163fc7ab5a49ea9473b94d44ad4276243d65bcbe10a28fe6c1c4a9996bdf09c4f03b0083b4dff97e1719eb1aaf8b7d8dc882d4f66de61e7ef416a DIST kcoreaddons-5.50.0.tar.xz 352664 BLAKE2B 656cbdc21fc97596ab51f23050f3c4eebdb8c73df37fb1799521da19d16ba97c8bd5c31749dc3c881d8064a011028b94ec29dadcb5a367f65523d85294172c5d SHA512 3b8f50b2775425363b83048ab78bb7999dcdfa522a4d8d002292cbaf6975747b5159687c2ce4737b17404b999ec2d6894a3acd23873480ae7376e9134f1ea887 -EBUILD kcoreaddons-5.46.0.ebuild 871 BLAKE2B 65e7ef39d3d460059564b8757c03c5e43e200cf696783302435954938b7c4ec0b168d29444defa00b6828bed0dfd87fed463a1c3088e3db834d14db43554ca45 SHA512 0b49e20f67f15a317fefb60c71fc9934cea5e765ba156f4e2a00ec6a981b4a4d1c9f097f9b42bc2b617a6ec114fe99b334697f9514d888cb9654c3c20fffef6d -EBUILD kcoreaddons-5.50.0.ebuild 731 BLAKE2B 055f5add0ea3bfd79aa2955aabeb9ea891a82715cf9611884ae07e13ec4ca4f5d8d94e141e91423add3a4d35db2025da22d57b16300b7ca996c20927f28071a3 SHA512 a0559e6e94b565853bba672dbacbdf961fe43f938ad3add4d0dac9b95a6bb5759a2c66bd5e71fb41aa0476bcedfeb6479063e123407d872b6d58b76301776eec +DIST kcoreaddons-5.51.0.tar.xz 352668 BLAKE2B 03c126ca7a0ca9d7666efe6b9932373beb1cee533c3dc5a0e4b9c58fecd4bd2cb180cd294ad83fb1e730f005bb59984cf57006dfa51795a20b849f07f5d6829d SHA512 3b97ae7d161b8bd2d5d26491a5c0f07664ad238580fff802ad3a283803adf0725b67d5a9a473ed05ef02e5b0a454ac8d089abfe93ad3e8e24bc26ed0028e2f86 +EBUILD kcoreaddons-5.50.0.ebuild 746 BLAKE2B 486f998bf3a1e423bddffe4dd15f232ba1ca41edc3e997bf7bce1fd9128c1b92d18b6d10808cb6fbb6e61def2fe64b453653596e1d2f57c57cd4f77e9d528cc8 SHA512 2f3cd8868518178eb605697e56654d77849aaa5b935ae7ea4c40eb1b435d282080c99d3f357cd55fefc5f775e6003cf51bbc47935a6d001984405f196adfe90e +EBUILD kcoreaddons-5.51.0.ebuild 748 BLAKE2B 0d4607796a2ac6177cce05f439bb8bbe7425f6adc52383e6d1f4572034f8463662ec2289db7f1220be054cf0079da2999eb9e3360df2a5816ae3f0809a252585 SHA512 ed023f1ec7d019bc3ec03820bc8d9966d41c86ba738f4e5652c45c426124abc13a2459d94c84677305ea29ff44bf45382de600b9e821cd78f9cadf661bc6c17e MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch deleted file mode 100644 index 64031659fdda..000000000000 --- a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Maximiliano Curia <maxy@gnuservers.com.ar> -Date: Tue, 15 May 2018 13:06:53 +0200 -Subject: fix kformattest plural forms - ---- - autotests/kformattest.cpp | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/autotests/kformattest.cpp b/autotests/kformattest.cpp -index 15080be..6cc3c52 100644 ---- a/autotests/kformattest.cpp -+++ b/autotests/kformattest.cpp -@@ -248,8 +248,8 @@ void KFormatTest::formatDecimalDuration() - { - KFormat format(QLocale::c()); - -- QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 millisecond(s)")); -- QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 millisecond(s)")); -+ QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 milliseconds")); -+ QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 milliseconds")); - QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 10), QStringLiteral("1.01 seconds")); - QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 1, 3), QStringLiteral("1.001 seconds")); - QCOMPARE(format.formatDecimalDuration(1 * MSecsInMinute + 10 * MSecsInSecond), QStringLiteral("1.17 minutes")); -@@ -264,22 +264,22 @@ void KFormatTest::formatSpelloutDuration() - { - KFormat format(QLocale::c()); - -- QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second(s)")); -- QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 second(s)")); -- QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute(s)")); -- QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minute(s)")); -- QCOMPARE(format.formatSpelloutDuration(3600000), QStringLiteral("1 hour(s)")); -- QCOMPARE(format.formatSpelloutDuration(18000000), QStringLiteral("5 hour(s)")); -- QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute(s) and 15 second(s)")); -+ QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second")); -+ QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 seconds")); -+ QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute")); -+ QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minutes")); -+ QCOMPARE(format.formatSpelloutDuration(3600000), QStringLiteral("1 hour")); -+ QCOMPARE(format.formatSpelloutDuration(18000000), QStringLiteral("5 hours")); -+ QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute and 15 seconds")); - // Problematic case #1 (there is a reference to this case on kformat.cpp) -- QCOMPARE(format.formatSpelloutDuration(119999), QStringLiteral("2 minute(s)")); -+ QCOMPARE(format.formatSpelloutDuration(119999), QStringLiteral("2 minutes")); - // This case is strictly 2 hours, 15 minutes and 59 seconds. However, since the range is - // pretty high between hours and seconds, formatSpelloutDuration always omits seconds when there - // are hours in scene. -- QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hour(s) and 15 minute(s)")); -+ QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hours and 15 minutes")); - // This case is strictly 1 hour and 10 seconds. For the same reason, formatSpelloutDuration - // detects that 10 seconds is just garbage compared to 1 hour, and omits it on the result. -- QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour(s)")); -+ QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour")); - } - - void KFormatTest::formatRelativeDate() diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.50.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.50.0.ebuild index 4e70e58a430e..dde9a03ac18f 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-5.50.0.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.50.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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=" @@ -29,10 +29,10 @@ src_configure() { } src_test() { - # bugs: 619656, 632398, 647414 + # bugs: 619656, 632398, 647414, 665682 local myctestargs=( -j1 - -E "(kautosavefiletest|kdirwatch_qfswatch_unittest)" + -E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kformattest)" ) kde5_src_test diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.51.0.ebuild index 79d94804dd54..6241035aa32c 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.51.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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=" @@ -19,14 +19,6 @@ DEPEND="${RDEPEND} nls? ( $(add_qt_dep linguist-tools) ) " -src_prepare() { - # bug 650280 - has_version '<dev-qt/qtcore-5.10.0:5' && \ - eapply "${FILESDIR}/${P}-kformattest.patch" - - kde5_src_prepare -} - src_configure() { local mycmakeargs=( -D_KDE4_DEFAULT_HOME_POSTFIX=4 @@ -37,10 +29,10 @@ src_configure() { } src_test() { - # bugs: 619656, 632398, 647414 + # bugs: 619656, 632398, 647414, 665682 local myctestargs=( -j1 - -E "(kautosavefiletest|kdirwatch_qfswatch_unittest)" + -E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kformattest)" ) kde5_src_test |