diff options
| author | Robin Gareus <robin@gareus.org> | 2015-03-23 16:06:46 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-03-23 16:15:11 +0100 |
| commit | c68da4236e470e7eeaa8863092197bd8484a41f8 (patch) | |
| tree | 684212142026230791dfd88aa38df8806739d201 /tools/linux_packaging | |
| parent | 65731eaa5c8ed54e98c464c934ad512cca37d017 (diff) | |
use built-in pango & gdk-pixbus modules (Linux)
Diffstat (limited to 'tools/linux_packaging')
| -rw-r--r-- | tools/linux_packaging/ardour.sh.in | 6 | ||||
| -rwxr-xr-x | tools/linux_packaging/build | 16 |
2 files changed, 0 insertions, 22 deletions
diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in index a65a85d8e9..1c087bbaf4 100644 --- a/tools/linux_packaging/ardour.sh.in +++ b/tools/linux_packaging/ardour.sh.in @@ -45,12 +45,6 @@ export GTK_MODULES="" # Set this so that the executable will find all the right libraries inside the bundle export LD_LIBRARY_PATH=$INSTALL_DIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} -# create install-location-dependent config files for Pango and GDK image loaders -# We have to do this every time because its possible that BIN_DIR has changed - -sed "s?@ROOTDIR@/modules?$LIB_DIR/modules?" < $ETC_DIR/pango.modules.in > $USER_ARDOUR_DIR/pango.modules -sed "s?@ROOTDIR@/loaders?$LIB_DIR/loaders?" < $ETC_DIR/gdk-pixbuf.loaders.in > $USER_ARDOUR_DIR/gdk-pixbuf.loaders - if [ "T" = "$DEBUG" ]; then export ARDOUR_INSIDE_GDB=1 exec gdb $INSTALL_DIR/bin/ardour-%VER% diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 1d92befd8f..5b970acded 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -312,22 +312,6 @@ fi # cp -R $GTKSTACK_ROOT/etc/* $Etc -echo "Copying all Pango modules ..." -cp -R $GTKSTACK_ROOT/lib/pango/1.8.0/modules/*.so $Modules -echo "Copying all GDK Pixbuf loaders ..." -cp -R $GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so $Loaders - -# Generate a pango module file using the actual Pango that we're going to bundle - -cat > pangorc <<EOF -[Pango] -ModulesPath=$GTKSTACK_ROOT/lib/pango/1.8.0/modules -EOF -env PANGO_RC_FILE=pangorc $GTKSTACK_ROOT/bin/pango-querymodules | sed "s?$GTKSTACK_ROOT/lib/pango/1.8.0/?@ROOTDIR@/?" > $Etc/pango.modules.in -rm pangorc - -# Ditto for gdk-pixbuf loaders -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/gtkengines |