[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/

["Andreas K. Huettel" <dilfridge@gentoo.org>]

commit:     bf71cfc5c11670191d06eb63f2f1ad89756afe34
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Apr  3 08:12:58 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 08:12:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bf71cfc5

[kde-base/systemsettings] Add upstream patch for flag widget crash

(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 .../files/systemsettings-4.6.2-flagcrash.patch     |   34 ++++++++++++++++++++
 .../systemsettings/systemsettings-4.6.2.ebuild     |    5 ++-
 2 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/kde-base/systemsettings/files/systemsettings-4.6.2-flagcrash.patch b/kde-base/systemsettings/files/systemsettings-4.6.2-flagcrash.patch
new file mode 100644
index 0000000..3e9fb7a
--- /dev/null
+++ b/kde-base/systemsettings/files/systemsettings-4.6.2-flagcrash.patch
@@ -0,0 +1,34 @@
+commit 937c7245f0f4058d2b335d160617c1cdb2398cb7
+Author: Andriy Rysin <arysin@gmail.com>
+Date:   Sat Apr 2 22:27:37 2011 -0400
+
+    Fix null pointer crash when no rules found; add unit test
+    BUG: 269961
+
+diff --git a/kcontrol/keyboard/flags.cpp b/kcontrol/keyboard/flags.cpp
+index 24cd457..be70b1c 100644
+--- a/kcontrol/keyboard/flags.cpp
++++ b/kcontrol/keyboard/flags.cpp
+@@ -116,7 +116,7 @@ static QString getDisplayText(const QString& layout, const QString& variant, con
+ {
+ 	if( variant.isEmpty() )
+ 		return layout;
+-	if( rules->version == "1.0" )
++	if( rules == NULL || rules->version == "1.0" )
+ 		return i18nc("layout - variant", "%1 - %2", layout, variant);
+ 	return variant;
+ }
+diff --git a/kcontrol/keyboard/tests/flags_test.cpp b/kcontrol/keyboard/tests/flags_test.cpp
+index 0f84ce5..f4cec94 100644
+--- a/kcontrol/keyboard/tests/flags_test.cpp
++++ b/kcontrol/keyboard/tests/flags_test.cpp
+@@ -64,6 +64,9 @@ private Q_SLOTS:
+         QVERIFY( flags->getLongText(layoutUnit1, rules).startsWith("USA - International") );
+         QCOMPARE( flags->getLongText(layoutUnit2, rules), QString("USA - other") );
+ 
++        rules = NULL; // when no rules found
++        QCOMPARE( flags->getLongText(layoutUnit1, rules), QString("us - intl") );
++
+         flags->clearCache();
+     }
+ 

diff --git a/kde-base/systemsettings/systemsettings-4.6.2.ebuild b/kde-base/systemsettings/systemsettings-4.6.2.ebuild
index a6c2456..911a23c 100644
--- a/kde-base/systemsettings/systemsettings-4.6.2.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.6.2.ebuild
@@ -54,7 +54,10 @@ KMEXTRACTONLY="
 add_blocker kcontrol '<4.3.98'
 add_blocker konqueror '<4.4.70'
 
-PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+	"${FILESDIR}/${PN}-4.6.2-flagcrash.patch"
+)
 
 src_unpack() {
 	if use handbook; then