From 52625476b47d8b03f5a91a653e110097e7562941 Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Wed, 15 Aug 2018 21:18:17 +0200
Subject: [PATCH] Fix config dir (#2922)

---
 dev-util/cppcheck/cppcheck-1.84.recipe        |  1 +
 .../cppcheck/patches/cppcheck-1.84.patchset   | 37 ++++++++++++++++---
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/dev-util/cppcheck/cppcheck-1.84.recipe b/dev-util/cppcheck/cppcheck-1.84.recipe
index af185ffbb..101901e77 100644
--- a/dev-util/cppcheck/cppcheck-1.84.recipe
+++ b/dev-util/cppcheck/cppcheck-1.84.recipe
@@ -52,6 +52,7 @@ BUILD()
 		-DBUILD_SHARED_LIBS=ON \
 		-DBUILD_TESTS=ON \
 		-DHAVE_RULES=ON \
+		-DCFGDIR=$settingsDir/cppcheck \
 		$cmakeDirArgs
 
 	make $jobArgs
diff --git a/dev-util/cppcheck/patches/cppcheck-1.84.patchset b/dev-util/cppcheck/patches/cppcheck-1.84.patchset
index cfc06cc2f..05dc7a14a 100644
--- a/dev-util/cppcheck/patches/cppcheck-1.84.patchset
+++ b/dev-util/cppcheck/patches/cppcheck-1.84.patchset
@@ -1,11 +1,11 @@
-From b4973d8327b89e44c43fc696f5454821c0a665f6 Mon Sep 17 00:00:00 2001
+From dbfa760b6cf29de363428cae6cb62db89fb49a4e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Thu, 5 Apr 2018 17:55:26 +0200
 Subject: Haiku patches
 
 
 diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
-index bfaa398..8a3cd8c 100644
+index 8da7086..f259391 100644
 --- a/cli/cppcheckexecutor.cpp
 +++ b/cli/cppcheckexecutor.cpp
 @@ -52,7 +52,7 @@
@@ -18,7 +18,7 @@ index bfaa398..8a3cd8c 100644
  #endif
  #ifdef __linux__
 diff --git a/cli/filelister.cpp b/cli/filelister.cpp
-index ff2112b..86dfa0e 100644
+index 52a9400..7e51de4 100644
 --- a/cli/filelister.cpp
 +++ b/cli/filelister.cpp
 @@ -204,6 +204,7 @@ static void addFiles2(std::map<std::string, std::size_t> &files,
@@ -38,10 +38,10 @@ index ff2112b..86dfa0e 100644
              closedir(dir);
          } else
 diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
-index bc73870..fea5e25 100644
+index f0534d5..028a28f 100644
 --- a/cli/threadexecutor.cpp
 +++ b/cli/threadexecutor.cpp
-@@ -150,7 +150,7 @@ int ThreadExecutor::handleRead(int rpipe, unsigned int &result)
+@@ -143,7 +143,7 @@ int ThreadExecutor::handleRead(int rpipe, unsigned int &result)
  
  bool ThreadExecutor::checkLoadAverage(size_t nchildren)
  {
@@ -72,5 +72,30 @@ index 8f6e957..17b3d1c 100644
      set (CMAKE_C_FLAGS_DEBUG            "-g")
      set (CMAKE_C_FLAGS_RELEASE          "-O2")
 -- 
-2.16.2
+2.16.4
+
+
+From 7d641cef19798b763ed81c9a844bc2bca6f93345 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Wed, 15 Aug 2018 20:23:10 +0200
+Subject: Data Path
+
+
+diff --git a/cmake/compilerDefinitions.cmake b/cmake/compilerDefinitions.cmake
+index 7179c68..992a2bb 100644
+--- a/cmake/compilerDefinitions.cmake
++++ b/cmake/compilerDefinitions.cmake
+@@ -5,5 +5,9 @@ if (UNIX)
+     if (HAVE_RULES)
+         add_definitions(-DHAVE_RULES -DTIXML_USE_STL)
+     endif()
+-    add_definitions(-DCFGDIR="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}")
++    if (NOT HAIKU)
++        add_definitions(-DCFGDIR="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}")
++    else()
++        add_definitions(-DCFGDIR="${CMAKE_INSTALL_PREFIX}/data/${PROJECT_NAME}")
++    endif()
+ endif()
+-- 
+2.16.4