diff options
| author | Timothy Pearson <[email protected]> | 2014-10-06 12:16:27 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-10-06 12:16:27 -0500 |
| commit | ecd088049d4aa2e8262f4cc1e0ac45e135964229 (patch) | |
| tree | 49ed22e9e7852fd3f26854aecf41c96169d59629 /redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch | |
| parent | 855439d3f99b0c152c33ae76a06cce9853f9b8dd (diff) | |
| parent | 01a7863524342e1aec31679e55d08830cc571066 (diff) | |
| download | tde-packaging-ecd088049d4aa2e8262f4cc1e0ac45e135964229.tar.gz tde-packaging-ecd088049d4aa2e8262f4cc1e0ac45e135964229.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch')
| -rw-r--r-- | redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch b/redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch deleted file mode 100644 index 98077c646..000000000 --- a/redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- tdebase/tdeioslave/media/mediamanager/tdehardwarebackend.cpp.new 2013-11-11 21:27:09.960234089 +0100 -+++ tdebase/tdeioslave/media/mediamanager/tdehardwarebackend.cpp 2013-11-11 21:32:16.081679386 +0100 -@@ -979,9 +979,21 @@ - } - - if (valids.contains("utf8")) { -- value = config.readBoolEntry("utf8", true); -+ // From "man mount": only some filesystems support 'iocharset' option. -+ if( (sdevice->fileSystemName() == "fat") -+ || (sdevice->fileSystemName() == "iso9660") -+ || (sdevice->fileSystemName() == "jfs") -+ || (sdevice->fileSystemName() == "msdos") -+ || (sdevice->fileSystemName() == "ntfs") -+ || (sdevice->fileSystemName() == "umsdos") -+ || (sdevice->fileSystemName() == "vfat") -+ ) { -+ value = config.readBoolEntry("utf8", true); -+ } else { -+ value = false; -+ } - tmp = TQString("utf8=%1").arg(value ? "true" : "false"); - result << tmp; - } - - if (valids.contains("shortname")) { |