summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-09-03 14:01:38 +0000
committerJohannes Huber <johu@gentoo.org>2012-09-03 14:01:38 +0000
commit78244f96d672ecc31a03ccf26372ddfb0a5c9b8f (patch)
tree57722f65e5e01b1985ee96d9562a36717828b3ca /kde-base/kcalc
parentAdd missing slot dependencies on Qt. (diff)
downloadhistorical-78244f96d672ecc31a03ccf26372ddfb0a5c9b8f.tar.gz
historical-78244f96d672ecc31a03ccf26372ddfb0a5c9b8f.tar.bz2
historical-78244f96d672ecc31a03ccf26372ddfb0a5c9b8f.zip
Remove old.
Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64
Diffstat (limited to 'kde-base/kcalc')
-rw-r--r--kde-base/kcalc/ChangeLog6
-rw-r--r--kde-base/kcalc/files/kcalc-4.8.1-dot.patch125
2 files changed, 4 insertions, 127 deletions
diff --git a/kde-base/kcalc/ChangeLog b/kde-base/kcalc/ChangeLog
index 6c7b2097d282..0ec3670d182d 100644
--- a/kde-base/kcalc/ChangeLog
+++ b/kde-base/kcalc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kcalc
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.225 2012/09/03 13:29:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.226 2012/09/03 13:51:34 johu Exp $
+
+ 03 Sep 2012; Johannes Huber <johu@gentoo.org> -files/kcalc-4.8.1-dot.patch:
+ Remove old.
03 Sep 2012; Johannes Huber <johu@gentoo.org> -kcalc-4.7.4.ebuild:
Remove KDE SC 4.7.4
@@ -851,4 +854,3 @@
+kcalc-3.4.0_beta1.ebuild:
Adding the split ebuilds to portage. For KDE 3.4, we've created separate
ebuilds for all the KDE apps.
-
diff --git a/kde-base/kcalc/files/kcalc-4.8.1-dot.patch b/kde-base/kcalc/files/kcalc-4.8.1-dot.patch
deleted file mode 100644
index de20529adb4b..000000000000
--- a/kde-base/kcalc/files/kcalc-4.8.1-dot.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From dd35eaac4aa993688db25d368bd88d524c3ce80f Mon Sep 17 00:00:00 2001
-From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
-Date: Thu, 22 Mar 2012 09:37:31 +0100
-Subject: [PATCH] It seems like 2/3 got replaced errorneously by 2.3 in some
- places, making the tests fail needlessly.
-
----
- knumber/tests/knumbertest.cpp | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/knumber/tests/knumbertest.cpp b/knumber/tests/knumbertest.cpp
-index a072cc9..c555c73 100644
---- a/knumber/tests/knumbertest.cpp
-+++ b/knumber/tests/knumbertest.cpp
-@@ -129,11 +129,11 @@ void testingAdditions()
- std::cout << "\n\nTesting additions:\n";
-
- checkResult("KNumber(5) + KNumber(2)", KNumber(5) + KNumber(2), "7", KNumber::IntegerType);
-- checkResult("KNumber(5) + KNumber(\"2/3\")", KNumber(5) + KNumber(QLatin1String("2.3")), "17/3", KNumber::FractionType);
-+ checkResult("KNumber(5) + KNumber(\"2/3\")", KNumber(5) + KNumber(QLatin1String("2/3")), "17/3", KNumber::FractionType);
- checkResult("KNumber(5) + KNumber(\"2.3\")", KNumber(5) + KNumber(QLatin1String("2.3")), "7.3", KNumber::FloatType);
-
- checkResult("KNumber(\"5/3\") + KNumber(2)", KNumber(QLatin1String("5/3")) + KNumber(2), "11/3", KNumber::FractionType);
-- checkResult("KNumber(\"5/3\") + KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) + KNumber(QLatin1String("2.3")), "7/3", KNumber::FractionType);
-+ checkResult("KNumber(\"5/3\") + KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) + KNumber(QLatin1String("2/3")), "7/3", KNumber::FractionType);
- checkResult("KNumber(\"5/3\") + KNumber(\"1/3\")", KNumber(QLatin1String("5/3")) + KNumber("1/3"), QLatin1String("2"), KNumber::IntegerType);
- checkResult("KNumber(\"5/3\") + KNumber(\"-26/3\")", KNumber(QLatin1String("5/3")) + KNumber("-26/3"), "-7", KNumber::IntegerType);
- checkResult("KNumber(\"5/2\") + KNumber(2.3)", KNumber(QLatin1String("5/2")) + KNumber(2.3), "4.8", KNumber::FloatType);
-@@ -149,12 +149,12 @@ void testingSubtractions()
- std::cout << "\n\nTesting subtractions:\n";
-
- checkResult("KNumber(5) - KNumber(2)", KNumber(5) - KNumber(2), QLatin1String("3"), KNumber::IntegerType);
-- checkResult("KNumber(5) - KNumber(\"2/3\")", KNumber(5) - KNumber(QLatin1String("2.3")), "13/3", KNumber::FractionType);
-+ checkResult("KNumber(5) - KNumber(\"2/3\")", KNumber(5) - KNumber(QLatin1String("2/3")), "13/3", KNumber::FractionType);
- checkResult("KNumber(5) - KNumber(2.3)", KNumber(5) - KNumber(2.3), "2.7", KNumber::FloatType);
-
- checkResult("KNumber(\"5/3\") - KNumber(2)", KNumber(QLatin1String("5/3")) - KNumber(2), "-1/3", KNumber::FractionType);
- checkResult("KNumber(\"5/3\") - KNumber(\"1/3\")", KNumber(QLatin1String("5/3")) - KNumber("1/3"), "4/3", KNumber::FractionType);
-- checkResult("KNumber(\"5/3\") - KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) - KNumber(QLatin1String("2.3")), QLatin1String("1"), KNumber::IntegerType);
-+ checkResult("KNumber(\"5/3\") - KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) - KNumber(QLatin1String("2/3")), QLatin1String("1"), KNumber::IntegerType);
- checkResult("KNumber(\"-5/3\") - KNumber(\"4/3\")", KNumber(QLatin1String("-5/3")) - KNumber("4/3"), "-3", KNumber::IntegerType);
- checkResult("KNumber(\"5/4\") - KNumber(2.2)", KNumber("5/4") - KNumber(2.2), "-0.95", KNumber::FloatType);
-
-@@ -170,7 +170,7 @@ void testingMultiplications()
- std::cout << "\n\nTesting multiplications:\n";
-
- checkResult("KNumber(5) * KNumber(2)", KNumber(5) * KNumber(2), "10", KNumber::IntegerType);
-- checkResult("KNumber(5) * KNumber(\"2/3\")", KNumber(5) * KNumber(QLatin1String("2.3")), "10/3", KNumber::FractionType);
-+ checkResult("KNumber(5) * KNumber(\"2/3\")", KNumber(5) * KNumber(QLatin1String("2/3")), "10/3", KNumber::FractionType);
- checkResult("KNumber(5) * KNumber(\"2/5\")", KNumber(5) * KNumber("2/5"), QLatin1String("2"), KNumber::IntegerType);
- checkResult("KNumber(5) * KNumber(2.3)", KNumber(5) * KNumber(2.3), "11.5", KNumber::FloatType);
- checkResult("KNumber(0) * KNumber(\"2/5\")", KNumber(0) * KNumber("2/5"), QLatin1String("0"), KNumber::IntegerType);
-@@ -178,7 +178,7 @@ void testingMultiplications()
-
- checkResult("KNumber(\"5/3\") * KNumber(2)", KNumber(QLatin1String("5/3")) * KNumber(2), "10/3", KNumber::FractionType);
- checkResult("KNumber(\"5/3\") * KNumber(0)", KNumber(QLatin1String("5/3")) * KNumber(0), QLatin1String("0"), KNumber::IntegerType);
-- checkResult("KNumber(\"5/3\") * KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) * KNumber(QLatin1String("2.3")), "10/9", KNumber::FractionType);
-+ checkResult("KNumber(\"5/3\") * KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) * KNumber(QLatin1String("2/3")), "10/9", KNumber::FractionType);
- checkResult("KNumber(\"25/6\") * KNumber(\"12/5\")", KNumber("25/6") * KNumber("12/5"), "10", KNumber::IntegerType);
- checkResult("KNumber(\"5/2\") * KNumber(2.3)", KNumber(QLatin1String("5/2")) * KNumber(2.3), "5.75", KNumber::FloatType);
-
-@@ -197,8 +197,8 @@ void testingDivisions()
- checkResult("KNumber(122) / KNumber(2)", KNumber(122) / KNumber(2), "61", KNumber::IntegerType);
- checkResult("KNumber(12) / KNumber(0)", KNumber(12) / KNumber(0), QLatin1String("inf"), KNumber::SpecialType);
- checkResult("KNumber(-12) / KNumber(0)", KNumber(-12) / KNumber(0), QLatin1String("-inf"), KNumber::SpecialType);
-- checkResult("KNumber(5) / KNumber(\"2/3\")", KNumber(5) / KNumber(QLatin1String("2.3")), "15/2", KNumber::FractionType);
-- checkResult("KNumber(6) / KNumber(\"2/3\")", KNumber(6) / KNumber(QLatin1String("2.3")), "9", KNumber::IntegerType);
-+ checkResult("KNumber(5) / KNumber(\"2/3\")", KNumber(5) / KNumber(QLatin1String("2/3")), "15/2", KNumber::FractionType);
-+ checkResult("KNumber(6) / KNumber(\"2/3\")", KNumber(6) / KNumber(QLatin1String("2/3")), "9", KNumber::IntegerType);
- checkResult("KNumber(5) / KNumber(2.5)", KNumber(5) / KNumber(2.5), QLatin1String("2"), KNumber::FloatType);
- checkResult("KNumber(5) / KNumber(0.0)", KNumber(5) / KNumber(0.0), QLatin1String("inf"), KNumber::SpecialType);
- checkResult("KNumber(-5) / KNumber(0.0)", KNumber(-5) / KNumber(0.0), QLatin1String("-inf"), KNumber::SpecialType);
-@@ -206,7 +206,7 @@ void testingDivisions()
- checkResult("KNumber(\"5/3\") / KNumber(2)", KNumber(QLatin1String("5/3")) / KNumber(2), "5/6", KNumber::FractionType);
- checkResult("KNumber(\"5/3\") / KNumber(0)", KNumber(QLatin1String("5/3")) / KNumber(0), QLatin1String("inf"), KNumber::SpecialType);
- checkResult("KNumber(\"-5/3\") / KNumber(0)", KNumber(QLatin1String("-5/3")) / KNumber(0), QLatin1String("-inf"), KNumber::SpecialType);
-- checkResult("KNumber(\"5/3\") / KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) / KNumber(QLatin1String("2.3")), QLatin1String("5/2"), KNumber::FractionType);
-+ checkResult("KNumber(\"5/3\") / KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) / KNumber(QLatin1String("2/3")), QLatin1String("5/2"), KNumber::FractionType);
- checkResult("KNumber(\"49/3\") / KNumber(\"7/9\")", KNumber("49/3") / KNumber("7/9"), "21", KNumber::IntegerType);
- checkResult("KNumber(\"5/2\") / KNumber(2.5)", KNumber(QLatin1String("5/2")) / KNumber(2.5), QLatin1String("1"), KNumber::FloatType);
- checkResult("KNumber(\"5/2\") / KNumber(0.0)", KNumber(QLatin1String("5/2")) / KNumber(0.0), QLatin1String("inf"), KNumber::SpecialType);
-@@ -215,7 +215,7 @@ void testingDivisions()
- checkResult("KNumber(5.3) / KNumber(2)", KNumber(5.3) / KNumber(2), "2.65", KNumber::FloatType);
- checkResult("KNumber(5.3) / KNumber(0)", KNumber(5.3) / KNumber(0), QLatin1String("inf"), KNumber::SpecialType);
- checkResult("KNumber(-5.3) / KNumber(0)", KNumber(-5.3) / KNumber(0), QLatin1String("-inf"), KNumber::SpecialType);
-- checkResult("KNumber(5.3) / KNumber(\"2/3\")", KNumber(5.3) / KNumber(QLatin1String("2.3")), "7.95", KNumber::FloatType);
-+ checkResult("KNumber(5.3) / KNumber(\"2/3\")", KNumber(5.3) / KNumber(QLatin1String("2/3")), "7.95", KNumber::FloatType);
- checkResult("KNumber(5.5) / KNumber(2.5)", KNumber(5.5) / KNumber(2.5), "2.2", KNumber::FloatType);
- checkResult("KNumber(5.5) / KNumber(0.0)", KNumber(5.5) / KNumber(0.0), QLatin1String("inf"), KNumber::SpecialType);
- checkResult("KNumber(-5.5) / KNumber(0.0)", KNumber(-5.5) / KNumber(0.0), QLatin1String("-inf"), KNumber::SpecialType);
-@@ -258,11 +258,11 @@ void testingAbs()
- std::cout << "\n\nTesting absolute value:\n";
-
- checkResult("KNumber(5).abs()", KNumber(5).abs(), QLatin1String("5"), KNumber::IntegerType);
-- checkResult("KNumber(\"2/3\").abs()", KNumber(QLatin1String("2.3")).abs(), QLatin1String("2.3"), KNumber::FractionType);
-+ checkResult("KNumber(\"2/3\").abs()", KNumber(QLatin1String("2/3")).abs(), QLatin1String("2/3"), KNumber::FractionType);
- checkResult("KNumber(\"2.3\").abs()", KNumber(QLatin1String("2.3")).abs(), QLatin1String("2.3"), KNumber::FloatType);
-
- checkResult("KNumber(-5).abs()", KNumber(-5).abs(), QLatin1String("5"), KNumber::IntegerType);
-- checkResult("KNumber(\"-2/3\").abs()", KNumber(QLatin1String("-2/3")).abs(), QLatin1String("2.3"), KNumber::FractionType);
-+ checkResult("KNumber(\"-2/3\").abs()", KNumber(QLatin1String("-2/3")).abs(), QLatin1String("2/3"), KNumber::FractionType);
- checkResult("KNumber(\"-2.3\").abs()", KNumber("-2.3").abs(), QLatin1String("2.3"), KNumber::FloatType);
- }
-
-@@ -287,7 +287,7 @@ void testingSqrt()
- checkResult("KNumber(\"16/9\").sqrt()", KNumber("16/9").sqrt(), "4/3", KNumber::FractionType);
- checkResult("KNumber(\"-16/9\").sqrt()", KNumber("-16/9").sqrt(), QLatin1String("nan"), KNumber::SpecialType);
- checkResult("KNumber(2).sqrt()", KNumber(2).sqrt(), "1.41421356237", KNumber::FloatType);
-- checkResult("KNumber(\"2/3\").sqrt()", KNumber(QLatin1String("2.3")).sqrt(), "0.816496580928", KNumber::FloatType);
-+ checkResult("KNumber(\"2/3\").sqrt()", KNumber(QLatin1String("2/3")).sqrt(), "0.816496580928", KNumber::FloatType);
- checkResult("KNumber(\"0.25\").sqrt()", KNumber("0.25").sqrt(), "0.5", KNumber::FloatType);
- checkResult("KNumber(\"-0.25\").sqrt()", KNumber("-0.25").sqrt(), QLatin1String("nan"), KNumber::SpecialType);
-
-@@ -378,7 +378,7 @@ void testingPower()
- checkResult("KNumber(-2) ^ KNumber(3)", KNumber(-2).power(KNumber(3)), "-8", KNumber::IntegerType);
- checkResult("KNumber(-2) ^ KNumber(4)", KNumber(-2).power(KNumber(4)), QLatin1String("16"), KNumber::IntegerType);
- checkResult("KNumber(5) ^ KNumber(-2)", KNumber(5).power(KNumber(-2)), "1/25", KNumber::FractionType);
-- checkResult("KNumber(8) ^ KNumber(\"2/3\")", KNumber(8).power(KNumber(QLatin1String("2.3"))), "4", KNumber::IntegerType);
-+ checkResult("KNumber(8) ^ KNumber(\"2/3\")", KNumber(8).power(KNumber(QLatin1String("2/3"))), "4", KNumber::IntegerType);
- checkResult("KNumber(8) ^ KNumber(\"-2/3\")", KNumber(8).power(KNumber(QLatin1String("-2/3"))), "1/4", KNumber::FractionType);
- checkResult("KNumber(-16) ^ KNumber(\"1/4\")", KNumber(-16).power(KNumber("1/4")), QLatin1String("nan"), KNumber::SpecialType);
- checkResult("KNumber(-8) ^ KNumber(\"1/3\")", KNumber(-8).power(KNumber("1/3")), QLatin1String("nan"), KNumber::SpecialType);
---
-1.7.9.2
-