[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [emerge/kde-4.10] portage/kde/kdelibs: update solid from the branch
From: Patrick Spendrin <ps_ml () gmx ! de>
Date: 2013-06-04 23:44:52
Message-ID: 20130604234452.1F459A605A () git ! kde ! org
[Download RAW message or body]
Git commit 89968e2dba9ac3db0fa3ad429cf680023717f0f9 by Patrick Spendrin.
Committed on 05/06/2013 at 01:43.
Pushed by sengels into branch 'kde-4.10'.
update solid from the branch
M +255 -201 portage/kde/kdelibs/add-new-solid-win-backend.diff
http://commits.kde.org/emerge/89968e2dba9ac3db0fa3ad429cf680023717f0f9
diff --git a/portage/kde/kdelibs/add-new-solid-win-backend.diff \
b/portage/kde/kdelibs/add-new-solid-win-backend.diff index 71299c3..f815517 100644
--- a/portage/kde/kdelibs/add-new-solid-win-backend.diff
+++ b/portage/kde/kdelibs/add-new-solid-win-backend.diff
@@ -1,7 +1,8 @@
-diff -Nru -x '*~' kdelibs-4.10.2.orig/CMakeLists.txt kdelibs-4.10.2/CMakeLists.txt
---- kdelibs-4.10.2.orig/CMakeLists.txt 2013-03-29 09:30:09.355321000 +0100
-+++ kdelibs-4.10.2/CMakeLists.txt 2013-06-01 14:28:09.601842800 +0200
-@@ -41,6 +41,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0e87f30..39ccd38 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,6 +41,9 @@ endif(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)
############### Give the user the option to build the udisks2 solid backend instead \
of the udisks backend ############### option(WITH_SOLID_UDISKS2 "Enable the udisks2 \
solid backend instead")
@@ -11,9 +12,10 @@ diff -Nru -x '*~' kdelibs-4.10.2.orig/CMakeLists.txt \
kdelibs-4.10.2/CMakeLists.t ############### Load the CTest options ###############
# CTestCustom.cmake has to be in the CTEST_BINARY_DIR.
# in the KDE build system, this is the same as CMAKE_BINARY_DIR.
-diff -Nru -x '*~' kdelibs-4.10.2.orig/kjs/wtf/AlwaysInline.h \
kdelibs-4.10.2/kjs/wtf/AlwaysInline.h
---- kdelibs-4.10.2.orig/kjs/wtf/AlwaysInline.h 2013-03-01 07:26:14.347776000 +0100
-+++ kdelibs-4.10.2/kjs/wtf/AlwaysInline.h 2013-06-01 14:28:09.604843000 +0200
+diff --git a/kjs/wtf/AlwaysInline.h b/kjs/wtf/AlwaysInline.h
+index cc5c29c..f7ca16c 100644
+--- a/kjs/wtf/AlwaysInline.h
++++ b/kjs/wtf/AlwaysInline.h
@@ -22,7 +22,7 @@
@@ -23,9 +25,118 @@ diff -Nru -x '*~' kdelibs-4.10.2.orig/kjs/wtf/AlwaysInline.h \
kdelibs-4.10.2/kjs/ #define ALWAYS_INLINE inline __attribute__ ((__always_inline__))
#elif COMPILER(MSVC) && defined(NDEBUG)
#define ALWAYS_INLINE __forceinline
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winacadapter.cpp \
kdelibs-4.10.2/solid/solid/backends/win/winacadapter.cpp
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winacadapter.cpp 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winacadapter.cpp 2013-06-01 \
14:28:09.608843200 +0200 +diff --git a/solid/solid/CMakeLists.txt \
b/solid/solid/CMakeLists.txt +index 83de7ec..9353ea7 100644
+--- a/solid/solid/CMakeLists.txt
++++ b/solid/solid/CMakeLists.txt
+@@ -10,7 +10,12 @@ endif(WIN32)
+ configure_file(solid_export.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/solid_export.h)
+
+ include (CheckCXXSourceCompiles)
+-
++if(MSVC)
++check_cxx_source_compiles("int main() { __asm { pxor mm0, mm0 }; }" HAVE_X86_MMX)
++check_cxx_source_compiles("int main() { __asm { xorps xmm0, xmm0 }; }" \
HAVE_X86_SSE) ++check_cxx_source_compiles("int main() { __asm { xorpd xmm0, xmm0 }; \
}" HAVE_X86_SSE2) ++check_cxx_source_compiles("int main() { __asm { femms }; }" \
HAVE_X86_3DNOW) ++else(MSVC)
+ check_cxx_source_compiles(" #ifdef __SUNPRO_CC
+ #define __asm__ asm
+ #endif
+@@ -27,6 +32,7 @@ check_cxx_source_compiles(" #ifdef __SUNPRO_CC
+ #define __asm__ asm
+ #endif
+ int main() { __asm__(\"femms\"); }" HAVE_X86_3DNOW)
++endif(MSVC)
+ check_cxx_source_compiles(" #ifdef __SUNPRO_CC
+ #define __asm__ asm
+ #endif
+@@ -43,6 +49,7 @@ file(MAKE_DIRECTORY
+ ${CMAKE_CURRENT_BINARY_DIR}/backends/hal
+ ${CMAKE_CURRENT_BINARY_DIR}/backends/udev
+ ${CMAKE_CURRENT_BINARY_DIR}/backends/wmi
++ ${CMAKE_CURRENT_BINARY_DIR}/backends/win
+ )
+
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${KDE4_C_FLAGS}") # enable -fvisibility=hidden \
for C sources +@@ -338,17 +345,20 @@ if(APPLE)
+ endif(APPLE)
+
+ if(WIN32)
+- include(CheckIncludeFileCXX)
+- check_include_file_cxx(wbemidl.h HAVE_WBEM)
+- FIND_LIBRARY(WBEM_LIBRARIES NAMES wbemuuid wbemuuidd)
+- if(HAVE_WBEM AND WBEM_LIBRARIES)
+- set(HAVE_WBEM True)
+- message(STATUS "Found wbemuuid library: ${WBEM_LIBRARIES}")
+- else(HAVE_WBEM AND WBEM_LIBRARIES)
+- set(HAVE_WBEM False)
+- endif(HAVE_WBEM AND WBEM_LIBRARIES)
+- if(HAVE_WBEM AND NOT WINCE)
+- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_WBEM")
++ if(WITH_SOLID_WMI)
++ include(CheckIncludeFileCXX)
++ check_include_file_cxx(wbemidl.h HAVE_WBEM)
++ FIND_LIBRARY(WBEM_LIBRARIES NAMES wbemuuid wbemuuidd)
++ if(HAVE_WBEM AND WBEM_LIBRARIES)
++ set(HAVE_WBEM True)
++ message(STATUS "Found wbemuuid library: ${WBEM_LIBRARIES}")
++ else(HAVE_WBEM AND WBEM_LIBRARIES)
++ set(HAVE_WBEM False)
++ set(WITH_SOLID_WMI False)
++ endif(HAVE_WBEM AND WBEM_LIBRARIES)
++ endif(WITH_SOLID_WMI)
++ if(WITH_SOLID_WMI)
++ add_definitions(-WITH_SOLID_WMI)
+ message(STATUS "-- Building Solid WMI backend." )
+
+ set(solid_LIB_SRCS ${solid_LIB_SRCS}
+@@ -375,7 +385,25 @@ if(WIN32)
+ backends/wmi/wmivolume.cpp
+
+ )
+- endif(HAVE_WBEM AND NOT WINCE)
++ else(WITH_SOLID_WMI)
++ message(STATUS "-- Building Solid Windows backend." )
++ set(solid_LIB_SRCS ${solid_LIB_SRCS}
++ backends/win/winblock.cpp
++ backends/win/winopticaldrive.cpp
++ backends/win/wininterface.cpp
++ backends/win/wingenericinterface.cpp
++ backends/win/windevice.cpp
++ backends/win/windevicemanager.cpp
++ backends/win/winopticaldisc.cpp
++ backends/win/winprocessor.cpp
++ #backends/win/wmiportablemediaplayer.cpp
++ backends/win/winstorageaccess.cpp
++ backends/win/winstoragedrive.cpp
++ backends/win/winstoragevolume.cpp
++ backends/win/winbattery.cpp
++ backends/win/winacadapter.cpp
++ )
++ endif(WITH_SOLID_WMI)
+ endif(WIN32)
+
+ set_source_files_properties( org.freedesktop.PowerManagement.xml
+@@ -394,9 +422,11 @@ set(solid_OPTIONAL_LIBS)
+
+ if(WIN32)
+ set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${KDEWIN_LIBRARY})
+- if(HAVE_WBEM)
++ if(WITH_SOLID_WMI)
+ set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${WBEM_LIBRARIES})
+- endif(HAVE_WBEM)
++ else(WITH_SOLID_WMI)
++ set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} setupapi)
++ endif(WITH_SOLID_WMI)
+ endif(WIN32)
+
+ if(APPLE)
+diff --git a/solid/solid/backends/win/winacadapter.cpp \
b/solid/solid/backends/win/winacadapter.cpp +new file mode 100644
+index 0000000..18cd45c
+--- /dev/null
++++ b/solid/solid/backends/win/winacadapter.cpp
@@ -0,0 +1,56 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -83,9 +194,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winacadapter.cpp +}
+
+#include "winacadapter.moc"
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winacadapter.h \
kdelibs-4.10.2/solid/solid/backends/win/winacadapter.h
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winacadapter.h 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winacadapter.h 2013-06-01 \
14:28:09.611843400 +0200 +diff --git a/solid/solid/backends/win/winacadapter.h \
b/solid/solid/backends/win/winacadapter.h +new file mode 100644
+index 0000000..15d334e
+--- /dev/null
++++ b/solid/solid/backends/win/winacadapter.h
@@ -0,0 +1,58 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -145,9 +258,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winacadapter.h kd +}
+}
+#endif // WINACADAPTER_H
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winbattery.cpp \
kdelibs-4.10.2/solid/solid/backends/win/winbattery.cpp
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winbattery.cpp 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winbattery.cpp 2013-06-01 \
14:28:09.614843500 +0200 +diff --git a/solid/solid/backends/win/winbattery.cpp \
b/solid/solid/backends/win/winbattery.cpp +new file mode 100644
+index 0000000..8c20834
+--- /dev/null
++++ b/solid/solid/backends/win/winbattery.cpp
@@ -0,0 +1,180 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -329,9 +444,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winbattery.cpp kd +}
+
+#include "winbattery.moc"
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winbattery.h \
kdelibs-4.10.2/solid/solid/backends/win/winbattery.h
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winbattery.h 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winbattery.h 2013-06-01 \
14:28:09.618843800 +0200 +diff --git a/solid/solid/backends/win/winbattery.h \
b/solid/solid/backends/win/winbattery.h +new file mode 100644
+index 0000000..8286783
+--- /dev/null
++++ b/solid/solid/backends/win/winbattery.h
@@ -0,0 +1,80 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -413,9 +530,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winbattery.h kdel +}
+
+#endif // WINBATTERY_H
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winblock.cpp \
kdelibs-4.10.2/solid/solid/backends/win/winblock.cpp
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winblock.cpp 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winblock.cpp 2013-06-01 \
14:28:09.656845900 +0200 +diff --git a/solid/solid/backends/win/winblock.cpp \
b/solid/solid/backends/win/winblock.cpp +new file mode 100644
+index 0000000..bdf8151
+--- /dev/null
++++ b/solid/solid/backends/win/winblock.cpp
@@ -0,0 +1,224 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -641,9 +760,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winblock.cpp kdel +}
+
+#include "winblock.moc"
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winblock.h \
kdelibs-4.10.2/solid/solid/backends/win/winblock.h
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winblock.h 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winblock.h 2013-06-01 14:28:10.288882100 \
+0200 +diff --git a/solid/solid/backends/win/winblock.h \
b/solid/solid/backends/win/winblock.h +new file mode 100644
+index 0000000..bbcea3c
+--- /dev/null
++++ b/solid/solid/backends/win/winblock.h
@@ -0,0 +1,70 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -715,9 +836,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winblock.h kdelib +}
+
+#endif // WINBLOCK_H
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/windevice.cpp \
kdelibs-4.10.2/solid/solid/backends/win/windevice.cpp
---- kdelibs-4.10.2.orig/solid/solid/backends/win/windevice.cpp 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/windevice.cpp 2013-06-01 \
14:28:10.292882300 +0200 +diff --git a/solid/solid/backends/win/windevice.cpp \
b/solid/solid/backends/win/windevice.cpp +new file mode 100644
+index 0000000..3ca8996
+--- /dev/null
++++ b/solid/solid/backends/win/windevice.cpp
@@ -0,0 +1,433 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -1152,9 +1275,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/windevice.cpp kde +
+
+#include "windevice.moc"
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/windevice.h \
kdelibs-4.10.2/solid/solid/backends/win/windevice.h
---- kdelibs-4.10.2.orig/solid/solid/backends/win/windevice.h 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/windevice.h 2013-06-01 \
14:28:10.295882500 +0200 +diff --git a/solid/solid/backends/win/windevice.h \
b/solid/solid/backends/win/windevice.h +new file mode 100644
+index 0000000..06309ec
+--- /dev/null
++++ b/solid/solid/backends/win/windevice.h
@@ -0,0 +1,78 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -1234,9 +1359,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/windevice.h kdeli +}
+
+#endif // WINDEVICE_H
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/windevicemanager.cpp \
kdelibs-4.10.2/solid/solid/backends/win/windevicemanager.cpp
---- kdelibs-4.10.2.orig/solid/solid/backends/win/windevicemanager.cpp 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/windevicemanager.cpp 2013-06-01 \
14:28:10.732907500 +0200 +diff --git a/solid/solid/backends/win/windevicemanager.cpp \
b/solid/solid/backends/win/windevicemanager.cpp +new file mode 100644
+index 0000000..6db0970
+--- /dev/null
++++ b/solid/solid/backends/win/windevicemanager.cpp
@@ -0,0 +1,250 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -1488,9 +1615,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/windevicemanager. +
+#include <windevicemanager.moc>
+
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/windevicemanager.h \
kdelibs-4.10.2/solid/solid/backends/win/windevicemanager.h
---- kdelibs-4.10.2.orig/solid/solid/backends/win/windevicemanager.h 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/windevicemanager.h 2013-06-01 \
14:28:10.736907700 +0200 +diff --git a/solid/solid/backends/win/windevicemanager.h \
b/solid/solid/backends/win/windevicemanager.h +new file mode 100644
+index 0000000..b2d3c40
+--- /dev/null
++++ b/solid/solid/backends/win/windevicemanager.h
@@ -0,0 +1,192 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -1684,9 +1813,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/windevicemanager. +}
+}
+#endif // WINDEVICEMANAGER_H
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/wingenericinterface.cpp \
kdelibs-4.10.2/solid/solid/backends/win/wingenericinterface.cpp
---- kdelibs-4.10.2.orig/solid/solid/backends/win/wingenericinterface.cpp 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/wingenericinterface.cpp 2013-06-01 \
14:28:10.739907900 +0200 +diff --git \
a/solid/solid/backends/win/wingenericinterface.cpp \
b/solid/solid/backends/win/wingenericinterface.cpp +new file mode 100644
+index 0000000..9e67aab
+--- /dev/null
++++ b/solid/solid/backends/win/wingenericinterface.cpp
@@ -0,0 +1,52 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -1740,9 +1871,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/wingenericinterfa +}
+
+#include "wingenericinterface.moc"
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/wingenericinterface.h \
kdelibs-4.10.2/solid/solid/backends/win/wingenericinterface.h
---- kdelibs-4.10.2.orig/solid/solid/backends/win/wingenericinterface.h 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/wingenericinterface.h 2013-06-01 \
14:28:10.742908100 +0200 +diff --git a/solid/solid/backends/win/wingenericinterface.h \
b/solid/solid/backends/win/wingenericinterface.h +new file mode 100644
+index 0000000..7bf198a
+--- /dev/null
++++ b/solid/solid/backends/win/wingenericinterface.h
@@ -0,0 +1,55 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -1799,9 +1932,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/wingenericinterfa +}
+
+#endif // WINGENERICINTERFACE_H
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/wininterface.cpp \
kdelibs-4.10.2/solid/solid/backends/win/wininterface.cpp
---- kdelibs-4.10.2.orig/solid/solid/backends/win/wininterface.cpp 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/wininterface.cpp 2013-06-01 \
14:28:10.744908200 +0200 +diff --git a/solid/solid/backends/win/wininterface.cpp \
b/solid/solid/backends/win/wininterface.cpp +new file mode 100644
+index 0000000..8569229
+--- /dev/null
++++ b/solid/solid/backends/win/wininterface.cpp
@@ -0,0 +1,42 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -1845,9 +1980,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/wininterface.cpp +#include \
"wininterface.moc" +
+
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/wininterface.h \
kdelibs-4.10.2/solid/solid/backends/win/wininterface.h
---- kdelibs-4.10.2.orig/solid/solid/backends/win/wininterface.h 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/wininterface.h 2013-06-01 \
14:28:10.747908300 +0200 +diff --git a/solid/solid/backends/win/wininterface.h \
b/solid/solid/backends/win/wininterface.h +new file mode 100644
+index 0000000..5748859
+--- /dev/null
++++ b/solid/solid/backends/win/wininterface.h
@@ -0,0 +1,53 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -1902,9 +2039,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/wininterface.h kd +}
+
+#endif // WININTERFACE_H
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winopticaldisc.cpp \
kdelibs-4.10.2/solid/solid/backends/win/winopticaldisc.cpp
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winopticaldisc.cpp 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winopticaldisc.cpp 2013-06-01 \
14:28:10.750908500 +0200 +diff --git a/solid/solid/backends/win/winopticaldisc.cpp \
b/solid/solid/backends/win/winopticaldisc.cpp +new file mode 100644
+index 0000000..c20ee43
+--- /dev/null
++++ b/solid/solid/backends/win/winopticaldisc.cpp
@@ -0,0 +1,122 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -2028,9 +2167,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winopticaldisc.cp +}
+
+#include "winopticaldisc.moc"
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winopticaldisc.h \
kdelibs-4.10.2/solid/solid/backends/win/winopticaldisc.h
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winopticaldisc.h 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winopticaldisc.h 2013-06-01 \
14:28:10.753908700 +0200 +diff --git a/solid/solid/backends/win/winopticaldisc.h \
b/solid/solid/backends/win/winopticaldisc.h +new file mode 100644
+index 0000000..663bb91
+--- /dev/null
++++ b/solid/solid/backends/win/winopticaldisc.h
@@ -0,0 +1,68 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -2100,9 +2241,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winopticaldisc.h +}
+
+#endif // WINOPTICALDISC_H
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winopticaldrive.cpp \
kdelibs-4.10.2/solid/solid/backends/win/winopticaldrive.cpp
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winopticaldrive.cpp 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winopticaldrive.cpp 2013-06-01 \
14:28:10.756908900 +0200 +diff --git a/solid/solid/backends/win/winopticaldrive.cpp \
b/solid/solid/backends/win/winopticaldrive.cpp +new file mode 100644
+index 0000000..fd87eb9
+--- /dev/null
++++ b/solid/solid/backends/win/winopticaldrive.cpp
@@ -0,0 +1,177 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -2281,9 +2424,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winopticaldrive.c +
+
+#include "winopticaldrive.moc"
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winopticaldrive.h \
kdelibs-4.10.2/solid/solid/backends/win/winopticaldrive.h
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winopticaldrive.h 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winopticaldrive.h 2013-06-01 \
14:28:10.759909000 +0200 +diff --git a/solid/solid/backends/win/winopticaldrive.h \
b/solid/solid/backends/win/winopticaldrive.h +new file mode 100644
+index 0000000..ce6c2c4
+--- /dev/null
++++ b/solid/solid/backends/win/winopticaldrive.h
@@ -0,0 +1,90 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -2375,10 +2520,12 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winopticaldrive.h +}
+
+#endif // WINOPTICALDRIVE_H
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winprocessor.cpp \
kdelibs-4.10.2/solid/solid/backends/win/winprocessor.cpp
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winprocessor.cpp 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winprocessor.cpp 2013-06-01 \
23:15:08.731155700 +0200
-@@ -0,0 +1,146 @@
+diff --git a/solid/solid/backends/win/winprocessor.cpp \
b/solid/solid/backends/win/winprocessor.cpp +new file mode 100644
+index 0000000..0fa8527
+--- /dev/null
++++ b/solid/solid/backends/win/winprocessor.cpp
+@@ -0,0 +1,144 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
+
@@ -2408,15 +2555,12 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winprocessor.cpp +using namespace \
Solid::Backends::Win; +
+typedef BOOL (WINAPI *GLPI_fn)(SYSTEM_LOGICAL_PROCESSOR_INFORMATION* Buffer, DWORD* \
ReturnLength);
-+GLPI_fn pGetLogicalProcessorInformation = 0;
++GLPI_fn pGetLogicalProcessorInformation = \
(GLPI_fn)GetProcAddress(LoadLibraryA("kernel32.dll"), \
"GetLogicalProcessorInformation"); ++
+
+WinProcessor::WinProcessor(WinDevice *device):
+ WinInterface(device)
+{
-+ if(pGetLogicalProcessorInformation == 0) {
-+ HMODULE hKernel32 = LoadLibraryA("kernel32.dll");
-+ pGetLogicalProcessorInformation = (GLPI_fn)GetProcAddress(hKernel32, \
"GetLogicalProcessorInformation");
-+ }
+ m_number = m_device->udi().mid(m_device->udi().length()-1).toInt();
+}
+
@@ -2481,6 +2625,7 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winprocessor.cpp +const \
QMap<int,WinProcessor::ProcessorInfo> &WinProcessor::updateCache() +{
+ static QMap<int,ProcessorInfo> p;
++
+ if(p.isEmpty())
+ {
+ DWORD size = 0;
@@ -2525,9 +2670,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winprocessor.cpp +}
+
+#include "winprocessor.moc"
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winprocessor.h \
kdelibs-4.10.2/solid/solid/backends/win/winprocessor.h
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winprocessor.h 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winprocessor.h 2013-06-01 \
14:28:10.774909900 +0200 +diff --git a/solid/solid/backends/win/winprocessor.h \
b/solid/solid/backends/win/winprocessor.h +new file mode 100644
+index 0000000..0b48e4d
+--- /dev/null
++++ b/solid/solid/backends/win/winprocessor.h
@@ -0,0 +1,76 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -2605,9 +2752,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winprocessor.h kd +}
+
+#endif // WINPROCESSOR_H
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winstorageaccess.cpp \
kdelibs-4.10.2/solid/solid/backends/win/winstorageaccess.cpp
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winstorageaccess.cpp 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winstorageaccess.cpp 2013-06-01 \
14:28:10.778910100 +0200 +diff --git a/solid/solid/backends/win/winstorageaccess.cpp \
b/solid/solid/backends/win/winstorageaccess.cpp +new file mode 100644
+index 0000000..28dd14d
+--- /dev/null
++++ b/solid/solid/backends/win/winstorageaccess.cpp
@@ -0,0 +1,69 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -2678,9 +2827,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winstorageaccess. +
+
+#include "winstorageaccess.moc"
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winstorageaccess.h \
kdelibs-4.10.2/solid/solid/backends/win/winstorageaccess.h
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winstorageaccess.h 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winstorageaccess.h 2013-06-01 \
14:28:10.780910200 +0200 +diff --git a/solid/solid/backends/win/winstorageaccess.h \
b/solid/solid/backends/win/winstorageaccess.h +new file mode 100644
+index 0000000..10c92e8
+--- /dev/null
++++ b/solid/solid/backends/win/winstorageaccess.h
@@ -0,0 +1,70 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -2752,9 +2903,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winstorageaccess. +
+
+#endif // WINSTORAGEACCESS_H
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winstoragedrive.cpp \
kdelibs-4.10.2/solid/solid/backends/win/winstoragedrive.cpp
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winstoragedrive.cpp 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winstoragedrive.cpp 2013-06-01 \
14:28:10.783910400 +0200 +diff --git a/solid/solid/backends/win/winstoragedrive.cpp \
b/solid/solid/backends/win/winstoragedrive.cpp +new file mode 100644
+index 0000000..98842c6
+--- /dev/null
++++ b/solid/solid/backends/win/winstoragedrive.cpp
@@ -0,0 +1,114 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -2870,9 +3023,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winstoragedrive.c +}
+
+#include "winstoragedrive.moc"
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winstoragedrive.h \
kdelibs-4.10.2/solid/solid/backends/win/winstoragedrive.h
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winstoragedrive.h 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winstoragedrive.h 2013-06-01 \
14:28:10.786910600 +0200 +diff --git a/solid/solid/backends/win/winstoragedrive.h \
b/solid/solid/backends/win/winstoragedrive.h +new file mode 100644
+index 0000000..d3954dd
+--- /dev/null
++++ b/solid/solid/backends/win/winstoragedrive.h
@@ -0,0 +1,66 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -2940,9 +3095,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winstoragedrive.h +}
+
+#endif // WINSTORAGEDRIVE_H
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winstoragevolume.cpp \
kdelibs-4.10.2/solid/solid/backends/win/winstoragevolume.cpp
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winstoragevolume.cpp 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winstoragevolume.cpp 2013-06-01 \
14:28:10.789910700 +0200 +diff --git a/solid/solid/backends/win/winstoragevolume.cpp \
b/solid/solid/backends/win/winstoragevolume.cpp +new file mode 100644
+index 0000000..0042259
+--- /dev/null
++++ b/solid/solid/backends/win/winstoragevolume.cpp
@@ -0,0 +1,108 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -3052,9 +3209,11 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winstoragevolume. +
+
+
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/backends/win/winstoragevolume.h \
kdelibs-4.10.2/solid/solid/backends/win/winstoragevolume.h
---- kdelibs-4.10.2.orig/solid/solid/backends/win/winstoragevolume.h 1970-01-01 \
01:00:00.000000000 +0100
-+++ kdelibs-4.10.2/solid/solid/backends/win/winstoragevolume.h 2013-06-01 \
14:28:10.792910900 +0200 +diff --git a/solid/solid/backends/win/winstoragevolume.h \
b/solid/solid/backends/win/winstoragevolume.h +new file mode 100644
+index 0000000..2f9ebc4
+--- /dev/null
++++ b/solid/solid/backends/win/winstoragevolume.h
@@ -0,0 +1,68 @@
+/*
+ Copyright 2013 Patrick von Reth <vonreth@kde.org>
@@ -3124,115 +3283,10 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/backends/win/winstoragevolume. +}
+
+#endif // WINVOLUME_H
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/CMakeLists.txt \
kdelibs-4.10.2/solid/solid/CMakeLists.txt
---- kdelibs-4.10.2.orig/solid/solid/CMakeLists.txt 2013-03-29 08:00:27.998064000 \
+0100
-+++ kdelibs-4.10.2/solid/solid/CMakeLists.txt 2013-06-01 14:28:10.795911100 +0200
-@@ -10,7 +10,12 @@
- configure_file(solid_export.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/solid_export.h)
-
- include (CheckCXXSourceCompiles)
--
-+if(MSVC)
-+check_cxx_source_compiles("int main() { __asm { pxor mm0, mm0 }; }" HAVE_X86_MMX)
-+check_cxx_source_compiles("int main() { __asm { xorps xmm0, xmm0 }; }" \
HAVE_X86_SSE)
-+check_cxx_source_compiles("int main() { __asm { xorpd xmm0, xmm0 }; }" \
HAVE_X86_SSE2)
-+check_cxx_source_compiles("int main() { __asm { femms }; }" HAVE_X86_3DNOW)
-+else(MSVC)
- check_cxx_source_compiles(" #ifdef __SUNPRO_CC
- #define __asm__ asm
- #endif
-@@ -27,6 +32,7 @@
- #define __asm__ asm
- #endif
- int main() { __asm__(\"femms\"); }" HAVE_X86_3DNOW)
-+endif(MSVC)
- check_cxx_source_compiles(" #ifdef __SUNPRO_CC
- #define __asm__ asm
- #endif
-@@ -43,6 +49,7 @@
- ${CMAKE_CURRENT_BINARY_DIR}/backends/hal
- ${CMAKE_CURRENT_BINARY_DIR}/backends/udev
- ${CMAKE_CURRENT_BINARY_DIR}/backends/wmi
-+ ${CMAKE_CURRENT_BINARY_DIR}/backends/win
- )
-
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${KDE4_C_FLAGS}") # enable -fvisibility=hidden \
for C sources
-@@ -338,17 +345,20 @@
- endif(APPLE)
-
- if(WIN32)
-- include(CheckIncludeFileCXX)
-- check_include_file_cxx(wbemidl.h HAVE_WBEM)
-- FIND_LIBRARY(WBEM_LIBRARIES NAMES wbemuuid wbemuuidd)
-- if(HAVE_WBEM AND WBEM_LIBRARIES)
-- set(HAVE_WBEM True)
-- message(STATUS "Found wbemuuid library: ${WBEM_LIBRARIES}")
-- else(HAVE_WBEM AND WBEM_LIBRARIES)
-- set(HAVE_WBEM False)
-- endif(HAVE_WBEM AND WBEM_LIBRARIES)
-- if(HAVE_WBEM AND NOT WINCE)
-- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_WBEM")
-+ if(WITH_SOLID_WMI)
-+ include(CheckIncludeFileCXX)
-+ check_include_file_cxx(wbemidl.h HAVE_WBEM)
-+ FIND_LIBRARY(WBEM_LIBRARIES NAMES wbemuuid wbemuuidd)
-+ if(HAVE_WBEM AND WBEM_LIBRARIES)
-+ set(HAVE_WBEM True)
-+ message(STATUS "Found wbemuuid library: ${WBEM_LIBRARIES}")
-+ else(HAVE_WBEM AND WBEM_LIBRARIES)
-+ set(HAVE_WBEM False)
-+ set(WITH_SOLID_WMI False)
-+ endif(HAVE_WBEM AND WBEM_LIBRARIES)
-+ endif(WITH_SOLID_WMI)
-+ if(WITH_SOLID_WMI)
-+ add_definitions(-WITH_SOLID_WMI)
- message(STATUS "-- Building Solid WMI backend." )
-
- set(solid_LIB_SRCS ${solid_LIB_SRCS}
-@@ -375,7 +385,25 @@
- backends/wmi/wmivolume.cpp
-
- )
-- endif(HAVE_WBEM AND NOT WINCE)
-+ else(WITH_SOLID_WMI)
-+ message(STATUS "-- Building Solid Windows backend." )
-+ set(solid_LIB_SRCS ${solid_LIB_SRCS}
-+ backends/win/winblock.cpp
-+ backends/win/winopticaldrive.cpp
-+ backends/win/wininterface.cpp
-+ backends/win/wingenericinterface.cpp
-+ backends/win/windevice.cpp
-+ backends/win/windevicemanager.cpp
-+ backends/win/winopticaldisc.cpp
-+ backends/win/winprocessor.cpp
-+ #backends/win/wmiportablemediaplayer.cpp
-+ backends/win/winstorageaccess.cpp
-+ backends/win/winstoragedrive.cpp
-+ backends/win/winstoragevolume.cpp
-+ backends/win/winbattery.cpp
-+ backends/win/winacadapter.cpp
-+ )
-+ endif(WITH_SOLID_WMI)
- endif(WIN32)
-
- set_source_files_properties( org.freedesktop.PowerManagement.xml
-@@ -394,9 +422,11 @@
-
- if(WIN32)
- set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${KDEWIN_LIBRARY})
-- if(HAVE_WBEM)
-+ if(WITH_SOLID_WMI)
- set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${WBEM_LIBRARIES})
-- endif(HAVE_WBEM)
-+ else(WITH_SOLID_WMI)
-+ set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} setupapi)
-+ endif(WITH_SOLID_WMI)
- endif(WIN32)
-
- if(APPLE)
-diff -Nru -x '*~' kdelibs-4.10.2.orig/solid/solid/managerbase.cpp \
kdelibs-4.10.2/solid/solid/managerbase.cpp
---- kdelibs-4.10.2.orig/solid/solid/managerbase.cpp 2013-03-01 07:26:14.567774000 \
+0100
-+++ kdelibs-4.10.2/solid/solid/managerbase.cpp 2013-06-01 14:28:11.076927200 +0200
+diff --git a/solid/solid/managerbase.cpp b/solid/solid/managerbase.cpp
+index beaeac5..6649972 100644
+--- a/solid/solid/managerbase.cpp
++++ b/solid/solid/managerbase.cpp
@@ -48,9 +48,12 @@
#include "backends/fstab/fstabmanager.h"
@@ -3247,7 +3301,7 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/solid/solid/managerbase.cpp kdelibs-4.10.2
Solid::ManagerBasePrivate::ManagerBasePrivate()
-@@ -72,9 +75,10 @@
+@@ -72,9 +75,10 @@ void Solid::ManagerBasePrivate::loadBackends()
# if defined(Q_OS_MAC)
m_backends << new Solid::Backends::IOKit::IOKitManager(0);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic