Rediff policykit-workaround patch.
This commit is contained in:
parent
899ed68461
commit
3fd427b171
|
@ -1,9 +1,7 @@
|
||||||
diff -r -U5 kdelibs-4.3.75svn1048496/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.3.75svn1048496.polkit/solid/solid/backends/hal/halstorageaccess.cpp
|
diff -ur kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp
|
||||||
--- kdelibs-4.3.75svn1048496/solid/solid/backends/hal/halstorageaccess.cpp 2009-08-12 06:00:18.000000000 -0400
|
--- kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.cpp 2009-12-01 01:27:28.000000000 +0100
|
||||||
+++ kdelibs-4.3.75svn1048496.polkit/solid/solid/backends/hal/halstorageaccess.cpp 2009-11-20 14:39:44.000000000 -0500
|
+++ kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp 2009-12-03 03:49:55.000000000 +0100
|
||||||
@@ -15,10 +15,12 @@
|
@@ -17,6 +17,8 @@
|
||||||
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
||||||
Boston, MA 02110-1301, USA.
|
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -12,11 +10,7 @@ diff -r -U5 kdelibs-4.3.75svn1048496/solid/solid/backends/hal/halstorageaccess.c
|
||||||
#include "halstorageaccess.h"
|
#include "halstorageaccess.h"
|
||||||
|
|
||||||
#include "halfstabhandling.h"
|
#include "halfstabhandling.h"
|
||||||
|
@@ -177,11 +179,21 @@
|
||||||
#include <QtCore/QLocale>
|
|
||||||
@@ -170,15 +172,25 @@
|
|
||||||
|
|
||||||
void StorageAccess::slotDBusError(const QDBusError &error)
|
|
||||||
{
|
{
|
||||||
// TODO: Better error reporting here
|
// TODO: Better error reporting here
|
||||||
if (m_setupInProgress) {
|
if (m_setupInProgress) {
|
||||||
|
@ -38,11 +32,7 @@ diff -r -U5 kdelibs-4.3.75svn1048496/solid/solid/backends/hal/halstorageaccess.c
|
||||||
m_teardownInProgress = false;
|
m_teardownInProgress = false;
|
||||||
emit teardownDone(Solid::UnauthorizedOperation,
|
emit teardownDone(Solid::UnauthorizedOperation,
|
||||||
QString(error.name()+": "+error.message()),
|
QString(error.name()+": "+error.message()),
|
||||||
m_device->udi());
|
@@ -311,8 +323,9 @@
|
||||||
}
|
|
||||||
@@ -292,12 +304,13 @@
|
|
||||||
#ifdef Q_OS_FREEBSD
|
|
||||||
QString uid="-u=";
|
|
||||||
#else
|
#else
|
||||||
QString uid="uid=";
|
QString uid="uid=";
|
||||||
#endif
|
#endif
|
||||||
|
@ -54,11 +44,7 @@ diff -r -U5 kdelibs-4.3.75svn1048496/solid/solid/backends/hal/halstorageaccess.c
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef Q_OS_FREEBSD
|
#ifdef Q_OS_FREEBSD
|
||||||
char *cType;
|
@@ -354,6 +367,59 @@
|
||||||
if ( fstype=="vfat" && halOptions.contains("-L=")) {
|
|
||||||
@@ -335,10 +348,63 @@
|
|
||||||
return c.callWithCallback(msg, this,
|
|
||||||
SLOT(slotDBusReply(const QDBusMessage &)),
|
|
||||||
SLOT(slotDBusError(const QDBusError &)));
|
SLOT(slotDBusError(const QDBusError &)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -118,15 +104,10 @@ diff -r -U5 kdelibs-4.3.75svn1048496/solid/solid/backends/hal/halstorageaccess.c
|
||||||
bool StorageAccess::callHalVolumeUnmount()
|
bool StorageAccess::callHalVolumeUnmount()
|
||||||
{
|
{
|
||||||
QDBusConnection c = QDBusConnection::systemBus();
|
QDBusConnection c = QDBusConnection::systemBus();
|
||||||
QString udi = m_device->udi();
|
diff -ur kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h
|
||||||
QDBusMessage msg = QDBusMessage::createMethodCall("org.freedesktop.Hal", udi,
|
--- kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.h 2009-12-01 01:27:28.000000000 +0100
|
||||||
Only in kdelibs-4.3.75svn1048496.polkit/solid/solid/backends/hal: halstorageaccess.cpp.orig
|
+++ kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h 2009-12-03 03:49:55.000000000 +0100
|
||||||
diff -r -U5 kdelibs-4.3.75svn1048496/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.3.75svn1048496.polkit/solid/solid/backends/hal/halstorageaccess.h
|
@@ -70,6 +70,9 @@
|
||||||
--- kdelibs-4.3.75svn1048496/solid/solid/backends/hal/halstorageaccess.h 2008-05-21 07:07:38.000000000 -0400
|
|
||||||
+++ kdelibs-4.3.75svn1048496.polkit/solid/solid/backends/hal/halstorageaccess.h 2009-11-20 14:38:17.000000000 -0500
|
|
||||||
@@ -67,10 +67,13 @@
|
|
||||||
bool callHalVolumeUnmount();
|
|
||||||
|
|
||||||
bool callSystemMount();
|
bool callSystemMount();
|
||||||
bool callSystemUnmount();
|
bool callSystemUnmount();
|
||||||
|
|
||||||
|
@ -136,5 +117,3 @@ diff -r -U5 kdelibs-4.3.75svn1048496/solid/solid/backends/hal/halstorageaccess.h
|
||||||
bool requestPassphrase();
|
bool requestPassphrase();
|
||||||
void callCryptoSetup(const QString &passphrase);
|
void callCryptoSetup(const QString &passphrase);
|
||||||
bool callCryptoTeardown();
|
bool callCryptoTeardown();
|
||||||
|
|
||||||
private:
|
|
|
@ -69,7 +69,7 @@ Patch9: kdelibs-4.0.2-branding.patch
|
||||||
# are loaded from kde4rc
|
# are loaded from kde4rc
|
||||||
Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
|
Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
|
||||||
# workaround for policykit
|
# workaround for policykit
|
||||||
Patch11: kdelibs-4.3.75-policykit-workaround.patch
|
Patch11: kdelibs-4.3.80-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.2.85-libexecdir.patch
|
Patch14: kdelibs-4.2.85-libexecdir.patch
|
||||||
|
|
Loading…
Reference in New Issue