From 3c2e8ba4ed1868301c6f47e3d21f709fbb63e48f Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 7 Mar 2013 14:39:27 +0000 Subject: [PATCH] packaging changes for GTK engines on OS X git-svn-id: svn://localhost/ardour2/branches/3.0@14171 d708f5d6-7413-0410-9779-e7cbd77b26cf --- tools/linux_packaging/build | 2 +- tools/osx_packaging/osx_build | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 4d883d2922..f992b6604a 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -318,7 +318,7 @@ rm pangorc gdk-pixbuf-query-loaders | sed "s?$GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/?@ROOTDIR@/?" > $Etc/gdk-pixbuf.loaders.in # We rely on clearlooks, so include a version from our own build tree -# this one is special - we will set GTK_PATH to $Libraries/clearlooks +# this one is special - we will set GTK_PATH to $Libraries/gtkengines GTK_ENGINE_DIR=$Libraries/gtkengines/engines mkdir -p $GTK_ENGINE_DIR diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 364c83a4d8..a6137ce2bf 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -265,12 +265,18 @@ rm pangorc gdk-pixbuf-query-loaders | sed "s?$GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/?@executable_path/../lib/modules/?" > $Resources/gdk-pixbuf.loaders # We rely on clearlooks, so include a version from our own build tree -# this one is special - we will set GTK_PATH to $Libraries/clearlooks +# this one is special - we will set GTK_PATH to $Libraries/gtkengines + +GTK_ENGINE_DIR=$Libraries/gtkengines/engines +mkdir -p $GTK_ENGINE_DIR + +echo "Copying GTK engines ..." +cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.so $Libraries +(cd $GTK_ENGINE_DIR && ln -s ../../libclearlooks.dylib . && ln -s ../../libclearlooks.dylib libclearlooks.so) + +cp $GTKSTACK_ROOT/lib/gtk-2.0/2.10.0/engines/libpixmap.so $Libraries +(cd $GTK_ENGINE_DIR && ln -s ../../libpixmap.dylib . && ln -s ../../libpixmap.dylib libpixmap.so) -echo "Copying clearlooks ..." -cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.dylib $Frameworks -mkdir -p $Frameworks/clearlooks/engines -(cd $Frameworks/clearlooks/engines && ln -s ../../libclearlooks.dylib libclearlooks.dylib && ln -s ../../libclearlooks.dylib libclearlooks.so) if test x$WITH_LADSPA != x ; then if test x$SAE != x ; then