use built-in pango & gdk-pixbus modules (Linux)

diff --git a/gtk2_ardour/bundle_env_linux.cc b/gtk2_ardour/bundle_env_linux.cc
index ad484aa7c7df1e92ce8c658fa117935b442eabea..a7027506fe81abe4f1dd5208fdbfc5fa097f7396 100644 (file)
--- a/gtk2_ardour/bundle_env_linux.cc
+++ b/gtk2_ardour/bundle_env_linux.cc
@@ -106,39 +106,6 @@ fixup_bundle_environment (int /*argc*/, char* argv[], const char** localedir)
                error << _("No fontconfig file found on your system. Things may looked very odd or ugly") << endmsg;
        }
 
-       /* write a pango.rc file and tell pango to use it. we'd love
-          to put this into the Ardour.app bundle and leave it there,
-          but the user may not have write permission. so ...
-
-          we also have to make sure that the user ardour directory
-          actually exists ...
-       */
-
-       if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) {
-               error << string_compose (_("cannot create user %3 folder %1 (%2)"), userconfigdir, strerror (errno), PROGRAM_NAME)
-                     << endmsg;
-       } else {
-               
-               path = Glib::build_filename (userconfigdir, "pango.rc");
-               std::ofstream pangorc (path.c_str());
-               if (!pangorc) {
-                       error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg;
-               } else {
-                       pangorc << "[Pango]\nModuleFiles="
-                               << Glib::build_filename (userconfigdir, "pango.modules")
-                               << endl;
-                       pangorc.close ();
-               }
-               
-               g_setenv ("PANGO_RC_FILE", path.c_str(), 1);
-               
-               /* similar for GDK pixbuf loaders, but there's no RC file required
-                  to specify where it lives.
-               */
-               
-               g_setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (userconfigdir, "gdk-pixbuf.loaders").c_str(), 1);
-       }
-
         /* this doesn't do much but setting it should prevent various parts of the GTK/GNU stack
            from looking outside the bundle to find the charset.alias file.
         */

diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in
index a65a85d8e9b65d8bd09af06e0df7b517eb256654..1c087bbaf43d197bf8752fa9cabe0cfe6486aeaf 100644 (file)
--- 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 1d92befd8f696492ef112e5f54458f2f10a272bc..5b970acdedbd39b8d3b6df16d0efd778e5065a3e 100755 (executable)
--- 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