From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q6INp-0001q2-4z for garchives@archives.gentoo.org; Sun, 03 Apr 2011 08:10:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4BE4E0525; Sun, 3 Apr 2011 08:09:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A335AE0525 for ; Sun, 3 Apr 2011 08:09:55 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 10C321B4024 for ; Sun, 3 Apr 2011 08:09:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 320B880065 for ; Sun, 3 Apr 2011 08:09:54 +0000 (UTC) From: "Andreas K. Huettel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Huettel" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/systemsettings/files/systemsettings-4.6.2-flagcrash.patch kde-base/systemsettings/systemsettings-4.6.2.ebuild X-VCS-Directories: kde-base/systemsettings/ kde-base/systemsettings/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Huettel X-VCS-Revision: bf71cfc5c11670191d06eb63f2f1ad89756afe34 Date: Sun, 3 Apr 2011 08:09:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 58161ad601ca60d62eb315b9875a4968 commit: bf71cfc5c11670191d06eb63f2f1ad89756afe34 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Sun Apr 3 08:12:58 2011 +0000 Commit: Andreas K. Huettel gentoo org> CommitDate: Sun Apr 3 08:12:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Dbf71cfc5 [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.pat= ch 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 +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 =3D=3D "1.0" ) ++ if( rules =3D=3D NULL || rules->version =3D=3D "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") ); +=20 ++ rules =3D NULL; // when no rules found ++ QCOMPARE( flags->getLongText(layoutUnit1, rules), QString("us -= intl") ); ++ + flags->clearCache(); + } +=20 diff --git a/kde-base/systemsettings/systemsettings-4.6.2.ebuild b/kde-ba= se/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=3D" add_blocker kcontrol '<4.3.98' add_blocker konqueror '<4.4.70' =20 -PATCHES=3D( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" ) +PATCHES=3D( + "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" + "${FILESDIR}/${PN}-4.6.2-flagcrash.patch" +) =20 src_unpack() { if use handbook; then