| 1 |
commit: 5620ce2e0d5b6728069f81787fd2420b1d3715f2 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 13 17:00:24 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 13 17:00:24 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5620ce2e |
| 7 |
|
| 8 |
kde-frameworks/kcoreaddons: Revert Debian patch for kformattest |
| 9 |
|
| 10 |
This was fixed within kde-frameworks/plasma-5.47.0. |
| 11 |
Upstream commit d15f0fa8322dc2632f15024457bea41e7dd058d7 |
| 12 |
|
| 13 |
This reverts commit 8b24d9fc2dc8edaa4f3c1acdd9630aef948d0862. |
| 14 |
|
| 15 |
.../files/kcoreaddons-5.46.0-kformattest.patch | 56 ---------------------- |
| 16 |
kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild | 8 ---- |
| 17 |
2 files changed, 64 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index 64031659fd..0000000000 |
| 22 |
--- a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,56 +0,0 @@ |
| 25 |
-From: Maximiliano Curia <maxy@××××××××××××××.ar> |
| 26 |
-Date: Tue, 15 May 2018 13:06:53 +0200 |
| 27 |
-Subject: fix kformattest plural forms |
| 28 |
- |
| 29 |
---- |
| 30 |
- autotests/kformattest.cpp | 24 ++++++++++++------------ |
| 31 |
- 1 file changed, 12 insertions(+), 12 deletions(-) |
| 32 |
- |
| 33 |
-diff --git a/autotests/kformattest.cpp b/autotests/kformattest.cpp |
| 34 |
-index 15080be..6cc3c52 100644 |
| 35 |
---- a/autotests/kformattest.cpp |
| 36 |
-+++ b/autotests/kformattest.cpp |
| 37 |
-@@ -248,8 +248,8 @@ void KFormatTest::formatDecimalDuration() |
| 38 |
- { |
| 39 |
- KFormat format(QLocale::c()); |
| 40 |
- |
| 41 |
-- QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 millisecond(s)")); |
| 42 |
-- QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 millisecond(s)")); |
| 43 |
-+ QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 milliseconds")); |
| 44 |
-+ QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 milliseconds")); |
| 45 |
- QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 10), QStringLiteral("1.01 seconds")); |
| 46 |
- QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 1, 3), QStringLiteral("1.001 seconds")); |
| 47 |
- QCOMPARE(format.formatDecimalDuration(1 * MSecsInMinute + 10 * MSecsInSecond), QStringLiteral("1.17 minutes")); |
| 48 |
-@@ -264,22 +264,22 @@ void KFormatTest::formatSpelloutDuration() |
| 49 |
- { |
| 50 |
- KFormat format(QLocale::c()); |
| 51 |
- |
| 52 |
-- QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second(s)")); |
| 53 |
-- QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 second(s)")); |
| 54 |
-- QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute(s)")); |
| 55 |
-- QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minute(s)")); |
| 56 |
-- QCOMPARE(format.formatSpelloutDuration(3600000), QStringLiteral("1 hour(s)")); |
| 57 |
-- QCOMPARE(format.formatSpelloutDuration(18000000), QStringLiteral("5 hour(s)")); |
| 58 |
-- QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute(s) and 15 second(s)")); |
| 59 |
-+ QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second")); |
| 60 |
-+ QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 seconds")); |
| 61 |
-+ QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute")); |
| 62 |
-+ QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minutes")); |
| 63 |
-+ QCOMPARE(format.formatSpelloutDuration(3600000), QStringLiteral("1 hour")); |
| 64 |
-+ QCOMPARE(format.formatSpelloutDuration(18000000), QStringLiteral("5 hours")); |
| 65 |
-+ QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute and 15 seconds")); |
| 66 |
- // Problematic case #1 (there is a reference to this case on kformat.cpp) |
| 67 |
-- QCOMPARE(format.formatSpelloutDuration(119999), QStringLiteral("2 minute(s)")); |
| 68 |
-+ QCOMPARE(format.formatSpelloutDuration(119999), QStringLiteral("2 minutes")); |
| 69 |
- // This case is strictly 2 hours, 15 minutes and 59 seconds. However, since the range is |
| 70 |
- // pretty high between hours and seconds, formatSpelloutDuration always omits seconds when there |
| 71 |
- // are hours in scene. |
| 72 |
-- QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hour(s) and 15 minute(s)")); |
| 73 |
-+ QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hours and 15 minutes")); |
| 74 |
- // This case is strictly 1 hour and 10 seconds. For the same reason, formatSpelloutDuration |
| 75 |
- // detects that 10 seconds is just garbage compared to 1 hour, and omits it on the result. |
| 76 |
-- QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour(s)")); |
| 77 |
-+ QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour")); |
| 78 |
- } |
| 79 |
- |
| 80 |
- void KFormatTest::formatRelativeDate() |
| 81 |
|
| 82 |
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild |
| 83 |
index 987782c458..5627618255 100644 |
| 84 |
--- a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild |
| 85 |
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild |
| 86 |
@@ -19,14 +19,6 @@ DEPEND="${RDEPEND} |
| 87 |
nls? ( $(add_qt_dep linguist-tools) ) |
| 88 |
" |
| 89 |
|
| 90 |
-src_prepare() { |
| 91 |
- # bug 650280 |
| 92 |
- has_version '<dev-qt/qtcore-5.10.0:5' && \ |
| 93 |
- eapply "${FILESDIR}/${PN}-5.46.0-kformattest.patch" |
| 94 |
- |
| 95 |
- kde5_src_prepare |
| 96 |
-} |
| 97 |
- |
| 98 |
src_configure() { |
| 99 |
local mycmakeargs=( |
| 100 |
-D_KDE4_DEFAULT_HOME_POSTFIX=4 |
Archives