Hello community, here is the log from the commit of package kcm5-fcitx for openSUSE:Factory checked in at 2015-10-26 12:48:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old) and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcm5-fcitx" Changes: -------- --- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes 2015-10-20 00:07:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new/kcm5-fcitx.changes 2015-10-26 12:48:56.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Oct 22 18:28:11 CEST 2015 - [email protected] + +- Work around a crash at clicking "Only Show Current Language" + (boo#951609): + kcm-fcitx-workaround-for-invalid-langcode.patch + +------------------------------------------------------------------- New: ---- kcm-fcitx-workaround-for-invalid-langcode.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm5-fcitx.spec ++++++ --- /var/tmp/diff_new_pack.1tO8S5/_old 2015-10-26 12:48:57.000000000 +0100 +++ /var/tmp/diff_new_pack.1tO8S5/_new 2015-10-26 12:48:57.000000000 +0100 @@ -29,6 +29,8 @@ Source1: input-keyboard.svg #PATCH-FIX-OPENSUSE rename po to kcm5_fcitx to avoid conflict w/ kcm_fcitx Patch: %{name}-po.patch +# PATCH-FIX-OPENSUSE kcm-fcitx-workaround-for-invalid-langcode.patch boo#95160 +Patch1: kcm-fcitx-workaround-for-invalid-langcode.patch BuildRequires: fcitx-devel BuildRequires: fcitx-qt5-devel BuildRequires: libqt5-qtbase-devel @@ -95,6 +97,7 @@ %prep %setup -q -n kcm-fcitx-%{version} %patch -p1 +%patch1 -p1 %build %cmake_kf5 -d build ++++++ kcm-fcitx-workaround-for-invalid-langcode.patch ++++++ --- src/impage.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/src/impage.cpp +++ b/src/impage.cpp @@ -100,6 +100,7 @@ QVariant IMPage::Private::IMModel::data( } const FcitxQtInputMethodItem& imEntry = filteredIMEntryList.at(index.row()); + QString lc; switch (role) { @@ -113,7 +114,10 @@ QVariant IMPage::Private::IMModel::data( return imEntry.langCode(); case KCategorizedSortFilterProxyModel::CategoryDisplayRole: - return QLocale(imEntry.langCode()).nativeLanguageName(); + lc = imEntry.langCode(); + if (lc.length() == 3) + lc.clear(); + return QLocale(lc).nativeLanguageName(); default: return QVariant();
