Attachment 1507 Details for Bug 1651 – 0001-add-lm_sensors-optional-support-for-ksysguard.patch

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] 0001-add-lm_sensors-optional-support-for-ksysguard.patch

0001-add-lm_sensors-optional-support-for-ksysguard.patch (text/plain), 4.21 KB, created by Alexander Golubev (Fat-Zer) on 2013-09-01 00:36:19 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Golubev (Fat-Zer)

Created: 2013-09-01 00:36:19 CDT

Size: 4.21 KB

patch

obsolete

>From 5c23437f91ed20561b7863765e6a4f51d13235db Mon Sep 17 00:00:00 2001
>From: Alexander Golubev <fatzer2@gmail.com>
>Date: Tue, 27 Aug 2013 06:21:51 +0400
>Subject: [PATCH 1/3] add lm_sensors optional support for ksysguard
>
>---
> CMakeLists.txt                             |  2 ++
> ksysguard/CMakeLists.txt                   |  2 --
> ksysguard/ksysguardd/CMakeLists.txt        |  4 +++-
> ksysguard/ksysguardd/ConfigureChecks.cmake | 21 +++++++++++++++++++++
> ksysguard/ksysguardd/Linux/CMakeLists.txt  |  4 ++++
> 5 files changed, 30 insertions(+), 3 deletions(-)
> create mode 100644 ksysguard/ksysguardd/ConfigureChecks.cmake
>
>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index 0ebb514..da54b40 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -81,6 +81,7 @@ option( WITH_XDMCP "xdmcp support for tdm" ${WITH_ALL_OPTIONS} )
> option( WITH_XINERAMA "Enable xinerama extension support" ${WITH_ALL_OPTIONS} )
> option( WITH_ARTS "Enable aRts support" ${WITH_ALL_OPTIONS} )
> option( WITH_I8K "Enable Dell laptop support (ksysguard)" ${WITH_ALL_OPTIONS} )
>+option( WITH_SENSORS "Enable lm_sensors support (ksysguard)" ${WITH_ALL_OPTIONS} )
> option( WITH_HAL "Enable HAL support" ${WITH_ALL_OPTIONS} )
> option( WITH_TDEHWLIB "Enable TDE hardware library support" OFF )
> option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
>@@ -112,6 +113,7 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
> # WITH_XINERAMA     affects ksplashml
> # WITH_ARTS         affects libkonq khotkeys
> # WITH_I8K          affects ksysguard
>+# WITH_SENSORS      affects ksysguard
> # WITH_HAL          affects tdeioslaves(media) ksmserver
> # WITH_TDEHWLIB     affects tdeioslaves(media), replaces WITH_HAL on systems without HAL
> # WITH_LIBRAW1394   affects kcontrol(view1394)
>diff --git a/ksysguard/CMakeLists.txt b/ksysguard/CMakeLists.txt
>index 9beeeb9..daf75d3 100644
>--- a/ksysguard/CMakeLists.txt
>+++ b/ksysguard/CMakeLists.txt
>@@ -9,8 +9,6 @@
> #
> #################################################
> 
>-# FIXME no support for lm_sensors yet
>-
> add_subdirectory( CContLib )
> add_subdirectory( ksysguardd )
> add_subdirectory( gui )
>diff --git a/ksysguard/ksysguardd/CMakeLists.txt b/ksysguard/ksysguardd/CMakeLists.txt
>index 030700f..9ec73cc 100644
>--- a/ksysguard/ksysguardd/CMakeLists.txt
>+++ b/ksysguard/ksysguardd/CMakeLists.txt
>@@ -11,13 +11,14 @@
> 
> # FIXME there is only Linux support
> 
>+include( ConfigureChecks.cmake )
>+
> if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
>   set( OS_SPECIFIC_DIR Linux )
> else()
>   tde_message_fatal( "Your operating system (${CMAKE_SYSTEM_NAME}) is not supported yet." )
> endif()
> 
>-
> add_subdirectory( ${OS_SPECIFIC_DIR} )
> 
> 
>@@ -39,5 +40,6 @@ include_directories(
> tde_add_executable( ksysguardd AUTOMOC
>   SOURCES Command.c conf.c ksysguardd.c PWUIDCache.c
>   LINK ccont-static ksysguardd-static ${TDE_LIB_DIR}/libtdefakes_nonpic.a
>+    ${SENSORS_LIBRARIES}
>   DESTINATION ${BIN_INSTALL_DIR}
> )
>diff --git a/ksysguard/ksysguardd/ConfigureChecks.cmake b/ksysguard/ksysguardd/ConfigureChecks.cmake
>new file mode 100644
>index 0000000..529a89f
>--- /dev/null
>+++ b/ksysguard/ksysguardd/ConfigureChecks.cmake
>@@ -0,0 +1,21 @@
>+#################################################
>+#
>+#  (C) 2013 Alexander Golubev
>+#  fatzer2 (AT) gmail.com
>+#
>+#  Improvements and feedback are welcome
>+#
>+#  This file is released under GPL >= 2
>+#
>+#################################################
>+
>+# lm_sensors
>+if( WITH_SENSORS )
>+  check_include_file( "sensors/sensors.h" HAVE_SENSORS_SENSORS_H )
>+  check_library_exists( sensors sensors_init "" HAVE_SENSORS_LIB )
>+  if( HAVE_SENSORS_SENSORS_H AND HAVE_SENSORS_LIB )
>+    set( SENSORS_LIBRARIES sensors )
>+  else( )
>+    tde_message_fatal( "lm_sensors are required, but not found on your system" )
>+  endif( )
>+endif( WITH_SENSORS )
>diff --git a/ksysguard/ksysguardd/Linux/CMakeLists.txt b/ksysguard/ksysguardd/Linux/CMakeLists.txt
>index b0cff42..f1b0208 100644
>--- a/ksysguard/ksysguardd/Linux/CMakeLists.txt
>+++ b/ksysguard/ksysguardd/Linux/CMakeLists.txt
>@@ -15,6 +15,10 @@ if( WITH_I8K )
>   add_definitions( -DHAVE_I8K_SUPPORT )
> endif()
> 
>+if( WITH_SENSORS )
>+  add_definitions( -DHAVE_SENSORS_SENSORS_H )
>+endif()
>+
> include_directories(
>   ${CMAKE_BINARY_DIR}
>   ${CMAKE_SOURCE_DIR}/ksysguard/CContLib
>-- 
>1.8.1.5
>

Actions: View | Diff

Attachments on bug 1651: 1507 | 1508 | 1509