diff options
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdebase-kioslaves/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdebase-kioslaves/files/kdebase-3.5.9-ntfs3g-locale.patch | 31 |
2 files changed, 5 insertions, 32 deletions
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog index aff5a2c4f481..a4f7bfef1d62 100644 --- a/kde-base/kdebase-kioslaves/ChangeLog +++ b/kde-base/kdebase-kioslaves/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase-kioslaves # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.164 2009/10/12 20:36:53 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.165 2009/10/13 00:14:13 abcd Exp $ + + 13 Oct 2009; Jonathan Callen <abcd@gentoo.org> + -files/kdebase-3.5.9-ntfs3g-locale.patch: + Clean out old patches 12 Oct 2009; Jonathan Callen <abcd@gentoo.org> -kdebase-kioslaves-3.5.9.ebuild, -kdebase-kioslaves-3.5.9-r1.ebuild: diff --git a/kde-base/kdebase-kioslaves/files/kdebase-3.5.9-ntfs3g-locale.patch b/kde-base/kdebase-kioslaves/files/kdebase-3.5.9-ntfs3g-locale.patch deleted file mode 100644 index a5499f15893a..000000000000 --- a/kde-base/kdebase-kioslaves/files/kdebase-3.5.9-ntfs3g-locale.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: kioslave/media/mediamanager/halbackend.cpp -=================================================================== ---- kioslave/media/mediamanager/halbackend.cpp (revision 864099) -+++ kioslave/media/mediamanager/halbackend.cpp (working copy) -@@ -849,6 +849,14 @@ - result << tmp; - } - -+ if (valids.contains("locale") && fstype == "ntfs-3g") -+ { -+ char *cType; -+ if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) { -+ result << QString("locale=%1").arg(cType); -+ } -+ } -+ - if (valids.contains("utf8")) - { - value = config.readBoolEntry("utf8", true); -@@ -1149,6 +1157,11 @@ - if (valids["quiet"] == "true") - soptions << "quiet"; - -+ if (valids.contains("locale")) -+ { -+ soptions << QString("locale=%1").arg(valids["locale"]); -+ } -+ - if (valids["utf8"] == "true") - soptions << "utf8"; - |