ardour/livetrax
13
0
Fork 0
Code

OSX: pango & gtk-pixbuf modules be gone.

Browse Source
This commit is contained in:
Robin Gareus 2015-03-23 16:27:34 +01:00
parent c68da4236e
commit a09e942eec
2 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk2_ardour/bundle_env_cocoa.cc
View File

@ -110,37 +110,8 @@ fixup_bundle_environment (int, char* [], const char** localedir)
*/ */
g_unsetenv ("GTK_RC_FILES"); g_unsetenv ("GTK_RC_FILES");
/* write a pango.rc file and tell pango to use it. we'd love
to put this into the PROGRAM_NAME.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 (bundle_dir, "Resources/pango.modules")
<< endl;
pangorc.close ();
g_setenv ("PANGO_RC_FILE", path.c_str(), 1);
}
}
g_setenv ("CHARSETALIASDIR", bundle_dir.c_str(), 1); g_setenv ("CHARSETALIASDIR", bundle_dir.c_str(), 1);
g_setenv ("FONTCONFIG_FILE", Glib::build_filename (bundle_dir, "Resources/fonts.conf").c_str(), 1); g_setenv ("FONTCONFIG_FILE", Glib::build_filename (bundle_dir, "Resources/fonts.conf").c_str(), 1);
g_setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (bundle_dir, "Resources/gdk-pixbuf.loaders").c_str(), 1);
} }
void load_custom_fonts() void load_custom_fonts()

16
tools/osx_packaging/osx_build
View File

@ -304,24 +304,8 @@ fi
# #
cp -R $GTKSTACK_ROOT/etc/* $Etc cp -R $GTKSTACK_ROOT/etc/* $Etc
echo "Copying all Pango modules ..."
cp -R $GTKSTACK_ROOT/lib/pango/1.8.0/modules/*.so $Frameworks/modules
echo "Copying all GDK Pixbuf loaders ..."
cp -R $GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so $Frameworks/modules
# charset alias file
cp -R $GTKSTACK_ROOT/lib/charset.alias $Resources cp -R $GTKSTACK_ROOT/lib/charset.alias $Resources
# generate new Pango module file
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/modules/?@executable_path/../lib/modules/?" > $Resources/pango.modules
rm pangorc
# generate a new GDK pixbufs loaders file
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 # We rely on clearlooks, so include a version from our own build tree
# this one is special - we will set GTK_PATH to $Frameworks/gtkengines # this one is special - we will set GTK_PATH to $Frameworks/gtkengines