rev 19868 - in kde-extras/icemon/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2014-02-22 11:48:05 +0000 (Sat, 22 Feb 2014)
New Revision: 19868

Added:
   kde-extras/icemon/trunk/debian/patches/
   kde-extras/icemon/trunk/debian/patches/no-icecc-logging.diff
   kde-extras/icemon/trunk/debian/patches/series
Modified:
   kde-extras/icemon/trunk/debian/changelog
Log:
fix build with icecc 1.0.x


Modified: kde-extras/icemon/trunk/debian/changelog
===================================================================
--- kde-extras/icemon/trunk/debian/changelog	2014-02-22 11:20:26 UTC (rev 19867)
+++ kde-extras/icemon/trunk/debian/changelog	2014-02-22 11:48:05 UTC (rev 19868)
@@ -1,6 +1,7 @@
 icecc-monitor (2.9.90~git20140222-1) unstable; urgency=medium
 
   * New Git snapshot.
+  * Fix build with icecc 1.0.x; patch no-icecc-logging.diff.
 
  -- Pino Toscano <pino at debian.org>  Sat, 22 Feb 2014 12:19:51 +0100
 

Added: kde-extras/icemon/trunk/debian/patches/no-icecc-logging.diff
===================================================================
--- kde-extras/icemon/trunk/debian/patches/no-icecc-logging.diff	                        (rev 0)
+++ kde-extras/icemon/trunk/debian/patches/no-icecc-logging.diff	2014-02-22 11:48:05 UTC (rev 19868)
@@ -0,0 +1,65 @@
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: build also without logging in icecc
+ Look for the newly introduced logging.h header in icecc, and enable the
+ logging bits only when it is present.
+ .
+ This makes sure icemon can be built with icecc 1.0.x.
+Forwarded: https://github.com/icecc/icemon/pull/16
+Last-Update: 2014-02-22
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,6 +6,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
+ 
+ include(GNUInstallDirs)
+ include(KDE4Macros-Icecream)
++include(CheckIncludeFileCXX)
+ 
+ # version info
+ set(ICEMON_VERSION_MAJOR "2")
+@@ -43,6 +44,8 @@ include_directories(
+     ${CMAKE_CURRENT_BINARY_DIR} # config-icemon.h
+ )
+ 
++check_include_file_cxx(icecc/logging.h ICECC_HAVE_LOGGING_H)
++
+ set(
+   INSTALL_TARGETS_DEFAULT_ARGS
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+--- a/config-icemon.h.cmake
++++ b/config-icemon.h.cmake
+@@ -1,2 +1,3 @@
+ #define ICEMON_VERSION_STRING "@ICEMON_VERSION_STRING@"
++#cmakedefine ICECC_HAVE_LOGGING_H 1
+ 
+--- a/src/icecreammonitor.cc
++++ b/src/icecreammonitor.cc
+@@ -26,8 +26,12 @@
+ #include "hostinfo.h"
+ #include "statusview.h"
+ 
++#include <config-icemon.h>
++
+ #include <icecc/comm.h>
++#ifdef ICECC_HAVE_LOGGING_H
+ #include <icecc/logging.h>
++#endif
+ 
+ #include <qdebug.h>
+ 
+@@ -359,6 +363,7 @@ void IcecreamMonitor::setSchedulerState(
+ 
+ void IcecreamMonitor::setupDebug()
+ {
++#ifdef ICECC_HAVE_LOGGING_H
+     char *env = getenv("ICECC_DEBUG");
+     int debug_level = Error;
+ 
+@@ -379,6 +384,7 @@ void IcecreamMonitor::setupDebug()
+     }
+ 
+     setup_debug(debug_level, logfile, "ICEMON");
++#endif
+ }
+ 
+ #include "icecreammonitor.moc"

Added: kde-extras/icemon/trunk/debian/patches/series
===================================================================
--- kde-extras/icemon/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/icemon/trunk/debian/patches/series	2014-02-22 11:48:05 UTC (rev 19868)
@@ -0,0 +1 @@
+no-icecc-logging.diff