galeon/galeon-2.0.7-plugins.patch

   1 --- galeon-2.0.7/mozilla/Makefile.am.orig
   2 +++ galeon-2.0.7/mozilla/Makefile.am
   3 @@ -60,6 +60,7 @@
   4         $(GALEON_DEPENDENCY_CFLAGS) \
   5         -DLIB_DIR=\"$(pkglibdir)\" \
   6         -DSHARE_DIR=\"$(pkgdatadir)\"   \
   7 +       -DTOP_LIB_DIR=\"$(libdir)\" \
   8         -D_GNU_SOURCE=1                 \
   9         -include mozilla-config.h
  10
  11 --- galeon-2.0.7/mozilla/mozilla-embed-shell.cpp~       2008-09-03 06:58:17.000000000 +0200
  12 +++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp        2009-10-13 08:41:18.127313055 +0200
  13 @@ -230,6 +230,17 @@
  14  #endif
  15  }
  16
  17 +static int
  18 +mozilla_setup_wrapped_plugin (void)
  19 +{
  20 +       char *p_viewer = "/usr/bin/mozilla-plugin-config";
  21 +
  22 +       if (g_file_test(p_viewer, G_FILE_TEST_EXISTS) == FALSE)
  23 +               return FALSE;
  24 +
  25 +       return TRUE;
  26 +}
  27 +
  28  static void
  29  mozilla_init_plugin_path ()
  30  {
  31 @@ -248,13 +259,20 @@
  32         g_string_append (new_path, "/.mozilla/plugins");
  33
  34         /* Add /usr/lib/mozilla/plugins (bug 149812) */
  35 -       g_string_append (new_path, ":/usr/lib/mozilla/plugins");
  36 +       if (mozilla_setup_wrapped_plugin()) {
  37 +               g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins-wrapped");
  38 +       } else {
  39 +               g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins");
  40 +       }
  41
  42  #ifdef GALEON_MOZILLA_HOME
  43         /* Add the current mozilla build's plugins dir */
  44         g_string_append (new_path, ":" GALEON_MOZILLA_HOME "/plugins");
  45  #endif
  46
  47 +       /* Work-around Flash Player crash */
  48 +       g_setenv ("XLIB_SKIP_ARGB_VISUALS", "1", FALSE);
  49 +
  50         g_setenv ("MOZ_PLUGIN_PATH", new_path->str, TRUE);
  51
  52         g_string_free (new_path, TRUE);