rpms/galeon/devel galeon-2.0.7-plugins.patch, 1.1, 1.2 galeon.spec, 1.64, 1.65
Denis Leroy
denis at fedoraproject.org
Tue Oct 13 07:21:43 UTC 2009
Author: denis
Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22424
Modified Files:
galeon-2.0.7-plugins.patch galeon.spec
Log Message:
- Fixed plugin patch for #525825
- Restored VISUALS env variable to work around flash crashes
galeon-2.0.7-plugins.patch:
Makefile.in | 2 +-
mozilla-embed-shell.cpp | 20 +++++++++++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
Index: galeon-2.0.7-plugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon-2.0.7-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- galeon-2.0.7-plugins.patch 27 Sep 2008 17:21:56 -0000 1.1
+++ galeon-2.0.7-plugins.patch 13 Oct 2009 07:21:42 -0000 1.2
@@ -9,39 +9,45 @@
-DSHARE_DIR=\"$(pkgdatadir)\" -D_GNU_SOURCE=1 -include \
mozilla-config.h $(am__append_1)
noinst_LTLIBRARIES = libmozillaembed.la
---- galeon-2.0.7/mozilla/mozilla-embed-shell.cpp.orig 2008-09-03 06:58:17.000000000 +0200
-+++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp 2008-09-27 15:11:01.000000000 +0200
-@@ -230,6 +230,19 @@
+--- galeon-2.0.7/mozilla/mozilla-embed-shell.cpp~ 2008-09-03 06:58:17.000000000 +0200
++++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp 2009-10-13 08:41:18.127313055 +0200
+@@ -230,6 +230,17 @@
#endif
}
+static int
+mozilla_setup_wrapped_plugin (void)
+{
-+ char *p_viewer = "/usr/bin/mozilla-plugin-config";
-+ gboolean ret;
++ char *p_viewer = "/usr/bin/mozilla-plugin-config";
+
-+ if(g_file_test(p_viewer, G_FILE_TEST_EXISTS) == FALSE)
-+ return(FALSE);
++ if (g_file_test(p_viewer, G_FILE_TEST_EXISTS) == FALSE)
++ return FALSE;
+
-+ ret = g_spawn_command_line_sync(p_viewer,NULL,NULL,NULL,NULL);
-+ return(ret);
++ return TRUE;
+}
+
static void
mozilla_init_plugin_path ()
{
-@@ -248,7 +261,12 @@
+@@ -248,13 +259,20 @@
g_string_append (new_path, "/.mozilla/plugins");
/* Add /usr/lib/mozilla/plugins (bug 149812) */
- g_string_append (new_path, ":/usr/lib/mozilla/plugins");
-+ if(mozilla_setup_wrapped_plugin()) {
++ if (mozilla_setup_wrapped_plugin()) {
+ g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins-wrapped");
-+ }
-+ else {
++ } else {
+ g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins");
+ }
#ifdef GALEON_MOZILLA_HOME
/* Add the current mozilla build's plugins dir */
+ g_string_append (new_path, ":" GALEON_MOZILLA_HOME "/plugins");
+ #endif
+
++ /* Work-around Flash Player crash */
++ g_setenv ("XLIB_SKIP_ARGB_VISUALS", "1", FALSE);
++
+ g_setenv ("MOZ_PLUGIN_PATH", new_path->str, TRUE);
+
+ g_string_free (new_path, TRUE);
Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- galeon.spec 25 Sep 2009 07:20:06 -0000 1.64
+++ galeon.spec 13 Oct 2009 07:21:42 -0000 1.65
@@ -3,7 +3,7 @@
Summary: GNOME2 Web browser based on Mozilla
Name: galeon
Version: 2.0.7
-Release: 16%{?dist}
+Release: 17%{?dist}
License: GPLv2+
Group: Applications/Internet
URL: http://galeon.sourceforge.net/
@@ -133,6 +133,10 @@ update-desktop-database > /dev/null 2>&1
%changelog
+* Tue Oct 13 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-17
+- Fixed plugin patch for #525825
+- Restored VISUALS env variable to work around flash crashes
+
* Fri Sep 25 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-16
- Added patch from Yanko Kaneti (#525417) to fix crash on startup
More information about the fedora-extras-commits
mailing list