|
Lines 1-16
Link Here
|
| 1 |
--- ./solid/solid/backends/hal/halstorageaccess.cpp.orig 2009-12-11 02:14:57.000000000 +0300 |
1 |
--- solid/solid/backends/hal/halstorageaccess.cpp.orig 2017-11-05 01:51:22 UTC |
| 2 |
+++ ./solid/solid/backends/hal/halstorageaccess.cpp 2010-04-11 14:13:21.934934943 +0400 |
2 |
+++ solid/solid/backends/hal/halstorageaccess.cpp |
| 3 |
@@ -317,11 +317,17 @@ |
3 |
@@ -38,6 +38,7 @@ |
|
|
4 |
#include <stdlib.h> |
| 4 |
|
5 |
|
| 5 |
#ifdef Q_OS_FREEBSD |
6 |
#ifdef Q_OS_FREEBSD |
|
|
7 |
+#include <sys/param.h> // For __FreeBSD_version |
| 8 |
#include <langinfo.h> |
| 9 |
#endif |
| 10 |
|
| 11 |
@@ -399,11 +400,20 @@ bool StorageAccess::callHalVolumeMount() |
| 12 |
|
| 13 |
#ifdef Q_OS_FREEBSD |
| 6 |
char *cType; |
14 |
char *cType; |
| 7 |
- if ( fstype=="vfat" && halOptions.contains("-L=")) { |
15 |
- if ( fstype=="vfat" && halOptions.contains("-L=")) { |
| 8 |
- if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) |
16 |
- if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) |
| 9 |
+ if ( fstype=="vfat" ) { |
17 |
+ if ( fstype=="vfat" ) { |
| 10 |
+ if ( halOptions.contains("-L=") && (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) |
18 |
+ if ( halOptions.contains("-L=") && ((cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG"))) ) |
| 11 |
options << "-L="+QString(cType); |
19 |
options << "-L="+QString(cType); |
|
|
20 |
+#if __FreeBSD_version < 1200033 |
| 21 |
+ // The "large" option was removed in ports r319735. |
| 12 |
+ if ( halOptions.contains("large") ) |
22 |
+ if ( halOptions.contains("large") ) |
| 13 |
+ options << "large"; |
23 |
+ options << "large"; |
|
|
24 |
+#endif |
| 14 |
+ if ( halOptions.contains("-m=") ) |
25 |
+ if ( halOptions.contains("-m=") ) |
| 15 |
+ options << "-m=644"; |
26 |
+ options << "-m=644"; |
| 16 |
+ if ( halOptions.contains("-M=") ) |
27 |
+ if ( halOptions.contains("-M=") ) |
|
Lines 21-27
Link Here
|
| 21 |
if ((cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) |
32 |
if ((cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) |
| 22 |
options << "-C="+QString(nl_langinfo(CODESET)); |
33 |
options << "-C="+QString(nl_langinfo(CODESET)); |
| 23 |
} |
34 |
} |
| 24 |
@@ -336,6 +342,7 @@ |
35 |
@@ -418,6 +428,7 @@ bool StorageAccess::callHalVolumeMount() |
| 25 |
if (halOptions.contains("flush")) |
36 |
if (halOptions.contains("flush")) |
| 26 |
options<<"flush"; |
37 |
options<<"flush"; |
| 27 |
} |
38 |
} |
|
Lines 29-35
Link Here
|
| 29 |
// pass our locale to the ntfs-3g driver so it can translate local characters |
40 |
// pass our locale to the ntfs-3g driver so it can translate local characters |
| 30 |
else if ( halOptions.contains("locale=") ) { |
41 |
else if ( halOptions.contains("locale=") ) { |
| 31 |
// have to obtain LC_CTYPE as returned by the `locale` command |
42 |
// have to obtain LC_CTYPE as returned by the `locale` command |
| 32 |
@@ -345,7 +352,6 @@ |
43 |
@@ -427,7 +438,6 @@ bool StorageAccess::callHalVolumeMount() |
| 33 |
options << "locale="+QString(cType); |
44 |
options << "locale="+QString(cType); |
| 34 |
} |
45 |
} |
| 35 |
} |
46 |
} |