rm kdelibs-4.1.1-kde#858160-vfat.patch for now, that patch needs fixing upstream: http://bugs.kde.org/show_bug.cgi?id=161673#c12

This commit is contained in:
Kevin Kofler 2008-09-08 16:09:42 +00:00
parent 668cc86bac
commit 1ab56de9a0
2 changed files with 0 additions and 54 deletions

View File

@ -1,51 +0,0 @@
Index: solid/solid/backends/hal/halstorageaccess.cpp
===================================================================
--- solid/solid/backends/hal/halstorageaccess.cpp (revision 858159)
+++ solid/solid/backends/hal/halstorageaccess.cpp (revision 858160)
@@ -19,6 +19,7 @@
#include "halstorageaccess.h"
+#include <QtCore/QLocale>
#include <QtCore/QDebug>
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusInterface>
@@ -233,6 +234,38 @@
if (halOptions.contains("uid=")) {
options << "uid="+QString::number(::getuid());
}
+ //respect windows-enforced charsets for fat
+ if ( m_device->property("volume.fstype").toString()=="vfat" && halOptions.contains("codepage=") ) {
+ options << "iocharset=utf8";
+ switch (QLocale::system().language()) {
+ case QLocale::Russian:
+ case QLocale::Ukrainian:
+ options << "codepage=1251";
+ break;
+ case QLocale::Hebrew:
+ options << "codepage=1255";
+ break;
+ case QLocale::Turkish:
+ options << "codepage=1254";
+ case QLocale::Greek:
+ options << "codepage=1253";
+ case QLocale::Arabic:
+ options << "codepage=1256";
+ case QLocale::German:
+ case QLocale::Italian:
+ case QLocale::Spanish:
+ case QLocale::Portuguese:
+ case QLocale::French:
+ case QLocale::Dutch:
+ case QLocale::Danish:
+ case QLocale::Swedish:
+ case QLocale::Norwegian:
+ case QLocale::Icelandic:
+ options << "codepage=1255";
+ default:
+ options.removeLast();
+ }
+ }
msg << "" << "" << options;

View File

@ -86,7 +86,6 @@ Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch
Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
Patch103: kdelibs-4.1.1-kutils-fixes.patch
Patch104: kdelibs-4.1.1-kdeui-widgets-fixes.patch
Patch105: kdelibs-4.1.1-kde#858160-vfat.patch
BuildRequires: qt4-devel >= 4.4.0
Requires: qt4 >= %{_qt4_version}
@ -218,7 +217,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch102 -p0 -b .kde#856403-urlnav
%patch103 -p0 -b .kutils-fixes
%patch104 -p0 -b .kdeui-widgets-fixes
%patch105 -p0 -b .kde#858160-vfat
%build
@ -382,7 +380,6 @@ rm -rf %{buildroot}
* Mon Sep 08 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.1-6
- fix crashes in plugin selector
- fix problems in various kdeui widgets
- fix code page selection for vfat volumes in Solid
* Wed Sep 03 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.1-5
- fixed crash on setting cookies on empty domains (like the file