patch upstreamed
This commit is contained in:
parent
f3efe1f53c
commit
7fbafb9ec9
|
@ -37,18 +37,6 @@ index 4c8390d..1c05dd0 100644
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
include(FindPackageHandleStandardArgs)
|
||||||
find_package_handle_standard_args(UDev DEFAULT_MSG UDEV_INCLUDE_DIR UDEV_LIBS)
|
find_package_handle_standard_args(UDev DEFAULT_MSG UDEV_INCLUDE_DIR UDEV_LIBS)
|
||||||
diff --git a/solid/solid/CMakeLists.txt b/solid/solid/CMakeLists.txt
|
|
||||||
index a7f1f07..97ca6c4 100644
|
|
||||||
--- a/solid/solid/CMakeLists.txt
|
|
||||||
+++ b/solid/solid/CMakeLists.txt
|
|
||||||
@@ -200,6 +200,7 @@ if(NOT WIN32 AND NOT APPLE)
|
|
||||||
|
|
||||||
if ( UDEV_FOUND )
|
|
||||||
message(STATUS "Building Solid UDev backend." )
|
|
||||||
+ macro_bool_to_01(UDEV_HAVE_GET_SYSATTR_LIST_ENTRY)
|
|
||||||
set(solid_LIB_SRCS ${solid_LIB_SRCS}
|
|
||||||
backends/udev/utils.cpp
|
|
||||||
backends/udev/udevdevice.cpp
|
|
||||||
diff --git a/solid/solid/backends/shared/udevqt.h b/solid/solid/backends/shared/udevqt.h
|
diff --git a/solid/solid/backends/shared/udevqt.h b/solid/solid/backends/shared/udevqt.h
|
||||||
index 228687e..9611658 100644
|
index 228687e..9611658 100644
|
||||||
--- a/solid/solid/backends/shared/udevqt.h
|
--- a/solid/solid/backends/shared/udevqt.h
|
||||||
|
@ -84,12 +72,12 @@ index d18b616..4721b7a 100644
|
||||||
Device Device::parent() const
|
Device Device::parent() const
|
||||||
{
|
{
|
||||||
diff --git a/solid/solid/config-solid.h.cmake b/solid/solid/config-solid.h.cmake
|
diff --git a/solid/solid/config-solid.h.cmake b/solid/solid/config-solid.h.cmake
|
||||||
index 84c3b5c..bb71645 100644
|
index 84c3b5c..5d4b68d 100644
|
||||||
--- a/solid/solid/config-solid.h.cmake
|
--- a/solid/solid/config-solid.h.cmake
|
||||||
+++ b/solid/solid/config-solid.h.cmake
|
+++ b/solid/solid/config-solid.h.cmake
|
||||||
@@ -19,4 +19,5 @@
|
@@ -19,4 +19,5 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#cmakedefine UDEV_FOUND
|
#cmakedefine UDEV_FOUND
|
||||||
+#cmakedefine UDEV_HAVE_GET_SYSATTR_LIST_ENTRY
|
+#cmakedefine01 UDEV_HAVE_GET_SYSATTR_LIST_ENTRY
|
||||||
#cmakedefine HUPNP_FOUND
|
#cmakedefine HUPNP_FOUND
|
||||||
|
|
|
@ -139,7 +139,8 @@ Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch
|
||||||
|
|
||||||
# an improvement on
|
# an improvement on
|
||||||
# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/a8d3d3321522d35c2852abb02a475c6b43be5cfe
|
# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/a8d3d3321522d35c2852abb02a475c6b43be5cfe
|
||||||
# strictly, only required for old pre-systemd systems (like el6)
|
# committed:
|
||||||
|
# http://commits.kde.org/kdelibs/587137e39fdcf9b9815eff3fd2fc234d378f8d93
|
||||||
Patch51: kdelibs-UDEV_HAVE_GET_SYSATTR_LIST_ENTRY.patch
|
Patch51: kdelibs-UDEV_HAVE_GET_SYSATTR_LIST_ENTRY.patch
|
||||||
|
|
||||||
# Toggle solid upnp support at runtime via env var SOLID_UPNP=1 (disabled by default)
|
# Toggle solid upnp support at runtime via env var SOLID_UPNP=1 (disabled by default)
|
||||||
|
|
Loading…
Reference in New Issue