From 3a1bc2a7ae9d818ad25b3de6ecc051068b9640cb Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Fri, 9 May 2014 08:41:07 -0700 Subject: [PATCH 1/7] Fix "Use of undeclared identifier 'getpid'" Troubleshooting RemoteZynAddSubFX. --- include/RemotePlugin.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h index edf09efbe..80a30af3e 100644 --- a/include/RemotePlugin.h +++ b/include/RemotePlugin.h @@ -42,7 +42,9 @@ #endif #ifdef LMMS_BUILD_APPLE +#include #define USE_QT_SEMAPHORES +#define USE_QT_SHMEM #endif From 5aa6779108254af03f34b21d2830438a19bd4ea9 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Fri, 9 May 2014 08:45:10 -0700 Subject: [PATCH 2/7] Fix incorrect path to libZynAddSubFxCore.dylib --- data/scripts/create_apple_bundle.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/scripts/create_apple_bundle.sh.in b/data/scripts/create_apple_bundle.sh.in index 8b335cb0d..b9364693d 100644 --- a/data/scripts/create_apple_bundle.sh.in +++ b/data/scripts/create_apple_bundle.sh.in @@ -90,7 +90,7 @@ install_name_tool -change libZynAddSubFxCore.dylib \ ${APP}/Contents/lib/lmms/libzynaddsubfx.so install_name_tool -change ${CMAKE_BUILD}/plugins/zynaddsubfx/libZynAddSubFxCore.dylib \ - @loader_path/../../Frameworks/libZynAddSubFxCore.dylib \ + @loader_path/../Frameworks/libZynAddSubFxCore.dylib \ ${APP}/Contents/MacOS/RemoteZynAddSubFx # Build a list of shared objects in target/lib/lmms From 9abfbd6c9448c11c56aed8a13ed44ab1737c789c Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Mon, 12 May 2014 21:37:01 -0700 Subject: [PATCH 3/7] #527 --- data/themes/default/style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 3d6fd84a2..4b4bfc103 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -1,7 +1,9 @@ /******************** * LMMS style sheet * ********************/ -QLabel { + +/* most foreground text items */ +QLabel, QTreeWidget, QListWidget, QGroupBox { color: #e0e0e0; } From 5bb5ffc152e43db9dcb3b54c36794c2dc658b826 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Mon, 12 May 2014 22:06:44 -0700 Subject: [PATCH 4/7] Revert changes --- include/RemotePlugin.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h index 80a30af3e..edf09efbe 100644 --- a/include/RemotePlugin.h +++ b/include/RemotePlugin.h @@ -42,9 +42,7 @@ #endif #ifdef LMMS_BUILD_APPLE -#include #define USE_QT_SEMAPHORES -#define USE_QT_SHMEM #endif From 959db3d7ac1a54cfcf1d05801ce91413060d4c30 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Mon, 12 May 2014 22:08:34 -0700 Subject: [PATCH 5/7] Revert changes --- data/scripts/create_apple_bundle.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/scripts/create_apple_bundle.sh.in b/data/scripts/create_apple_bundle.sh.in index b9364693d..b799cf12d 100644 --- a/data/scripts/create_apple_bundle.sh.in +++ b/data/scripts/create_apple_bundle.sh.in @@ -86,7 +86,7 @@ mv ${APP}/Contents/lib/lmms/RemoteZynAddSubFx \ # Fix more Zyn Linking issues install_name_tool -change libZynAddSubFxCore.dylib \ - @loader_path/../../Frameworks/libZynAddSubFxCore.dylib \ + @loader_path/../Frameworks/libZynAddSubFxCore.dylib \ ${APP}/Contents/lib/lmms/libzynaddsubfx.so install_name_tool -change ${CMAKE_BUILD}/plugins/zynaddsubfx/libZynAddSubFxCore.dylib \ From e401ac5c9d3376cb176511f718061aa3c4077e80 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Mon, 12 May 2014 22:09:47 -0700 Subject: [PATCH 6/7] Revert changes --- data/scripts/create_apple_bundle.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/scripts/create_apple_bundle.sh.in b/data/scripts/create_apple_bundle.sh.in index b799cf12d..b9364693d 100644 --- a/data/scripts/create_apple_bundle.sh.in +++ b/data/scripts/create_apple_bundle.sh.in @@ -86,7 +86,7 @@ mv ${APP}/Contents/lib/lmms/RemoteZynAddSubFx \ # Fix more Zyn Linking issues install_name_tool -change libZynAddSubFxCore.dylib \ - @loader_path/../Frameworks/libZynAddSubFxCore.dylib \ + @loader_path/../../Frameworks/libZynAddSubFxCore.dylib \ ${APP}/Contents/lib/lmms/libzynaddsubfx.so install_name_tool -change ${CMAKE_BUILD}/plugins/zynaddsubfx/libZynAddSubFxCore.dylib \ From 7404eef34ad658dbf0f334da9decbc3d3b9b8202 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Mon, 12 May 2014 22:10:28 -0700 Subject: [PATCH 7/7] Revert changes --- data/scripts/create_apple_bundle.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/scripts/create_apple_bundle.sh.in b/data/scripts/create_apple_bundle.sh.in index b9364693d..8b335cb0d 100644 --- a/data/scripts/create_apple_bundle.sh.in +++ b/data/scripts/create_apple_bundle.sh.in @@ -90,7 +90,7 @@ install_name_tool -change libZynAddSubFxCore.dylib \ ${APP}/Contents/lib/lmms/libzynaddsubfx.so install_name_tool -change ${CMAKE_BUILD}/plugins/zynaddsubfx/libZynAddSubFxCore.dylib \ - @loader_path/../Frameworks/libZynAddSubFxCore.dylib \ + @loader_path/../../Frameworks/libZynAddSubFxCore.dylib \ ${APP}/Contents/MacOS/RemoteZynAddSubFx # Build a list of shared objects in target/lib/lmms