Wrong C.UTF-8 locale (#1250238)

epel9
Rex Dieter 9 years ago
parent c932923170
commit 564b0b812b

@ -0,0 +1,12 @@
diff -up plasma-desktop-5.4.0/kcms/formats/kcmformats.cpp.C_locale plasma-desktop-5.4.0/kcms/formats/kcmformats.cpp
--- plasma-desktop-5.4.0/kcms/formats/kcmformats.cpp.C_locale 2015-08-21 05:52:33.000000000 -0500
+++ plasma-desktop-5.4.0/kcms/formats/kcmformats.cpp 2015-09-09 08:34:56.109261012 -0500
@@ -115,7 +115,7 @@ void KCMFormats::addLocaleToCombo(QCombo
// "it_IT")
// TODO: Properly handle scripts (@foo)
QString cvalue = locale.name();
- if (!cvalue.contains('.')) { // explicitely add the encoding, otherwise Qt doesn't accept dead keys and garbles the output as well
+ if (!cvalue.contains('.') && (locale.language() != QLocale::C) ) { // explicitely add the encoding, otherwise Qt doesn't accept dead keys and garbles the output as well
cvalue.append(QLatin1Char('.') + QTextCodec::codecForLocale()->name());
}

@ -1,6 +1,6 @@
Name: plasma-desktop
Version: 5.4.0
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Plasma Desktop shell
License: GPLv2+ and (GPLv2 or GPLv3)
@ -25,8 +25,9 @@ Patch102: plasma-desktop-fedora_layout.patch
# master branch
## upstreamable patches
# https://bugzilla.redhat.com/show_bug.cgi?id=1234082
# https://git.reviewboard.kde.org/r/124255/
# https://bugzilla.redhat.com/show_bug.cgi?id=1250238
# http://bugs.kde.org/show_bug.cgi?id=348678
Patch200: plasma-desktop-C_locale.patch
BuildRequires: libusb-devel
BuildRequires: fontconfig-devel
@ -285,6 +286,9 @@ fi
%changelog
* Wed Sep 09 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-4
- Wrong C.UTF-8 locale (#1250238)
* Fri Sep 04 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-3
- make plasma-related runtime deps versioned

Loading…
Cancel
Save