From 85fbffb947bcb0fdf97adf032c73a903874551f0 Mon Sep 17 00:00:00 2001
From: Tres Finocchiaro <tres.finocchiaro@gmail.com>
Date: Wed, 23 Apr 2014 20:28:37 -0700
Subject: [PATCH 1/3] Fix relative path for stk rawwaves on OSX

---
 src/core/config_mgr.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp
index 653c14d5d..1fdb6a502 100644
--- a/src/core/config_mgr.cpp
+++ b/src/core/config_mgr.cpp
@@ -355,8 +355,10 @@ void configManager::loadConfigFile()
 	if( m_stkDir.isEmpty() || m_stkDir == QDir::separator() ||
 			!QDir( m_stkDir ).exists() )
 	{
-#ifdef LMMS_BUILD_WIN32
+#if defined(LMMS_BUILD_WIN32)
 		m_stkDir = m_dataDir + "stk/rawwaves/";
+#elif defined(LMMS_BUILD_APPLE)
+                m_stkDir = qApp->applicationDirPath() + "/../share/stk/rawwaves/";
 #else
 		m_stkDir = "/usr/share/stk/rawwaves/";
 #endif

From ec708aa967bf7a26a2b231703ebcd5b7635e7d06 Mon Sep 17 00:00:00 2001
From: Tres Finocchiaro <tres.finocchiaro@gmail.com>
Date: Wed, 23 Apr 2014 20:31:02 -0700
Subject: [PATCH 2/3] Update config_mgr.cpp

---
 src/core/config_mgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp
index 1fdb6a502..1510f630a 100644
--- a/src/core/config_mgr.cpp
+++ b/src/core/config_mgr.cpp
@@ -358,7 +358,7 @@ void configManager::loadConfigFile()
 #if defined(LMMS_BUILD_WIN32)
 		m_stkDir = m_dataDir + "stk/rawwaves/";
 #elif defined(LMMS_BUILD_APPLE)
-                m_stkDir = qApp->applicationDirPath() + "/../share/stk/rawwaves/";
+		m_stkDir = qApp->applicationDirPath() + "/../share/stk/rawwaves/";
 #else
 		m_stkDir = "/usr/share/stk/rawwaves/";
 #endif

From 53e67bae00d9cdcd5d763ee79518a42d9e09bd19 Mon Sep 17 00:00:00 2001
From: Tres Finocchiaro <tres.finocchiaro@gmail.com>
Date: Wed, 23 Apr 2014 20:33:19 -0700
Subject: [PATCH 3/3] Copy rawwaves to Apple bundle

---
 data/scripts/create_apple_installer.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/data/scripts/create_apple_installer.sh b/data/scripts/create_apple_installer.sh
index 70f1c151c..85efc59ec 100755
--- a/data/scripts/create_apple_installer.sh
+++ b/data/scripts/create_apple_installer.sh
@@ -22,6 +22,8 @@ CMAKE_INSTALL=$CMAKE_SRC/target
 # LMMS source build directory
 CMAKE_BUILD=$CMAKE_SRC/build
 
+# STK rawwaves directory
+STK_RAWWAVE=$HOME/stk-*/rawwaves
 
 
 # Place to create ".app" bundle
@@ -56,6 +58,10 @@ cd $CMAKE_INSTALL
 mkdir $APP/Contents
 cp -R * $APP/Contents
 
+# Manually copy STK rawwaves
+mkdir -p $APP/Contents/share/stk/rawwaves
+cp $STK_RAWWAVE/*.raw $APP/Contents/share/stk/rawwaves
+
 # Make all libraries writable for macdeployqt
 cd $APP
 find . -type f -print0 | xargs -0 chmod u+w