* Mon Dec 08 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.3-4
- restore NTFS workaround which accidentally got dropped in the 4.1.3 update
This commit is contained in:
parent
6dcb092b70
commit
831e2f158a
|
@ -1,6 +1,6 @@
|
||||||
diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp
|
diff -ur kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.3-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp
|
||||||
--- kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp 2008-10-30 14:24:05.000000000 +0100
|
--- kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp 2008-10-30 14:24:05.000000000 +0100
|
||||||
+++ kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp 2008-11-04 15:24:21.000000000 +0100
|
+++ kdelibs-4.1.3-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp 2008-12-08 02:07:20.000000000 +0100
|
||||||
@@ -17,10 +17,13 @@
|
@@ -17,10 +17,13 @@
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
@ -37,7 +37,17 @@ diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.
|
||||||
m_teardownInProgress = false;
|
m_teardownInProgress = false;
|
||||||
emit teardownDone(Solid::UnauthorizedOperation,
|
emit teardownDone(Solid::UnauthorizedOperation,
|
||||||
error.name()+": "+error.message(),
|
error.name()+": "+error.message(),
|
||||||
@@ -297,6 +310,59 @@
|
@@ -241,7 +254,8 @@
|
||||||
|
#else
|
||||||
|
QString uid="uid=";
|
||||||
|
#endif
|
||||||
|
- if (halOptions.contains(uid)) {
|
||||||
|
+ if (halOptions.contains(uid)
|
||||||
|
+ && (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) {
|
||||||
|
options << uid+QString::number(::getuid());
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -297,6 +311,59 @@
|
||||||
SLOT(slotDBusError(const QDBusError &)));
|
SLOT(slotDBusError(const QDBusError &)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -97,9 +107,9 @@ diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.
|
||||||
bool Solid::Backends::Hal::StorageAccess::callSystemMount()
|
bool Solid::Backends::Hal::StorageAccess::callSystemMount()
|
||||||
{
|
{
|
||||||
const QString device = m_device->property("block.device").toString();
|
const QString device = m_device->property("block.device").toString();
|
||||||
diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.h
|
diff -ur kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.3-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h
|
||||||
--- kdelibs-orig/solid/solid/backends/hal/halstorageaccess.h 2008-05-21 13:07:38.000000000 +0200
|
--- kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.h 2008-05-21 13:07:38.000000000 +0200
|
||||||
+++ kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.h 2008-11-04 15:24:21.000000000 +0100
|
+++ kdelibs-4.1.3-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h 2008-12-08 02:05:21.000000000 +0100
|
||||||
@@ -69,6 +69,9 @@
|
@@ -69,6 +69,9 @@
|
||||||
bool callSystemMount();
|
bool callSystemMount();
|
||||||
bool callSystemUnmount();
|
bool callSystemUnmount();
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
Summary: K Desktop Environment 4 - Libraries
|
Summary: K Desktop Environment 4 - Libraries
|
||||||
Version: 4.1.3
|
Version: 4.1.3
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
%if 0%{?fedora} > 8
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
|
@ -68,8 +68,8 @@ Patch9: kdelibs-4.0.2-branding.patch
|
||||||
# don't cache kdeglobals paths because they change after profile directories
|
# don't cache kdeglobals paths because they change after profile directories
|
||||||
# are loaded from kde4rc
|
# are loaded from kde4rc
|
||||||
Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch
|
Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch
|
||||||
# workaround for policykit
|
# workarounds for policykit and NTFS
|
||||||
Patch11: kdelibs-4.0.2-policykit-workaround.patch
|
Patch11: kdelibs-4.1.3-policykit-workaround.patch
|
||||||
Patch12: kdelibs-4.1.0-xdg-menu.patch
|
Patch12: kdelibs-4.1.0-xdg-menu.patch
|
||||||
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
||||||
Patch14: kdelibs-4.0.85-libexecdir.patch
|
Patch14: kdelibs-4.0.85-libexecdir.patch
|
||||||
|
@ -368,6 +368,9 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 08 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.3-4
|
||||||
|
- restore NTFS workaround which accidentally got dropped in the 4.1.3 update
|
||||||
|
|
||||||
* Thu Nov 20 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.3-3
|
* Thu Nov 20 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.3-3
|
||||||
- unmess Utilities menu (kdebug:161117)
|
- unmess Utilities menu (kdebug:161117)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue