From f6de07ecf1184f8eabadfec2dadde4e361115649 Mon Sep 17 00:00:00 2001
From: Andreas Stallinger <astallinger.mmt-m2013@fh-salzburg.ac.at>
Date: Thu, 17 Mar 2016 13:58:47 +0100
Subject: [PATCH] build: update botan paths

botan has new paths on linux build, debug - release fix on linux
---
 CMakeLists.txt                                | 10 ++++++----
 setup/Linux/Coati.sh                          |  2 +-
 setup/Linux/Coati_trial.sh                    |  2 +-
 src/lib_gui/platform_includes/includesLinux.h | 14 +++++++++-----
 src/lib_gui/qt/graphics/QtGraphicsView.h      |  2 ++
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf4b6dd4..1b2b12f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,11 +101,13 @@ endif()
 
 # Botan -------------------------------------------------------------------------
 
+set(BOTAN_VERSION "botan-1.11")
+
 if(UNIX AND APPLE)
-    find_library(BOTAN botan-1.11 $ENV{BOTAN_DIR}/release NO_DEFAULT_PATH)
-    find_library(BOTAN_D botan-1.11 $ENV{BOTAN_DIR}/debug NO_DEFAULT_PATH)
+    find_library(BOTAN ${BOTAN_VERSION} $ENV{BOTAN_DIR}/release NO_DEFAULT_PATH)
+    find_library(BOTAN_D ${BOTAN_VERSION} $ENV{BOTAN_DIR}/debug NO_DEFAULT_PATH)
 elseif(UNIX)
-    find_library(BOTAN botan-1.11 "${EXTERNAL_BUILD}/botan/lib" NO_DEFAULT_PATH)
+    find_library(BOTAN ${BOTAN_VERSION} "${EXTERNAL_BUILD}/botan" NO_DEFAULT_PATH)
 else()
     find_library(BOTAN botan "$ENV{BOTAN_DIR}/release")
 	find_library(BOTAN_D botan "$ENV{BOTAN_DIR}/debug")
@@ -116,7 +118,7 @@ else()
     message(STATUS "Botan found")
 endif()
 if(UNIX AND NOT APPLE)
-    set(BOTAN_INCLUDE_DIR "${EXTERNAL_SRC}/botan")
+    set(BOTAN_INCLUDE_DIR "${EXTERNAL_BUILD}/botan")
 else()
     set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}")
 endif()
diff --git a/setup/Linux/Coati.sh b/setup/Linux/Coati.sh
index 6c9a69f8..0c71f39c 100755
--- a/setup/Linux/Coati.sh
+++ b/setup/Linux/Coati.sh
@@ -12,7 +12,7 @@ COATI_PATH="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 #setup data folder
 if [ ! -d "${HOME}/.config/coati" ]; then
   # Control will enter here if $DIRECTORY doesn't exist.
-  mkdir ${HOME}/.config/coati
+  mkdir -p ${HOME}/.config/coati
   cp $COATI_PATH/user/* ${HOME}/.config/coati/
   echo "First start of Coati from this user, copy default configfiles to ~/.config/coati"
 fi
diff --git a/setup/Linux/Coati_trial.sh b/setup/Linux/Coati_trial.sh
index 5b793f90..d7f6dd51 100755
--- a/setup/Linux/Coati_trial.sh
+++ b/setup/Linux/Coati_trial.sh
@@ -13,7 +13,7 @@ COATI_PATH="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 echo $COATI_PATH
 if [ ! -d "${HOME}/.config/coatitrial" ]; then
   # Control will enter here if $DIRECTORY doesn't exist.
-  mkdir ${HOME}/.config/coatitrial
+  mkdir -p ${HOME}/.config/coatitrial
   cp $COATI_PATH/user/* ${HOME}/.config/coatitrial/
   echo "First start of Coati from this user, copy default configfiles to ~/.config/coati"
 fi
diff --git a/src/lib_gui/platform_includes/includesLinux.h b/src/lib_gui/platform_includes/includesLinux.h
index 13802122..b71ed61a 100644
--- a/src/lib_gui/platform_includes/includesLinux.h
+++ b/src/lib_gui/platform_includes/includesLinux.h
@@ -2,10 +2,12 @@
 #define INCLUDES_DEFAULT_H
 
 #include <QCoreApplication>
+#include <QDir>
 #include "utility/AppPath.h"
 #include "utility/UserPaths.h"
 #include "utility/file/FilePath.h"
 #include "utility/file/FileSystem.h"
+#include "qt/utility/utilityQt.h"
 #include "isTrial.h"
 
 void setupPlatform(int argc, char *argv[])
@@ -29,13 +31,15 @@ void setupApp(int argc, char *argv[])
 		userdir.append("/.config/coati/");
 	}
     UserPaths::setUserDataPath(userdir);
-	FilePath userDataPath(userdir);
-	//copy default user folder to .config/coati if it does not exist
-	if (!userDataPath.exists())
+
+	QString userDataPath(userdir.c_str());
+	QDir dataDir(userdir.c_str());
+	if (!dataDir.exists())
 	{
-		FilePath from(AppPath::getAppPath() + "user");
-		FileSystem::copy_directory(from, userDataPath);
+		dataDir.mkpath(userDataPath);
 	}
+
+	utility::copyNewFilesFromDirectory(QString::fromStdString(UserPaths::getUserDataPath()), userDataPath);
 }
 
 #endif // INCLUDES_DEFAULT_H
diff --git a/src/lib_gui/qt/graphics/QtGraphicsView.h b/src/lib_gui/qt/graphics/QtGraphicsView.h
index cda93718..1a7a8c6e 100644
--- a/src/lib_gui/qt/graphics/QtGraphicsView.h
+++ b/src/lib_gui/qt/graphics/QtGraphicsView.h
@@ -1,6 +1,8 @@
 #ifndef QT_GRAPHICS_VIEW_H
 #define QT_GRAPHICS_VIEW_H
 
+#include <memory>
+
 #include <QGraphicsView>
 
 class QTimer;