rpms/kdelibs/F-9 kdelibs-4.0.2-policykit-workaround.patch,1.1,1.2

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18574

Modified Files:
	kdelibs-4.0.2-policykit-workaround.patch 
Log Message:
updated patch


kdelibs-4.0.2-policykit-workaround.patch:

Index: kdelibs-4.0.2-policykit-workaround.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs-4.0.2-policykit-workaround.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.0.2-policykit-workaround.patch	27 Mar 2008 11:19:11 -0000	1.1
+++ kdelibs-4.0.2-policykit-workaround.patch	4 Nov 2008 14:28:30 -0000	1.2
@@ -1,15 +1,21 @@
-diff -ur kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.0.2-userdiskmount/solid/solid/backends/hal/halstorageaccess.cpp
---- kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp	2008-01-05 01:00:10.000000000 +0100
-+++ kdelibs-4.0.2-userdiskmount/solid/solid/backends/hal/halstorageaccess.cpp	2008-03-18 11:00:40.000000000 +0100
-@@ -20,6 +20,7 @@
+diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.3/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-11-04 15:24:21.000000000 +0100
+@@ -17,10 +17,13 @@
+ 
+ */
+ 
++#include <config-prefix.h> // for LIBEXEC_INSTALL_DIR
++
  #include "halstorageaccess.h"
  
+ #include <QtCore/QLocale>
  #include <QtCore/QDebug>
 +#include <QtCore/QProcess>
  #include <QtDBus/QDBusConnection>
  #include <QtDBus/QDBusInterface>
  #include <QtDBus/QDBusReply>
-@@ -131,11 +132,21 @@
+@@ -137,11 +140,21 @@
  {
      // TODO: Better error reporting here
      if (m_setupInProgress) {
@@ -31,19 +37,7 @@
          m_teardownInProgress = false;
          emit teardownDone(Solid::UnauthorizedOperation,
                            error.name()+": "+error.message(),
-@@ -229,8 +240,10 @@
-                                                       "Mount");
-     QStringList options;
-     QStringList halOptions = m_device->property("volume.mount.valid_options").toStringList();
-+    QString fstype = m_device->property("volume.fstype").toString();
- 
--    if (halOptions.contains("uid=")) {
-+    if (halOptions.contains("uid=")
-+        && (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) {
-         options << "uid="+QString::number(::getuid());
-     }
- 
-@@ -256,6 +269,59 @@
+@@ -297,6 +310,59 @@
                                SLOT(slotDBusError(const QDBusError &)));
  }
  
@@ -103,9 +97,9 @@
  bool Solid::Backends::Hal::StorageAccess::callSystemMount()
  {
      const QString device = m_device->property("block.device").toString();
-diff -ur kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.0.2-userdiskmount/solid/solid/backends/hal/halstorageaccess.h
---- kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.h	2008-01-05 01:00:11.000000000 +0100
-+++ kdelibs-4.0.2-userdiskmount/solid/solid/backends/hal/halstorageaccess.h	2008-03-18 09:26:39.000000000 +0100
+diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.3/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-11-04 15:24:21.000000000 +0100
 @@ -69,6 +69,9 @@
      bool callSystemMount();
      bool callSystemUnmount();
@@ -116,15 +110,3 @@
      bool requestPassphrase();
      void callCryptoSetup(const QString &passphrase);
      bool callCryptoTeardown();
-diff -up kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp.orig kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp
---- kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp.orig	2008-03-26 17:00:23.000000000 +0100
-+++ kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp	2008-03-26 17:04:35.000000000 +0100
-@@ -17,6 +17,8 @@
- 
- */
- 
-+#include <config-prefix.h> // for LIBEXEC_INSTALL_DIR
-+
- #include "halstorageaccess.h"
- 
- #include <QtCore/QDebug>