diff options
Diffstat (limited to 'kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch')
-rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch b/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch deleted file mode 100644 index 7de5ec9..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch +++ /dev/null @@ -1,51 +0,0 @@ -udisks1 is deprecated and going away, so removing this clause -will permit us to build without udisks at all. - ---- solid/solid/CMakeLists.txt -+++ solid/solid/CMakeLists.txt -@@ -283,20 +283,6 @@ - backends/udisks2/udisksgenericinterface.cpp - backends/udisks2/dbus/manager.cpp - ) -- else ( WITH_SOLID_UDISKS2 ) -- message(STATUS "Building Solid UDisks 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 -- ) - endif ( WITH_SOLID_UDISKS2 ) - endif (CMAKE_SYSTEM_NAME MATCHES Linux) - ---- solid/solid/managerbase.cpp -+++ solid/solid/managerbase.cpp -@@ -33,8 +33,6 @@ - #include "backends/hal/halmanager.h" - #if defined (WITH_SOLID_UDISKS2) - #include "backends/udisks2/udisksmanager.h" --#else --#include "backends/udisks/udisksmanager.h" - #endif - #include "backends/upower/upowermanager.h" - -@@ -88,11 +86,9 @@ - m_backends << new Solid::Backends::UDev::UDevManager(0); - # endif - # if defined(WITH_SOLID_UDISKS2) -- m_backends << new Solid::Backends::UDisks2::Manager(0) --# else -- m_backends << new Solid::Backends::UDisks::UDisksManager(0) -+ m_backends << new Solid::Backends::UDisks2::Manager(0); - # endif -- << new Solid::Backends::UPower::UPowerManager(0) -+ m_backends << new Solid::Backends::UPower::UPowerManager(0) - << new Solid::Backends::Fstab::FstabManager(0); - } - # endif |