diff options
| -rw-r--r-- | gtk2_ardour/main.cc | 2 | ||||
| -rwxr-xr-x | tools/linux_packaging/build | 11 | ||||
| -rw-r--r-- | wscript | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 74d310e75a..ec56f35c05 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -178,7 +178,7 @@ fixup_bundle_environment (int, char* []) export_search_path (bundle_dir, "LADSPA_PATH", "/Plugins"); export_search_path (bundle_dir, "VAMP_PATH", "/lib"); export_search_path (bundle_dir, "SUIL_MODULE_DIR", "/lib"); - export_search_path (bundle_dir, "GTK_PATH", "/lib/clearlooks"); + export_search_path (bundle_dir, "GTK_PATH", "/lib/gtkengines"); /* unset GTK_RC_FILES so that we only load the RC files that we define */ diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 49a0bdfd6d..558fe43686 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -320,10 +320,15 @@ gdk-pixbuf-query-loaders | sed "s?$GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/?@ROO # 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 -echo "Copying clearlooks ..." +GTK_ENGINE_DIR=$Libraries/gtkengines/engines +mkdir -p $GTK_ENGINE_DIR + +echo "Copying GTK engines ..." cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.so $Libraries -mkdir -p $Libraries/clearlooks/engines -(cd $Libraries/clearlooks/engines && ln -s ../../libclearlooks.so . ) +(cd $GTK_ENGINE_DIR && ln -s ../../libclearlooks.so . ) + +cp $GTKSTACK_ROOT/lib/gtk-2.0/2.10.0/engines/libpixmap.so $Libraries +(cd $$GTK_ENGINE_DIR && ln -s ../../libclearlooks.so . ) # LADSPA if test x$WITH_LADSPA != x ; then @@ -37,7 +37,8 @@ children = [ 'export', 'midi_maps', 'mcp', - 'manual' + 'manual', + 'patchfiles' ] i18n_children = [ |