[kdelibs] fixup include paths, don't include the whole files
Lukas Tinkl
ltinkl at fedoraproject.org
Tue Apr 17 17:26:48 UTC 2012
commit f4aa6865377db7f2d36cd1aeb95f0cf6bf9d4ba0
Author: Lukas Tinkl <lukas at kde.org>
Date: Tue Apr 17 19:26:11 2012 +0200
fixup include paths, don't include the whole files
kdelibs-udisks2-backend.patch | 573 +++++++++++++++++------------------------
1 files changed, 235 insertions(+), 338 deletions(-)
---
diff --git a/kdelibs-udisks2-backend.patch b/kdelibs-udisks2-backend.patch
index 5c52088..b7a71f5 100644
--- a/kdelibs-udisks2-backend.patch
+++ b/kdelibs-udisks2-backend.patch
@@ -1,6 +1,123 @@
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.cpp.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.cpp
---- kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.cpp.udisks2backend 2012-04-17 11:07:51.519956884 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.cpp 2012-04-17 11:07:51.519956884 +0200
+diff --git a/tier1/solid/src/solid/CMakeLists.txt b/tier1/solid/src/solid/CMakeLists.txt
+index 5deadcf..40af6bc 100644
+--- a/tier1/solid/src/solid/CMakeLists.txt
++++ b/tier1/solid/src/solid/CMakeLists.txt
+@@ -32,7 +32,6 @@ configure_file(config-processor.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-proce
+
+ file(MAKE_DIRECTORY
+ ${CMAKE_CURRENT_BINARY_DIR}/backends/fakehw
+- ${CMAKE_CURRENT_BINARY_DIR}/backends/hal
+ ${CMAKE_CURRENT_BINARY_DIR}/backends/udev
+ ${CMAKE_CURRENT_BINARY_DIR}/backends/wmi
+ )
+@@ -198,33 +197,6 @@ if(NOT WIN32 AND NOT APPLE)
+ endif( UDEV_FOUND )
+
+
+- message(STATUS "Building Solid HAL backend." )
+- set(solid_LIB_SRCS ${solid_LIB_SRCS}
+- backends/hal/halacadapter.cpp
+- backends/hal/halaudiointerface.cpp
+- backends/hal/halbattery.cpp
+- backends/hal/halblock.cpp
+- backends/hal/halbutton.cpp
+- backends/hal/halcamera.cpp
+- backends/hal/halcdrom.cpp
+- backends/hal/haldeviceinterface.cpp
+- backends/hal/haldvbinterface.cpp
+- backends/hal/halfstabhandling.cpp
+- backends/hal/halgenericinterface.cpp
+- backends/hal/haldevice.cpp
+- backends/hal/halmanager.cpp
+- backends/hal/halnetworkinterface.cpp
+- backends/hal/halserialinterface.cpp
+- backends/hal/halopticaldisc.cpp
+- backends/hal/halportablemediaplayer.cpp
+- backends/hal/halprocessor.cpp
+- backends/hal/halstorageaccess.cpp
+- backends/hal/halstorage.cpp
+- backends/hal/halvideo.cpp
+- backends/hal/halvolume.cpp
+- backends/hal/halsmartcardreader.cpp
+- )
+-
+ message(STATUS "Building Solid UPower backend." )
+ set(solid_LIB_SRCS ${solid_LIB_SRCS}
+ backends/upower/upowermanager.cpp
+@@ -237,18 +209,19 @@ if(NOT WIN32 AND NOT APPLE)
+
+ # FIXME: this should work on more Unix systems
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+- message(STATUS "Building Solid UDisks backend." )
++ message(STATUS "Building Solid UDisks2 backend." )
+ set(solid_LIB_SRCS ${solid_LIB_SRCS}
+- backends/udisks/udisksmanager.cpp
+- backends/udisks/udisksdevice.cpp
+- backends/udisks/udisksblock.cpp
+- backends/udisks/udisksstoragevolume.cpp
+- backends/udisks/udisksdeviceinterface.cpp
+- backends/udisks/udisksopticaldisc.cpp
+- backends/udisks/udisksopticaldrive.cpp
+- backends/udisks/udisksstoragedrive.cpp
+- backends/udisks/udisksstorageaccess.cpp
+- backends/udisks/udisksgenericinterface.cpp
++ backends/udisks2/udisksmanager.cpp
++ backends/udisks2/udisksdevice.cpp
++ backends/udisks2/udisksblock.cpp
++ backends/udisks2/udisksstoragevolume.cpp
++ backends/udisks2/udisksdeviceinterface.cpp
++ backends/udisks2/udisksopticaldisc.cpp
++ backends/udisks2/udisksopticaldrive.cpp
++ backends/udisks2/udisksstoragedrive.cpp
++ backends/udisks2/udisksstorageaccess.cpp
++ backends/udisks2/udisksgenericinterface.cpp
++ backends/udisks2/dbus/manager.cpp
+ )
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+
+diff --git a/tier1/solid/src/solid/managerbase.cpp b/tier1/solid/src/solid/managerbase.cpp
+index e228b48..7a7cc7d 100644
+--- a/tier1/solid/src/solid/managerbase.cpp
++++ b/tier1/solid/src/solid/managerbase.cpp
+@@ -30,8 +30,7 @@
+ #if defined (Q_OS_MAC)
+ #include "backends/iokit/iokitmanager.h"
+ #elif defined (Q_OS_UNIX)
+-#include "backends/hal/halmanager.h"
+-#include "backends/udisks/udisksmanager.h"
++#include "backends/udisks2/udisksmanager.h"
+ #include "backends/upower/upowermanager.h"
+
+ #if defined (HUPNP_FOUND)
+@@ -71,22 +70,13 @@ void Solid::ManagerBasePrivate::loadBackends()
+ # elif defined(Q_OS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
+ m_backends << new Solid::Backends::Wmi::WmiManager(0);
+
+-# elif defined(Q_OS_UNIX) && !defined(Q_OS_LINUX)
+- m_backends << new Solid::Backends::Hal::HalManager(0);
+-
+ # elif defined(Q_OS_LINUX)
+- bool solidHalLegacyEnabled
+- = QString::fromLocal8Bit(qgetenv("SOLID_HAL_LEGACY")).toInt()==1;
+- if (solidHalLegacyEnabled) {
+- m_backends << new Solid::Backends::Hal::HalManager(0);
+- } else {
+ # if defined(UDEV_FOUND)
+ m_backends << new Solid::Backends::UDev::UDevManager(0);
+ # endif
+- m_backends << new Solid::Backends::UDisks::UDisksManager(0)
++ m_backends << new Solid::Backends::UDisks2::Manager(0)
+ << new Solid::Backends::UPower::UPowerManager(0)
+ << new Solid::Backends::Fstab::FstabManager(0);
+- }
+ # endif
+
+ # if defined (HUPNP_FOUND)
+diff --git a/tier1/solid/src/solid/backends/udisks2/dbus/manager.cpp b/tier1/solid/src/solid/backends/udisks2/dbus/manager.cpp
+new file mode 100644
+index 0000000..7ea4aa8
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/dbus/manager.cpp
@@ -0,0 +1,26 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.7
@@ -28,9 +145,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.cpp.udisks2back
+{
+}
+
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.h.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.h
---- kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.h.udisks2backend 2012-04-17 11:07:51.519956884 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.h 2012-04-17 11:07:51.519956884 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/dbus/manager.h b/tier1/solid/src/solid/backends/udisks2/dbus/manager.h
+new file mode 100644
+index 0000000..11f0be8
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/dbus/manager.h
@@ -0,0 +1,59 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.7
@@ -91,9 +210,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.h.udisks2backen
+ }
+}
+#endif
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.xml.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.xml
---- kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.xml.udisks2backend 2012-04-17 11:07:51.519956884 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.xml 2012-04-17 11:07:51.519956884 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/dbus/manager.xml b/tier1/solid/src/solid/backends/udisks2/dbus/manager.xml
+new file mode 100644
+index 0000000..8f25cb6
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/dbus/manager.xml
@@ -0,0 +1,21 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
@@ -116,9 +237,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/dbus/manager.xml.udisks2back
+ </signal>
+ </interface>
+</node>
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisks2.h.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisks2.h
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisks2.h.udisks2backend 2012-04-17 11:07:51.519956884 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisks2.h 2012-04-17 11:07:51.519956884 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisks2.h b/tier1/solid/src/solid/backends/udisks2/udisks2.h
+new file mode 100644
+index 0000000..25a1dc0
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisks2.h
@@ -0,0 +1,77 @@
+/*
+ Copyright 2012 Lukáš Tinkl <ltinkl at redhat.com>
@@ -197,9 +320,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisks2.h.udisks2backend kde
+#define UD2_ERROR_NOT_AUTHORIZED_DISMISSED "org.freedesktop.UDisks2.Error.NotAuthorizedDismissed"
+
+#endif // SOLID_BACKENDS_UDISKS2_H
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksblock.cpp.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksblock.cpp
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksblock.cpp.udisks2backend 2012-04-17 11:07:51.519956884 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksblock.cpp 2012-04-17 11:07:51.519956884 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksblock.cpp b/tier1/solid/src/solid/backends/udisks2/udisksblock.cpp
+new file mode 100644
+index 0000000..8a7a0b5
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksblock.cpp
@@ -0,0 +1,52 @@
+/*
+ Copyright 2012 Lukáš Tinkl <ltinkl at redhat.com>
@@ -253,9 +378,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksblock.cpp.udisks2backe
+{
+ return MAJOR(m_devNum);
+}
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksblock.h.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksblock.h
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksblock.h.udisks2backend 2012-04-17 11:07:51.519956884 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksblock.h 2012-04-17 11:07:51.519956884 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksblock.h b/tier1/solid/src/solid/backends/udisks2/udisksblock.h
+new file mode 100644
+index 0000000..804d712
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksblock.h
@@ -0,0 +1,55 @@
+/*
+ Copyright 2012 Lukáš Tinkl <ltinkl at redhat.com>
@@ -312,9 +439,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksblock.h.udisks2backend
+}
+
+#endif // UDISKS2BLOCK_H
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdevice.cpp.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdevice.cpp
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdevice.cpp.udisks2backend 2012-04-17 11:07:51.520956884 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdevice.cpp 2012-04-17 11:07:51.520956884 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp b/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp
+new file mode 100644
+index 0000000..628c0b0
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp
@@ -0,0 +1,906 @@
+/*
+ Copyright 2010 Michael Zanetti <mzanetti at kde.org>
@@ -1222,9 +1351,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdevice.cpp.udisks2back
+{
+ return hasInterface(UD2_DBUS_INTERFACE_SWAP);
+}
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdevice.h.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdevice.h
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdevice.h.udisks2backend 2012-04-17 11:07:51.520956884 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdevice.h 2012-04-17 11:07:51.520956884 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksdevice.h b/tier1/solid/src/solid/backends/udisks2/udisksdevice.h
+new file mode 100644
+index 0000000..6f8056b
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksdevice.h
@@ -0,0 +1,110 @@
+/*
+ Copyright 2010 Michael Zanetti <mzanetti at kde.org>
@@ -1336,9 +1467,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdevice.h.udisks2backen
+}
+
+#endif // UDISKS2DEVICE_H
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdeviceinterface.cpp.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdeviceinterface.cpp
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdeviceinterface.cpp.udisks2backend 2012-04-17 11:07:51.521956885 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdeviceinterface.cpp 2012-04-17 11:07:51.521956885 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksdeviceinterface.cpp b/tier1/solid/src/solid/backends/udisks2/udisksdeviceinterface.cpp
+new file mode 100644
+index 0000000..9fa60e5
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksdeviceinterface.cpp
@@ -0,0 +1,33 @@
+/*
+ Copyright 2010 Michael Zanetti <mzanetti at kde.org>
@@ -1373,9 +1506,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdeviceinterface.cpp.ud
+DeviceInterface::~DeviceInterface()
+{
+}
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdeviceinterface.h.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdeviceinterface.h
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdeviceinterface.h.udisks2backend 2012-04-17 11:07:51.521956885 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdeviceinterface.h 2012-04-17 11:07:51.521956885 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksdeviceinterface.h b/tier1/solid/src/solid/backends/udisks2/udisksdeviceinterface.h
+new file mode 100644
+index 0000000..43a1b6f
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksdeviceinterface.h
@@ -0,0 +1,148 @@
+/*
+ Copyright 2010 Michael Zanetti <mzanetti at kde.org>
@@ -1525,9 +1660,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksdeviceinterface.h.udis
+}
+
+#endif // UDISKS2DEVICEINTERFACE_H
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksgenericinterface.cpp.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksgenericinterface.cpp
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksgenericinterface.cpp.udisks2backend 2012-04-17 11:07:51.521956885 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksgenericinterface.cpp 2012-04-17 11:07:51.521956885 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksgenericinterface.cpp b/tier1/solid/src/solid/backends/udisks2/udisksgenericinterface.cpp
+new file mode 100644
+index 0000000..2d8cea2
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksgenericinterface.cpp
@@ -0,0 +1,53 @@
+/*
+ Copyright 2009 Pino Toscano <pino at kde.org>
@@ -1582,9 +1719,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksgenericinterface.cpp.u
+ return m_device->propertyExists(key);
+}
+
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksgenericinterface.h.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksgenericinterface.h
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksgenericinterface.h.udisks2backend 2012-04-17 11:07:51.521956885 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksgenericinterface.h 2012-04-17 11:07:51.521956885 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksgenericinterface.h b/tier1/solid/src/solid/backends/udisks2/udisksgenericinterface.h
+new file mode 100644
+index 0000000..d225f32
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksgenericinterface.h
@@ -0,0 +1,57 @@
+/*
+ Copyright 2009 Pino Toscano <pino at kde.org>
@@ -1643,9 +1782,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksgenericinterface.h.udi
+}
+
+#endif // SOLID_BACKENDS_UDISKS2_GENERICINTERFACE_H
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksmanager.cpp.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksmanager.cpp
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksmanager.cpp.udisks2backend 2012-04-17 11:07:51.522956886 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksmanager.cpp 2012-04-17 11:07:51.522956886 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksmanager.cpp b/tier1/solid/src/solid/backends/udisks2/udisksmanager.cpp
+new file mode 100644
+index 0000000..2e6f8c6
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksmanager.cpp
@@ -0,0 +1,294 @@
+/*
+ Copyright 2012 Lukáš Tinkl <ltinkl at redhat.com>
@@ -1941,9 +2082,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksmanager.cpp.udisks2bac
+
+ return m_deviceCache;
+}
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksmanager.h.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksmanager.h
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksmanager.h.udisks2backend 2012-04-17 11:07:51.522956886 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksmanager.h 2012-04-17 11:07:51.522956886 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksmanager.h b/tier1/solid/src/solid/backends/udisks2/udisksmanager.h
+new file mode 100644
+index 0000000..7cf0a72
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksmanager.h
@@ -0,0 +1,69 @@
+/*
+ Copyright 2010 Michael Zanetti <mzanetti at kde.org>
@@ -2014,9 +2157,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksmanager.h.udisks2backe
+}
+}
+#endif // UDISKS2MANAGER_H
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldisc.cpp.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldisc.cpp
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldisc.cpp.udisks2backend 2012-04-17 11:07:51.522956886 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldisc.cpp 2012-04-17 11:07:51.523956887 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksopticaldisc.cpp b/tier1/solid/src/solid/backends/udisks2/udisksopticaldisc.cpp
+new file mode 100644
+index 0000000..bceb277
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksopticaldisc.cpp
@@ -0,0 +1,274 @@
+/*
+ Copyright 2010 Michael Zanetti <mzanetti at kde.org>
@@ -2292,9 +2437,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldisc.cpp.udisks
+{
+ return m_drive->prop("Media").toString();
+}
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldisc.h.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldisc.h
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldisc.h.udisks2backend 2012-04-17 11:07:51.523956887 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldisc.h 2012-04-17 11:07:51.523956887 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksopticaldisc.h b/tier1/solid/src/solid/backends/udisks2/udisksopticaldisc.h
+new file mode 100644
+index 0000000..1e2f030
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksopticaldisc.h
@@ -0,0 +1,69 @@
+/*
+ Copyright 2010 Michael Zanetti <mzanetti at kde.org>
@@ -2365,9 +2512,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldisc.h.udisks2b
+}
+}
+#endif // UDISKS2OPTICALDISC_H
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldrive.cpp.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldrive.cpp
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldrive.cpp.udisks2backend 2012-04-17 11:07:51.523956887 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldrive.cpp 2012-04-17 11:07:51.523956887 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksopticaldrive.cpp b/tier1/solid/src/solid/backends/udisks2/udisksopticaldrive.cpp
+new file mode 100644
+index 0000000..0eb4685
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksopticaldrive.cpp
@@ -0,0 +1,188 @@
+/*
+ Copyright 2010 Michael Zanetti <mzanetti at kde.org>
@@ -2557,9 +2706,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldrive.cpp.udisk
+{
+ m_speedsInit = false; // reset the read/write speeds, changes eg. with an inserted media
+}
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldrive.h.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldrive.h
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldrive.h.udisks2backend 2012-04-17 11:07:51.523956887 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldrive.h 2012-04-17 11:07:51.523956887 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksopticaldrive.h b/tier1/solid/src/solid/backends/udisks2/udisksopticaldrive.h
+new file mode 100644
+index 0000000..4c98ef5
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksopticaldrive.h
@@ -0,0 +1,81 @@
+/*
+ Copyright 2010 Michael Zanetti <mzanetti at kde.org>
@@ -2642,9 +2793,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksopticaldrive.h.udisks2
+}
+
+#endif // UDISKS2OPTICALDRIVE_H
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstorageaccess.cpp.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstorageaccess.cpp
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstorageaccess.cpp.udisks2backend 2012-04-17 11:07:51.524956887 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstorageaccess.cpp 2012-04-17 11:07:51.524956887 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksstorageaccess.cpp b/tier1/solid/src/solid/backends/udisks2/udisksstorageaccess.cpp
+new file mode 100644
+index 0000000..9239bcb
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksstorageaccess.cpp
@@ -0,0 +1,359 @@
+/*
+ Copyright 2009 Pino Toscano <pino at kde.org>
@@ -3005,9 +3158,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstorageaccess.cpp.udis
+ SLOT(slotDBusReply(const QDBusMessage &)),
+ SLOT(slotDBusError(const QDBusError &)));
+}
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstorageaccess.h.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstorageaccess.h
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstorageaccess.h.udisks2backend 2012-04-17 11:07:51.524956887 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstorageaccess.h 2012-04-17 11:07:51.524956887 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksstorageaccess.h b/tier1/solid/src/solid/backends/udisks2/udisksstorageaccess.h
+new file mode 100644
+index 0000000..36f2102
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksstorageaccess.h
@@ -0,0 +1,104 @@
+/*
+ Copyright 2009 Pino Toscano <pino at kde.org>
@@ -3113,9 +3268,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstorageaccess.h.udisks
+}
+
+#endif // UDISKS2STORAGEACCESS_H
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragedrive.cpp.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragedrive.cpp
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragedrive.cpp.udisks2backend 2012-04-17 11:07:51.524956887 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragedrive.cpp 2012-04-17 11:07:51.525956887 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksstoragedrive.cpp b/tier1/solid/src/solid/backends/udisks2/udisksstoragedrive.cpp
+new file mode 100644
+index 0000000..3a62857
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksstoragedrive.cpp
@@ -0,0 +1,144 @@
+/*
+ Copyright 2010 Michael Zanetti <mzanetti at kde.org>
@@ -3261,9 +3418,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragedrive.cpp.udisk
+ else
+ return Solid::StorageDrive::Platform;
+}
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragedrive.h.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragedrive.h
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragedrive.h.udisks2backend 2012-04-17 11:07:51.525956887 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragedrive.h 2012-04-17 11:07:51.525956887 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksstoragedrive.h b/tier1/solid/src/solid/backends/udisks2/udisksstoragedrive.h
+new file mode 100644
+index 0000000..97007b3
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksstoragedrive.h
@@ -0,0 +1,61 @@
+/*
+ Copyright 2010 Michael Zanetti <mzanetti at kde.org>
@@ -3326,9 +3485,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragedrive.h.udisks2
+}
+
+#endif // UDISK2SSTORAGEDRIVE_H
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragevolume.cpp.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragevolume.cpp
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragevolume.cpp.udisks2backend 2012-04-17 11:07:51.525956887 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragevolume.cpp 2012-04-17 11:07:51.525956887 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksstoragevolume.cpp b/tier1/solid/src/solid/backends/udisks2/udisksstoragevolume.cpp
+new file mode 100644
+index 0000000..a7d8fad
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksstoragevolume.cpp
@@ -0,0 +1,105 @@
+/*
+ Copyright 2010 Michael Zanetti <mzanetti at kde.org>
@@ -3435,9 +3596,11 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragevolume.cpp.udis
+ return m_device->prop("HintIgnore").toBool() || m_device->isSwap() ||
+ ((usg == Solid::StorageVolume::Unused || usg == Solid::StorageVolume::Other || usg == Solid::StorageVolume::PartitionTable) && !m_device->isOpticalDisc());
+}
-diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragevolume.h.udisks2backend kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragevolume.h
---- kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragevolume.h.udisks2backend 2012-04-17 11:07:51.525956887 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragevolume.h 2012-04-17 11:07:51.525956887 +0200
+diff --git a/tier1/solid/src/solid/backends/udisks2/udisksstoragevolume.h b/tier1/solid/src/solid/backends/udisks2/udisksstoragevolume.h
+new file mode 100644
+index 0000000..2ca04d2
+--- /dev/null
++++ b/tier1/solid/src/solid/backends/udisks2/udisksstoragevolume.h
@@ -0,0 +1,57 @@
+/*
+ Copyright 2010 Michael Zanetti <mzanetti at kde.org>
@@ -3496,269 +3659,3 @@ diff -up kdelibs-4.8.1/solid/solid/backends/udisks2/udisksstoragevolume.h.udisks
+}
+
+#endif // UDISKS2STORAGEVOLUME_H
-diff -up kdelibs-4.8.1/solid/solid/CMakeLists.txt.udisks2backend kdelibs-4.8.1/solid/solid/CMakeLists.txt
---- kdelibs-4.8.1/solid/solid/CMakeLists.txt.udisks2backend 2011-07-27 20:34:38.000000000 +0200
-+++ kdelibs-4.8.1/solid/solid/CMakeLists.txt 2012-04-17 11:07:51.518956884 +0200
-@@ -39,7 +39,6 @@ configure_file(config-processor.h.cmake
-
- file(MAKE_DIRECTORY
- ${CMAKE_CURRENT_BINARY_DIR}/backends/fakehw
-- ${CMAKE_CURRENT_BINARY_DIR}/backends/hal
- ${CMAKE_CURRENT_BINARY_DIR}/backends/udev
- ${CMAKE_CURRENT_BINARY_DIR}/backends/wmi
- )
-@@ -199,33 +198,6 @@ if(NOT WIN32 AND NOT APPLE)
- endif( UDEV_FOUND )
-
-
-- message(STATUS "Building Solid HAL backend." )
-- set(solid_LIB_SRCS ${solid_LIB_SRCS}
-- backends/hal/halacadapter.cpp
-- backends/hal/halaudiointerface.cpp
-- backends/hal/halbattery.cpp
-- backends/hal/halblock.cpp
-- backends/hal/halbutton.cpp
-- backends/hal/halcamera.cpp
-- backends/hal/halcdrom.cpp
-- backends/hal/haldeviceinterface.cpp
-- backends/hal/haldvbinterface.cpp
-- backends/hal/halfstabhandling.cpp
-- backends/hal/halgenericinterface.cpp
-- backends/hal/haldevice.cpp
-- backends/hal/halmanager.cpp
-- backends/hal/halnetworkinterface.cpp
-- backends/hal/halserialinterface.cpp
-- backends/hal/halopticaldisc.cpp
-- backends/hal/halportablemediaplayer.cpp
-- backends/hal/halprocessor.cpp
-- backends/hal/halstorageaccess.cpp
-- backends/hal/halstorage.cpp
-- backends/hal/halvideo.cpp
-- backends/hal/halvolume.cpp
-- backends/hal/halsmartcardreader.cpp
-- )
--
- message(STATUS "Building Solid UPower backend." )
- set(solid_LIB_SRCS ${solid_LIB_SRCS}
- backends/upower/upowermanager.cpp
-@@ -238,18 +210,19 @@ if(NOT WIN32 AND NOT APPLE)
-
- # FIXME: this should work on more Unix systems
- if (CMAKE_SYSTEM_NAME MATCHES Linux)
-- message(STATUS "Building Solid UDisks backend." )
-+ message(STATUS "Building Solid UDisks2 backend." )
- set(solid_LIB_SRCS ${solid_LIB_SRCS}
-- backends/udisks/udisksmanager.cpp
-- backends/udisks/udisksdevice.cpp
-- backends/udisks/udisksblock.cpp
-- backends/udisks/udisksstoragevolume.cpp
-- backends/udisks/udisksdeviceinterface.cpp
-- backends/udisks/udisksopticaldisc.cpp
-- backends/udisks/udisksopticaldrive.cpp
-- backends/udisks/udisksstoragedrive.cpp
-- backends/udisks/udisksstorageaccess.cpp
-- backends/udisks/udisksgenericinterface.cpp
-+ backends/udisks2/udisksmanager.cpp
-+ backends/udisks2/udisksdevice.cpp
-+ backends/udisks2/udisksblock.cpp
-+ backends/udisks2/udisksstoragevolume.cpp
-+ backends/udisks2/udisksdeviceinterface.cpp
-+ backends/udisks2/udisksopticaldisc.cpp
-+ backends/udisks2/udisksopticaldrive.cpp
-+ backends/udisks2/udisksstoragedrive.cpp
-+ backends/udisks2/udisksstorageaccess.cpp
-+ backends/udisks2/udisksgenericinterface.cpp
-+ backends/udisks2/dbus/manager.cpp
- )
- endif (CMAKE_SYSTEM_NAME MATCHES Linux)
-
-diff -up kdelibs-4.8.1/solid/solid/managerbase.cpp.udisks2backend kdelibs-4.8.1/solid/solid/managerbase.cpp
---- kdelibs-4.8.1/solid/solid/managerbase.cpp.udisks2backend 2012-04-17 11:07:51.509956880 +0200
-+++ kdelibs-4.8.1/solid/solid/managerbase.cpp 2012-04-17 16:03:32.948162340 +0200
-@@ -30,8 +30,7 @@
- #if defined (Q_OS_MAC)
- #include "backends/iokit/iokitmanager.h"
- #elif defined (Q_OS_UNIX)
--#include "backends/hal/halmanager.h"
--#include "backends/udisks/udisksmanager.h"
-+#include "backends/udisks2/udisksmanager.h"
- #include "backends/upower/upowermanager.h"
-
- #if defined (HUPNP_FOUND)
-@@ -71,22 +70,13 @@ void Solid::ManagerBasePrivate::loadBack
- # elif defined(Q_WS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
- m_backends << new Solid::Backends::Wmi::WmiManager(0);
-
--# elif defined(Q_OS_UNIX) && !defined(Q_OS_LINUX)
-- m_backends << new Solid::Backends::Hal::HalManager(0);
--
- # elif defined(Q_OS_LINUX)
-- bool solidHalLegacyEnabled
-- = QString::fromLocal8Bit(qgetenv("SOLID_HAL_LEGACY")).toInt()==1;
-- if (solidHalLegacyEnabled) {
-- m_backends << new Solid::Backends::Hal::HalManager(0);
-- } else {
- # if defined(UDEV_FOUND)
- m_backends << new Solid::Backends::UDev::UDevManager(0);
- # endif
-- m_backends << new Solid::Backends::UDisks::UDisksManager(0)
-+ m_backends << new Solid::Backends::UDisks2::Manager(0)
- << new Solid::Backends::UPower::UPowerManager(0)
- << new Solid::Backends::Fstab::FstabManager(0);
-- }
- # endif
-
- # if defined (HUPNP_FOUND)
-diff -up kdelibs-4.8.1/solid/solid/backends/shared/udevqtclient.h.orig kdelibs-4.8.1/solid/solid/backends/shared/udevqtclient.h
---- kdelibs-4.8.1/solid/solid/backends/shared/udevqtclient.h.orig 2012-04-17 18:22:15.216292009 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/shared/udevqtclient.h 2012-04-17 18:22:40.924283902 +0200
-@@ -0,0 +1,72 @@
-+/*
-+ Copyright 2009 Benjamin K. Stuhl <bks24 at cornell.edu>
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) version 3, or any
-+ later version accepted by the membership of KDE e.V. (or its
-+ successor approved by the membership of KDE e.V.), which shall
-+ act as a proxy defined in Section 6 of version 3 of the license.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
-+*/
-+
-+#ifndef UDEVQTCLIENT_H
-+#define UDEVQTCLIENT_H
-+
-+#include <QtCore/QObject>
-+#include <QtCore/QList>
-+#include <QtCore/QString>
-+#include <QtCore/QStringList>
-+#include <QtCore/QVariant>
-+
-+#include "udevqtdevice.h"
-+
-+namespace UdevQt
-+{
-+
-+class ClientPrivate;
-+class Client : public QObject
-+{
-+ Q_OBJECT
-+
-+ Q_PROPERTY(QStringList watchedSubsystems READ watchedSubsystems WRITE setWatchedSubsystems)
-+
-+ public:
-+ Client(QObject *parent = 0);
-+ Client(const QStringList &subsystemList, QObject *parent = 0);
-+ ~Client();
-+
-+ QStringList watchedSubsystems() const;
-+ void setWatchedSubsystems(const QStringList &subsystemList);
-+
-+ DeviceList allDevices();
-+ DeviceList devicesByProperty(const QString &property, const QVariant &value);
-+ DeviceList devicesBySubsystem(const QString &subsystem);
-+ Device deviceByDeviceFile(const QString &deviceFile);
-+ Device deviceBySysfsPath(const QString &sysfsPath);
-+ Device deviceBySubsystemAndName(const QString &subsystem, const QString &name);
-+
-+ Q_SIGNALS:
-+ void deviceAdded(const UdevQt::Device &dev);
-+ void deviceRemoved(const UdevQt::Device &dev);
-+ void deviceChanged(const UdevQt::Device &dev);
-+ void deviceOnlined(const UdevQt::Device &dev);
-+ void deviceOfflined(const UdevQt::Device &dev);
-+
-+ private:
-+ friend class ClientPrivate;
-+ Q_PRIVATE_SLOT(d, void _uq_monitorReadyRead(int fd))
-+ ClientPrivate *d;
-+};
-+
-+}
-+
-+#endif
-diff -up kdelibs-4.8.1/solid/solid/backends/shared/udevqtdevice.h.orig kdelibs-4.8.1/solid/solid/backends/shared/udevqtdevice.h
---- kdelibs-4.8.1/solid/solid/backends/shared/udevqtdevice.h.orig 2012-04-17 18:22:29.513287510 +0200
-+++ kdelibs-4.8.1/solid/solid/backends/shared/udevqtdevice.h 2012-04-17 18:22:40.924283902 +0200
-@@ -0,0 +1,73 @@
-+/*
-+ Copyright 2009 Benjamin K. Stuhl <bks24 at cornell.edu>
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) version 3, or any
-+ later version accepted by the membership of KDE e.V. (or its
-+ successor approved by the membership of KDE e.V.), which shall
-+ act as a proxy defined in Section 6 of version 3 of the license.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
-+*/
-+
-+#ifndef UDEVQTDEVICE_H
-+#define UDEVQTDEVICE_H
-+
-+#include <QtCore/QObject>
-+#include <QtCore/QList>
-+#include <QtCore/QString>
-+#include <QtCore/QStringList>
-+#include <QtCore/QVariant>
-+
-+namespace UdevQt
-+{
-+
-+class DevicePrivate;
-+class Device
-+{
-+ public:
-+ Device();
-+ Device(const Device &other);
-+ ~Device();
-+ Device &operator= (const Device &other);
-+
-+ bool isValid() const;
-+ QString subsystem() const;
-+ QString devType() const;
-+ QString name() const;
-+ QString sysfsPath() const;
-+ int sysfsNumber() const;
-+ QString driver() const;
-+ QString primaryDeviceFile() const;
-+ QStringList alternateDeviceSymlinks() const;
-+ QStringList deviceProperties() const;
-+ Device parent() const;
-+
-+ // ### should this really be a QVariant? as far as udev knows, everything is a string...
-+ // see also Client::devicesByProperty
-+ QVariant deviceProperty(const QString &name) const;
-+ QString decodedDeviceProperty(const QString &name) const;
-+ QVariant sysfsProperty(const QString &name) const;
-+ Device ancestorOfType(const QString &subsys, const QString &devtype) const;
-+
-+ private:
-+ Device(DevicePrivate *devPrivate);
-+ friend class Client;
-+ friend class ClientPrivate;
-+
-+ DevicePrivate *d;
-+};
-+
-+typedef QList<Device> DeviceList;
-+
-+}
-+
-+#endif
More information about the scm-commits
mailing list