diff options
| author | Maximiliano Curia <maxy@debian.org> | 2014-01-13 12:06:28 -0300 |
|---|---|---|
| committer | Maximiliano Curia <maxy@debian.org> | 2014-01-13 17:09:01 -0300 |
| commit | a182930049d273fd21bd13932a7f4cc9693e090d (patch) | |
| tree | 54ed1a3938ef826b9d9ec5008b40ef308c4d74b3 | |
| parent | 4fa292d8fe504b9f4b8fb23f6b0e599f909ae9fa (diff) | |
| download | kde4libs-a182930049d273fd21bd13932a7f4cc9693e090d.tar.gz | |
New patch: kstringhandlertest_fix.diff
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/kstringhandlertest_fix.diff | 16 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index c2427bb..728c7ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ kde4libs (4:4.11.5-1) UNRELEASED; urgency=low * Enable build failures on missing symbols. * Add autopkgtest. * New patch: debian_standardsdirtest.diff + * New patch: kstringhandlertest_fix.diff -- Maximiliano Curia <maxy@debian.org> Thu, 09 Jan 2014 12:14:52 -0300 diff --git a/debian/patches/kstringhandlertest_fix.diff b/debian/patches/kstringhandlertest_fix.diff new file mode 100644 index 0000000..33adfe2 --- /dev/null +++ b/debian/patches/kstringhandlertest_fix.diff @@ -0,0 +1,16 @@ +Index: kde4libs/kdecore/tests/kstringhandlertest.cpp +=================================================================== +--- kde4libs.orig/kdecore/tests/kstringhandlertest.cpp 2014-01-13 11:27:40.578481463 -0300 ++++ kde4libs/kdecore/tests/kstringhandlertest.cpp 2014-01-13 12:05:21.949496740 -0300 +@@ -55,7 +55,10 @@ + QCOMPARE(KStringHandler::naturalCompare("b", "a", Qt::CaseSensitive), +1); + QCOMPARE(KStringHandler::naturalCompare("a", "a", Qt::CaseSensitive), 0); + +- QCOMPARE(KStringHandler::naturalCompare("A", "a", Qt::CaseSensitive), QString::localeAwareCompare("A", "a")); ++ // Plataform dependant result, it can be any number ++ int cmp_A_a = QString::localeAwareCompare("A", "a"); ++ QCOMPARE(KStringHandler::naturalCompare("A", "a", Qt::CaseSensitive), ++ cmp_A_a < 0 ? -1 : cmp_A_a > 0 ? +1 : 0); + QCOMPARE(KStringHandler::naturalCompare("A", "a", Qt::CaseInsensitive), 0); + QCOMPARE(KStringHandler::naturalCompare("a", "A", Qt::CaseInsensitive), 0); + QCOMPARE(KStringHandler::naturalCompare("aAa", "AaA", Qt::CaseInsensitive), 0); diff --git a/debian/patches/series b/debian/patches/series index cfb671b..7fa105f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,3 +25,4 @@ kfreebsd_acl.diff cmake_compatibility.diff kde4libs_interpret_qvarianttype_as_qmetatypetype.diff debian_standardsdirtest.diff +kstringhandlertest_fix.diff |