rework stuff to make udisks2backend apply right
This commit is contained in:
parent
578efc382d
commit
e0d1434dd8
30
kdelibs-4.8.2-udisks2_prep.patch
Normal file
30
kdelibs-4.8.2-udisks2_prep.patch
Normal file
@ -0,0 +1,30 @@
|
||||
diff -up kdelibs-4.8.2/solid/solid/managerbase.cpp.udisks2_prep kdelibs-4.8.2/solid/solid/managerbase.cpp
|
||||
--- kdelibs-4.8.2/solid/solid/managerbase.cpp.udisks2_prep 2011-07-27 13:34:39.000000000 -0500
|
||||
+++ kdelibs-4.8.2/solid/solid/managerbase.cpp 2012-04-17 15:05:09.786696443 -0500
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "managerbase_p.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
-#if !defined (Q_WS_WIN) && !defined (Q_OS_MAC)
|
||||
+#if !defined (Q_OS_WIN) && !defined (Q_OS_MAC)
|
||||
#include <config-solid.h>
|
||||
#endif
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
#include "backends/fstab/fstabmanager.h"
|
||||
|
||||
-#elif defined (Q_WS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
|
||||
+#elif defined (Q_OS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
|
||||
#include "backends/wmi/wmimanager.h"
|
||||
#endif
|
||||
|
||||
@@ -68,7 +68,7 @@ void Solid::ManagerBasePrivate::loadBack
|
||||
# if defined(Q_OS_MAC)
|
||||
m_backends << new Solid::Backends::IOKit::IOKitManager(0);
|
||||
|
||||
-# elif defined(Q_WS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
|
||||
+# elif defined(Q_OS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
|
||||
m_backends << new Solid::Backends::Wmi::WmiManager(0);
|
||||
|
||||
# elif defined(Q_OS_UNIX) && !defined(Q_OS_LINUX)
|
30
kdelibs.spec
30
kdelibs.spec
@ -119,6 +119,13 @@ Patch41: 0002-Trigger-installation-of-missing-components-when-inst.patch
|
||||
# https://git.reviewboard.kde.org/r/102350/
|
||||
Patch42: 0003-Implement-automatic-scanning-of-source-code-for-requ.patch
|
||||
|
||||
# make forcefully hal-free build
|
||||
Patch45: kdelibs-4.7.3-halectomy.patch
|
||||
|
||||
# udisks2 Solid backend, halectomy
|
||||
Patch46: kdelibs-4.8.2-udisks2_prep.patch
|
||||
Patch47: kdelibs-udisks2-backend.patch
|
||||
|
||||
## upstreamable
|
||||
# knewstuff2 variant of:
|
||||
# https://git.reviewboard.kde.org/r/102439/
|
||||
@ -144,13 +151,6 @@ Patch102: kdelibs-4.8.2-filter.patch
|
||||
# Not Upstreamed? why not ? -- Rex
|
||||
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
||||
|
||||
## Fedora specific patches
|
||||
# make forcefully hal-free build
|
||||
Patch300: kdelibs-4.7.3-halectomy.patch
|
||||
|
||||
# udisks2 Solid backend, halectomy
|
||||
Patch301: kdelibs-udisks2-backend.patch
|
||||
|
||||
# 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
|
||||
@ -324,6 +324,15 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||
%patch42 -p1 -b .libplasma-pk-0003
|
||||
%endif
|
||||
|
||||
%if "%{?udisks}" == "udisks2"
|
||||
pushd solid
|
||||
%patch46 -p2 -b .udisks2_prep
|
||||
%patch47 -p4 -b .udisks2backend
|
||||
popd
|
||||
%else
|
||||
%patch45 -p1 -b .halectomy
|
||||
%endif
|
||||
|
||||
# upstreamable patches
|
||||
%patch50 -p1 -b .knewstuff2_gpg2
|
||||
%patch51 -p1 -b .uri_mimetypes
|
||||
@ -337,13 +346,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||
# security fixes
|
||||
%patch200 -p1 -b .CVE-2009-2702
|
||||
|
||||
%if "%{?udisks}" == "udisks2"
|
||||
pushd solid
|
||||
%patch301 -p4 -b .udisks2backend
|
||||
popd
|
||||
%else
|
||||
%patch300 -p1 -b .halectomy
|
||||
%endif
|
||||
|
||||
|
||||
%build
|
||||
|
Loading…
Reference in New Issue
Block a user