From ca38f3bd1d0823d01b711793958d2b5ddaf704b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Thu, 3 Dec 2015 09:59:47 +0100 Subject: [PATCH] Drop upstreamed patch --- plasma-desktop-C_locale.patch | 12 ------------ plasma-desktop.spec | 7 ------- 2 files changed, 19 deletions(-) delete mode 100644 plasma-desktop-C_locale.patch diff --git a/plasma-desktop-C_locale.patch b/plasma-desktop-C_locale.patch deleted file mode 100644 index 8aa68e8..0000000 --- a/plasma-desktop-C_locale.patch +++ /dev/null @@ -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()); - } - diff --git a/plasma-desktop.spec b/plasma-desktop.spec index 855eead..a2f357d 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -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