rpms/kdelibs
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Oops, it's 2009 already. ;-)

Browse Source
This commit is contained in:
Kevin Kofler 2009-01-08 05:00:14 +00:00
parent be8a00aeca
commit 4911c1c8af
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
kdelibs-4.1.4-policykit-workaround.patch
View File

@ -1,7 +1,6 @@
Pouze v kdelibs-4.1.4: kdelibs-4.1.3-policykit-workaround.patch diff -ur kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp
diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp --- kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp 2009-01-07 00:34:55.000000000 +0100
--- kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp 2009-01-07 00:34:55.000000000 +0100 +++ kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp 2009-01-08 05:56:56.000000000 +0100
+++ kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp 2009-01-07 15:26:27.000000000 +0100
@@ -17,10 +17,13 @@ @@ -17,10 +17,13 @@
*/ */
@ -38,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(),
@@ -314,6 +327,59 @@ @@ -259,7 +272,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());
}
@@ -314,6 +328,59 @@
SLOT(slotDBusError(const QDBusError &))); SLOT(slotDBusError(const QDBusError &)));
} }
@ -98,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.4/solid/solid/backends/hal/halstorageaccess.h diff -ur kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h
--- kdelibs-orig/solid/solid/backends/hal/halstorageaccess.h 2009-01-07 00:34:55.000000000 +0100 --- kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h 2009-01-07 00:34:55.000000000 +0100
+++ kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h 2009-01-07 15:26:27.000000000 +0100 +++ kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h 2009-01-08 05:37:59.000000000 +0100
@@ -69,6 +69,9 @@ @@ -69,6 +69,9 @@
bool callSystemMount(); bool callSystemMount();
bool callSystemUnmount(); bool callSystemUnmount();

5
kdelibs.spec
View File

@ -2,7 +2,7 @@
Summary: K Desktop Environment 4 - Libraries Summary: K Desktop Environment 4 - Libraries
Version: 4.1.4 Version: 4.1.4
Release: 1%{?dist} Release: 2%{?dist}
%if 0%{?fedora} > 8 %if 0%{?fedora} > 8
Name: kdelibs Name: kdelibs
@ -363,6 +363,9 @@ rm -rf %{buildroot}
%changelog %changelog
* Thu Jan 08 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.4-2
- restore AWOL NTFS workaround yet again
* Wed Jan 7 2009 Lukáš Tinkl <ltinkl@redhat.com> 4.1.4-1 * Wed Jan 7 2009 Lukáš Tinkl <ltinkl@redhat.com> 4.1.4-1
- KDE 4.1.4 - KDE 4.1.4