From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C5A0B138334 for ; Wed, 13 Jun 2018 17:02:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9CC1EE0864; Wed, 13 Jun 2018 17:02:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 538A4E0864 for ; Wed, 13 Jun 2018 17:02:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E19CA335C71 for ; Wed, 13 Jun 2018 17:02:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 852D22B8 for ; Wed, 13 Jun 2018 17:02:45 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1528909224.5620ce2e0d5b6728069f81787fd2420b1d3715f2.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/, kde-frameworks/kcoreaddons/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild X-VCS-Directories: kde-frameworks/kcoreaddons/ kde-frameworks/kcoreaddons/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5620ce2e0d5b6728069f81787fd2420b1d3715f2 X-VCS-Branch: master Date: Wed, 13 Jun 2018 17:02:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0a2046f3-8ece-4e70-9033-48f51f233c50 X-Archives-Hash: b3cbb28e869b34aa9ed870e41936de00 commit: 5620ce2e0d5b6728069f81787fd2420b1d3715f2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 13 17:00:24 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 13 17:00:24 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5620ce2e kde-frameworks/kcoreaddons: Revert Debian patch for kformattest This was fixed within kde-frameworks/plasma-5.47.0. Upstream commit d15f0fa8322dc2632f15024457bea41e7dd058d7 This reverts commit 8b24d9fc2dc8edaa4f3c1acdd9630aef948d0862. .../files/kcoreaddons-5.46.0-kformattest.patch | 56 ---------------------- kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild | 8 ---- 2 files changed, 64 deletions(-) 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 64031659fd..0000000000 --- a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Maximiliano Curia -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-9999.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild index 987782c458..5627618255 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild @@ -19,14 +19,6 @@ DEPEND="${RDEPEND} nls? ( $(add_qt_dep linguist-tools) ) " -src_prepare() { - # bug 650280 - has_version '