Drop upstreamed patch

epel9
Dan Vrátil 9 years ago
parent d073273199
commit ca38f3bd1d

@ -1,12 +0,0 @@
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());
}

@ -26,9 +26,6 @@ Patch100: plasma-desktop-5.4.0-default_favorites.patch
Patch101: plasma-desktop-5.4.0-default_favorites_f22.patch
# Default to Folder containment (rather than Desktop)
Patch102: plasma-desktop-fedora_layout.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1250238
# http://bugs.kde.org/show_bug.cgi?id=348678
Patch103: plasma-desktop-C_locale.patch
## upstream patches
@ -168,10 +165,6 @@ BuildArch: noarch
%patch101 -p1 -b .default_favorites_f22
%endif
%patch102 -p1 -b .fedora_layout
%if 0%{?fedora} < 24
%patch103 -p1 -b .C_locale
%endif
%build

Loading…
Cancel
Save