From eeb482ba1ac3c8027fe1397c25eeaf18e32612ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 8 Sep 2013 16:59:04 +0200
Subject: Fix FTBFS if ARTS_INCLUDE_DIRS contains multiple paths

---
 arts/kde/CMakeLists.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt
index 3b585256d..091be3526 100644
--- a/arts/kde/CMakeLists.txt
+++ b/arts/kde/CMakeLists.txt
@@ -27,11 +27,6 @@ link_directories(
   ${ARTS_LIBRARY_DIRS}
 )
 
-# pkg-config stripping -I/usr/include
-if( NOT ARTS_INCLUDE_DIRS )
-  set( ARTS_INCLUDE_DIRS "/usr/include" )
-endif()
-
 
 ##### headers ###################################
 
@@ -58,7 +53,7 @@ set( ${target}_SRCS
 add_custom_command(
   OUTPUT artskde.cc artskde.h
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE}
-    -I${ARTS_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/artskde.idl
+    -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artskde.idl
   DEPENDS artskde.idl
 )
 
-- 
cgit v1.2.1


From ea7811818e3d5eb785a13a629f998f423ecf228b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Tue, 10 Sep 2013 17:22:18 +0200
Subject: GCC 4.8 fixes.

---
 tdelfeditor/tdelfeditor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp
index d982bea5d..23c95a05a 100644
--- a/tdelfeditor/tdelfeditor.cpp
+++ b/tdelfeditor/tdelfeditor.cpp
@@ -30,6 +30,7 @@
 
 /* Obtaining command-line options */
 #include <getopt.h>
+#include <cstdlib>
 
 /* Internationalization support */
 extern "C" {
-- 
cgit v1.2.1