1 |
jmbsvicetto 08/10/01 00:46:19 |
2 |
|
3 |
Added: kdebase-3.5.10-ntfs3g-locale.patch |
4 |
kdebase-3.5.9-ntfs3g-locale.patch |
5 |
Log: |
6 |
Rev Bumped 3.5.9 and 3.5.10 to fix the ntfs-3g locale mount issue. |
7 |
Fixes bug 238520 - thanks to Ambroz Bizjak. |
8 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 kde-base/kdebase-kioslaves/files/kdebase-3.5.10-ntfs3g-locale.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-kioslaves/files/kdebase-3.5.10-ntfs3g-locale.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-kioslaves/files/kdebase-3.5.10-ntfs3g-locale.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: kdebase-3.5.10-ntfs3g-locale.patch |
17 |
=================================================================== |
18 |
Index: kioslave/media/mediamanager/halbackend.cpp |
19 |
=================================================================== |
20 |
--- kioslave/media/mediamanager/halbackend.cpp (revision 864098) |
21 |
+++ kioslave/media/mediamanager/halbackend.cpp (working copy) |
22 |
@@ -851,13 +851,6 @@ |
23 |
result << tmp; |
24 |
} |
25 |
|
26 |
- if ( valids.contains("locale") ) |
27 |
- { |
28 |
- value = config.readBoolEntry( "locale", true ); |
29 |
- tmp = QString( "locale=%1" ).arg( value ? "true" : "false" ); |
30 |
- result << tmp; |
31 |
- } |
32 |
- |
33 |
if (valids.contains("utf8")) |
34 |
{ |
35 |
value = config.readBoolEntry("utf8", true); |
36 |
@@ -878,6 +871,15 @@ |
37 |
result << "shortname=lower"; |
38 |
} |
39 |
|
40 |
+ |
41 |
+ if (valids.contains("locale") && fstype == "ntfs-3g") |
42 |
+ { |
43 |
+ char *cType; |
44 |
+ if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) { |
45 |
+ result << QString("locale=%1").arg(cType); |
46 |
+ } |
47 |
+ } |
48 |
+ |
49 |
if (valids.contains("sync")) |
50 |
{ |
51 |
value = config.readBoolEntry("sync", ( valids.contains("flush") && !fstype.endsWith("fat") ) && removable); |
52 |
@@ -931,7 +933,7 @@ |
53 |
|
54 |
QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); |
55 |
|
56 |
- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", "locale", 0 }; |
57 |
+ const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; |
58 |
for (int index = 0; names[index]; ++index) |
59 |
if (valids.contains(names[index])) |
60 |
config.writeEntry(names[index], valids[names[index]] == "true"); |
61 |
@@ -951,10 +953,6 @@ |
62 |
config.writeEntry("automount", valids["automount"]); |
63 |
} |
64 |
|
65 |
- if (valids.contains("locale") ) { |
66 |
- config.writeEntry("locale", valids["locale"]); |
67 |
- } |
68 |
- |
69 |
return true; |
70 |
} |
71 |
|
72 |
@@ -1153,11 +1151,6 @@ |
73 |
soptions << QString("uid=%1").arg(getuid()); |
74 |
} |
75 |
|
76 |
- if (valids["locale"] == "true") |
77 |
- { |
78 |
- soptions << QString("locale=%1").arg( KGlobal::locale()->language() ); |
79 |
- } |
80 |
- |
81 |
if (valids["ro"] == "true") |
82 |
soptions << "ro"; |
83 |
|
84 |
@@ -1182,6 +1175,11 @@ |
85 |
soptions << QString("shortname=%1").arg(valids["shortname"]); |
86 |
} |
87 |
|
88 |
+ if (valids.contains("locale")) |
89 |
+ { |
90 |
+ soptions << QString("locale=%1").arg(valids["locale"]); |
91 |
+ } |
92 |
+ |
93 |
if (valids.contains("journaling")) |
94 |
{ |
95 |
QString option = valids["journaling"]; |
96 |
|
97 |
|
98 |
|
99 |
1.1 kde-base/kdebase-kioslaves/files/kdebase-3.5.9-ntfs3g-locale.patch |
100 |
|
101 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-kioslaves/files/kdebase-3.5.9-ntfs3g-locale.patch?rev=1.1&view=markup |
102 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-kioslaves/files/kdebase-3.5.9-ntfs3g-locale.patch?rev=1.1&content-type=text/plain |
103 |
|
104 |
Index: kdebase-3.5.9-ntfs3g-locale.patch |
105 |
=================================================================== |
106 |
Index: kioslave/media/mediamanager/halbackend.cpp |
107 |
=================================================================== |
108 |
--- kioslave/media/mediamanager/halbackend.cpp (revision 864099) |
109 |
+++ kioslave/media/mediamanager/halbackend.cpp (working copy) |
110 |
@@ -849,6 +849,14 @@ |
111 |
result << tmp; |
112 |
} |
113 |
|
114 |
+ if (valids.contains("locale") && fstype == "ntfs-3g") |
115 |
+ { |
116 |
+ char *cType; |
117 |
+ if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) { |
118 |
+ result << QString("locale=%1").arg(cType); |
119 |
+ } |
120 |
+ } |
121 |
+ |
122 |
if (valids.contains("utf8")) |
123 |
{ |
124 |
value = config.readBoolEntry("utf8", true); |
125 |
@@ -1149,6 +1157,11 @@ |
126 |
if (valids["quiet"] == "true") |
127 |
soptions << "quiet"; |
128 |
|
129 |
+ if (valids.contains("locale")) |
130 |
+ { |
131 |
+ soptions << QString("locale=%1").arg(valids["locale"]); |
132 |
+ } |
133 |
+ |
134 |
if (valids["utf8"] == "true") |
135 |
soptions << "utf8"; |