From e9e7fa543273fffa8131b2244e5c994fe22616e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 24 Nov 2013 16:48:53 +0100 Subject: RPM Packaging: fix build issue on openSUSE 13.1 --- ...e-14.0.0-tdehardwarebackend_fix_iocharset.patch | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch (limited to 'redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch') diff --git a/redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch b/redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch new file mode 100644 index 000000000..c02c3e6c6 --- /dev/null +++ b/redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch @@ -0,0 +1,25 @@ +--- 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 = false; //config.readBoolEntry("utf8", true); ++ } else { ++ value = false; ++ } + tmp = TQString("utf8=%1").arg(value ? "true" : "false"); + result << tmp; + } + + if (valids.contains("shortname")) { -- cgit v1.2.1