[kdelibs] fixup patch
Lukas Tinkl
ltinkl at fedoraproject.org
Mon Oct 29 17:58:48 UTC 2012
commit 04a2905a131b8a18ee83a1b7c2a8d39dbd160300
Author: Lukáš Tinkl <lukas at kde.org>
Date: Mon Oct 29 18:58:24 2012 +0100
fixup patch
kdelibs-udisks2-backend.patch | 129 ++++++++++++++++++++++++++++++-----------
1 files changed, 94 insertions(+), 35 deletions(-)
---
diff --git a/kdelibs-udisks2-backend.patch b/kdelibs-udisks2-backend.patch
index fb87c38..c7c9a65 100644
--- a/kdelibs-udisks2-backend.patch
+++ b/kdelibs-udisks2-backend.patch
@@ -1,5 +1,5 @@
diff --git a/solid/solid/CMakeLists.txt b/solid/solid/CMakeLists.txt
-index 0aa7a43..5cd1484 100644
+index 0aa7a43..21e774c 100644
--- a/solid/solid/CMakeLists.txt
+++ b/solid/solid/CMakeLists.txt
@@ -1,6 +1,7 @@
@@ -10,7 +10,49 @@ index 0aa7a43..5cd1484 100644
if(WIN32)
include_directories( ${KDEWIN_INCLUDES} )
-@@ -264,19 +265,38 @@ if(NOT WIN32 AND NOT APPLE)
+@@ -39,7 +40,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
+ )
+@@ -225,33 +225,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
+@@ -264,19 +237,19 @@ if(NOT WIN32 AND NOT APPLE)
# FIXME: this should work on more Unix systems
if (CMAKE_SYSTEM_NAME MATCHES Linux)
@@ -27,10 +69,7 @@ index 0aa7a43..5cd1484 100644
- backends/udisks/udisksstorageaccess.cpp
- backends/udisks/udisksgenericinterface.cpp
- )
-+
-+ if ( WITH_SOLID_UDISKS2 )
+ message(STATUS "Building Solid UDisks2 backend." )
-+ add_definitions(-DWITH_SOLID_UDISKS2)
+ set(solid_LIB_SRCS ${solid_LIB_SRCS}
+ backends/udisks2/udisksmanager.cpp
+ backends/udisks2/udisksdevice.cpp
@@ -42,23 +81,7 @@ index 0aa7a43..5cd1484 100644
+ backends/udisks2/udisksstoragedrive.cpp
+ backends/udisks2/udisksstorageaccess.cpp
+ 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 )
++ backends/udisks2/dbus/manager.cpp)
endif (CMAKE_SYSTEM_NAME MATCHES Linux)
message(STATUS "Building Solid fstab backend." )
@@ -3710,30 +3733,66 @@ index 0000000..2ca04d2
+
+#endif // UDISKS2STORAGEVOLUME_H
diff --git a/solid/solid/managerbase.cpp b/solid/solid/managerbase.cpp
-index fb5a67c..beaeac5 100644
+index fb5a67c..d58736e 100644
--- a/solid/solid/managerbase.cpp
+++ b/solid/solid/managerbase.cpp
-@@ -31,7 +31,11 @@
+@@ -30,8 +30,7 @@
+ #if defined (Q_OS_MAC)
#include "backends/iokit/iokitmanager.h"
#elif defined (Q_OS_UNIX)
- #include "backends/hal/halmanager.h"
-+#if defined (WITH_SOLID_UDISKS2)
+-#include "backends/hal/halmanager.h"
+-#include "backends/udisks/udisksmanager.h"
+#include "backends/udisks2/udisksmanager.h"
-+#else
- #include "backends/udisks/udisksmanager.h"
-+#endif
#include "backends/upower/upowermanager.h"
#if defined (HUPNP_FOUND)
-@@ -83,7 +87,11 @@ void Solid::ManagerBasePrivate::loadBackends()
+@@ -71,22 +70,13 @@ void Solid::ManagerBasePrivate::loadBackends()
+ # 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
-+# if defined(WITH_SOLID_UDISKS2)
+- m_backends << new Solid::Backends::UDisks::UDisksManager(0)
+ m_backends << new Solid::Backends::UDisks2::Manager(0)
-+# else
- m_backends << new Solid::Backends::UDisks::UDisksManager(0)
-+# endif
<< new Solid::Backends::UPower::UPowerManager(0)
<< new Solid::Backends::Fstab::FstabManager(0);
- }
+- }
+ # endif
+
+ # if defined (HUPNP_FOUND)
+diff --git a/solid/tests/CMakeLists.txt b/solid/tests/CMakeLists.txt
+index ef507d1..b9f3720 100644
+--- a/solid/tests/CMakeLists.txt
++++ b/solid/tests/CMakeLists.txt
+@@ -15,21 +15,6 @@ endif(WIN32)
+ target_link_libraries(fakehardwaretest solid_static ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} )
+ add_definitions(-DTEST_DATA="\\"${CMAKE_CURRENT_SOURCE_DIR}/../solid/backends/fakehw/fakecomputer.xml\\"")
+
+-
+-########### halbasictest ###############
+-
+-if(NOT WIN32 AND NOT APPLE)
+-set(halbasictest_SRCS halbasictest.cpp )
+-
+-kde4_add_executable(halbasictest ${halbasictest_SRCS})
+-
+-if(WIN32)
+- set_target_properties(halbasictest PROPERTIES COMPILE_FLAGS -DSOLID_EXPORT=)
+-endif(WIN32)
+-
+-target_link_libraries(halbasictest solid_static ${KDEWIN_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} )
+-endif(NOT WIN32 AND NOT APPLE)
+-
+ ########### solidhwtest ###############
+
+ set(solidhwtest_SRCS
More information about the scm-commits
mailing list