diff --git a/kdelibs-4.5.80-no_HAL.patch b/kdelibs-4.5.80-no_HAL.patch new file mode 100644 index 0000000..4a1e454 --- /dev/null +++ b/kdelibs-4.5.80-no_HAL.patch @@ -0,0 +1,85 @@ +Index: solid/solid/CMakeLists.txt +=================================================================== +--- solid/solid/CMakeLists.txt (revision 1198779) ++++ solid/solid/CMakeLists.txt (working copy) +@@ -185,32 +185,32 @@ + 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 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} +Index: solid/solid/managerbase.cpp +=================================================================== +--- solid/solid/managerbase.cpp (revision 1198779) ++++ solid/solid/managerbase.cpp (working copy) +@@ -30,7 +30,7 @@ + #if defined (Q_OS_MAC) + #include "backends/iokit/iokitmanager.h" + #elif defined (Q_OS_UNIX) +-#include "backends/hal/halmanager.h" ++//#include "backends/hal/halmanager.h" + #include "backends/udisks/udisksmanager.h" + #include "backends/upower/upowermanager.h" + +@@ -71,7 +71,7 @@ + # if defined (UDEV_FOUND) + m_backends << new Solid::Backends::UDev::UDevManager(0); + # endif +- m_backends << new Solid::Backends::Hal::HalManager(0) ++ m_backends //<< new Solid::Backends::Hal::HalManager(0) + // FIXME: the udisks backend used to build on !Linux too + # if defined (Q_OS_LINUX) + << new Solid::Backends::UDisks::UDisksManager(0) diff --git a/kdelibs.spec b/kdelibs.spec index be25c26..99b9e1c 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -12,7 +12,7 @@ Summary: KDE Libraries Version: 4.5.80 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdelibs Epoch: 6 @@ -40,7 +40,9 @@ Requires: kde-settings %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } # versioned dep ok, as long as it comes from *here* Requires: %{name}-common = %{epoch}:%{version}-%{release} +%if 0%{?fedora} && 0%{?fedora} < 15 Requires: hal +%endif Requires: hunspell # beware of possible bootstrapping problems -- Rex Requires: oxygen-icon-theme >= %{version} @@ -96,6 +98,10 @@ Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch # Not Upstreamed? why not ? -- Rex Patch200: kdelibs-4.3.1-CVE-2009-2702.patch +## Fedora specific patches +# HALsectomy +Patch300: kdelibs-4.5.80-no_HAL.patch + %if 0%{?fedora} && 0%{?fedora} < 13 Conflicts: kdebase-workspace-libs < 4.3.80 %endif @@ -264,6 +270,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage # security fix %patch200 -p1 -b .CVE-2009-2702 +# Fedora patches +%if 0%{?fedora} && 0%{?fedora} > 14 +%patch300 -p0 -b .no_HAL +%endif %build @@ -507,6 +517,10 @@ rm -rf %{buildroot} %changelog +* Mon Nov 22 2010 Lukas Tinkl - 4.5.80-3 +- don't build Solid HAL backend, rely on udisks/upower/udev only + (aka project HALsectomy) + * Sat Nov 20 2010 Rex Dieter - 4.5.80-2 - squash more rpath's