rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update the halectomy patch, omits the fstab backend

This commit is contained in:
Lukas Tinkl 2011-01-03 20:51:47 +01:00
parent d19331d04d
commit b576c989a8
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kdelibs-4.5.90-halectomy.patch
View File

@ -1,6 +1,6 @@
Index: solid/solid/CMakeLists.txt
===================================================================
--- solid/solid/CMakeLists.txt (revision 1208834)
--- solid/solid/CMakeLists.txt (revision 1211253)
+++ solid/solid/CMakeLists.txt (working copy)
@@ -39,7 +39,6 @@
@ -44,9 +44,25 @@ Index: solid/solid/CMakeLists.txt
message(STATUS "Building Solid UPower backend." )
set(solid_LIB_SRCS ${solid_LIB_SRCS}
backends/upower/upowermanager.cpp
@@ -249,15 +221,6 @@
)
endif (CMAKE_SYSTEM_NAME MATCHES Linux)
- message(STATUS "Building Solid fstab backend." )
- set(solid_LIB_SRCS ${solid_LIB_SRCS}
- backends/fstab/fstabmanager.cpp
- backends/fstab/fstabdevice.cpp
- backends/fstab/fstabstorageaccess.cpp
- backends/fstab/fstabhandling.cpp
- backends/fstab/fstabwatcher.cpp
- )
-
endif(NOT WIN32 AND NOT APPLE)
if(APPLE)
Index: solid/solid/managerbase.cpp
===================================================================
--- solid/solid/managerbase.cpp (revision 1208834)
--- solid/solid/managerbase.cpp (revision 1211253)
+++ solid/solid/managerbase.cpp (working copy)
@@ -30,7 +30,6 @@
#if defined (Q_OS_MAC)
@ -56,7 +72,16 @@ Index: solid/solid/managerbase.cpp
#include "backends/udisks/udisksmanager.h"
#include "backends/upower/upowermanager.h"
@@ -71,22 +70,13 @@
@@ -42,8 +41,6 @@
#include "backends/udev/udevmanager.h"
#endif
-#include "backends/fstab/fstabmanager.h"
-
#elif defined (Q_WS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
#include "backends/wmi/wmimanager.h"
#endif
@@ -71,22 +68,12 @@
# elif defined(Q_WS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
m_backends << new Solid::Backends::Wmi::WmiManager(0);
@ -73,9 +98,10 @@ Index: solid/solid/managerbase.cpp
m_backends << new Solid::Backends::UDev::UDevManager(0);
# endif
m_backends << new Solid::Backends::UDisks::UDisksManager(0)
<< new Solid::Backends::UPower::UPowerManager(0)
<< new Solid::Backends::Fstab::FstabManager(0);
- << new Solid::Backends::UPower::UPowerManager(0)
- << new Solid::Backends::Fstab::FstabManager(0);
- }
+ << new Solid::Backends::UPower::UPowerManager(0);
# endif
# if defined (HUPNP_FOUND)

6
kdelibs.spec
View File

@ -16,7 +16,7 @@
Summary: KDE Libraries
Version: 4.5.90
Release: 2%{?dist}
Release: 3%{?dist}
Name: kdelibs
Epoch: 6
@ -518,6 +518,10 @@ rm -rf %{buildroot}
%changelog
* Mon Jan 03 2011 Lukas Tinkl <ltinkl@redhat.com> - 4.5.90-3
- update the halectomy patch to also omit the fstab backend
(may interfere with the udisks backend, causing deadlocks, cf kdebug#261359)
* Thu Dec 23 2010 Rex Dieter <rdieter@fedoraproject.org> 4.5.90-2
- build hal-free (ltinkl)