From e2cee2cd8e316a1dad36ea3d6823fac345f712e8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Nov 14 2011 15:48:21 +0000 Subject: Merge branch 'master' into f16 --- diff --git a/kdelibs-4.6.80-halectomy.patch b/kdelibs-4.6.80-halectomy.patch deleted file mode 100644 index 4edfd4c..0000000 --- a/kdelibs-4.6.80-halectomy.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -up kdelibs-4.6.80/solid/solid/CMakeLists.txt.halectomy kdelibs-4.6.80/solid/solid/CMakeLists.txt ---- kdelibs-4.6.80/solid/solid/CMakeLists.txt.halectomy 2011-05-20 22:24:54.000000000 +0200 -+++ kdelibs-4.6.80/solid/solid/CMakeLists.txt 2011-05-30 14:55:43.380878553 +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 -@@ -253,16 +225,6 @@ if(NOT WIN32 AND NOT APPLE) - ) - 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/fstabnetworkshare.cpp -- backends/fstab/fstabstorageaccess.cpp -- backends/fstab/fstabhandling.cpp -- backends/fstab/fstabwatcher.cpp -- ) -- - endif(NOT WIN32 AND NOT APPLE) - - if(APPLE) -diff -up kdelibs-4.6.80/solid/solid/managerbase.cpp.halectomy kdelibs-4.6.80/solid/solid/managerbase.cpp ---- kdelibs-4.6.80/solid/solid/managerbase.cpp.halectomy 2011-05-20 22:24:54.000000000 +0200 -+++ kdelibs-4.6.80/solid/solid/managerbase.cpp 2011-05-30 14:55:43.381878481 +0200 -@@ -30,7 +30,6 @@ - #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/upower/upowermanager.h" - -@@ -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 @@ 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) -- << new Solid::Backends::UPower::UPowerManager(0) -- << new Solid::Backends::Fstab::FstabManager(0); -- } -+ << new Solid::Backends::UPower::UPowerManager(0); - # endif - - # if defined (HUPNP_FOUND) -diff -up kdelibs-4.6.80/solid/tests/CMakeLists.txt.halectomy kdelibs-4.6.80/solid/tests/CMakeLists.txt ---- kdelibs-4.6.80/solid/tests/CMakeLists.txt.halectomy 2011-05-20 22:24:54.000000000 +0200 -+++ kdelibs-4.6.80/solid/tests/CMakeLists.txt 2011-05-30 15:13:39.179352524 +0200 -@@ -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 diff --git a/kdelibs.spec b/kdelibs.spec index 03e4931..6782391 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -23,7 +23,7 @@ Summary: KDE Libraries Version: 4.7.3 -Release: 3%{?dist} +Release: 4%{?dist} Name: kdelibs Epoch: 6 @@ -135,15 +135,10 @@ Patch200: kdelibs-4.3.1-CVE-2009-2702.patch Patch201: kdelibs-4.7.3-CVE-0046.patch ## Fedora specific patches -# make forcefully hal-free build -Patch300: kdelibs-4.6.80-halectomy.patch - -%if 0%{?fedora} && 0%{?fedora} < 13 -Conflicts: kdebase-workspace-libs < 4.3.80 -%endif # force upgrade of apps using the discontinued KatePart Smart* interfaces to # versions using the new Moving* interfaces instead +# conditionize these? how long to carry them? -- rex Conflicts: kdevplatform < 1.1.80 Conflicts: kdevelop < 9:4.1.80 # 2.1-0.9.b4.fc15 is the first build with the fix from beta 5 backported @@ -329,7 +324,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch201 -p1 -b .CVE-2010-0046 # Fedora patches -%patch300 -p1 -b .halectomy %build @@ -576,6 +570,9 @@ rm -rf %{buildroot} %changelog +* Mon Nov 14 2011 Rex Dieter 4.7.3-4 +- solid hardware does not detect NFS drives, halectomy related (#751879) + * Mon Nov 07 2011 Than Ngo - 4.7.3-3 - CVE-2010-0046, security issue in khtml