rpms/galeon/F-11 galeon-1.3.2-home.patch, NONE, 1.1 galeon-2.0.7-fix-str-fmt.patch, NONE, 1.1 galeon-2.0.7-jsconsole.patch, NONE, 1.1 galeon.spec, 1.66, 1.67
Denis Leroy
denis at fedoraproject.org
Wed Sep 23 07:34:20 UTC 2009
Author: denis
Update of /cvs/pkgs/rpms/galeon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14233
Modified Files:
galeon.spec
Added Files:
galeon-1.3.2-home.patch galeon-2.0.7-fix-str-fmt.patch
galeon-2.0.7-jsconsole.patch
Log Message:
- Added jsconsole patch
- Changed default home location, Mandriva patch
- Disable plugins wrap patch, causing spurious crashes
- Made gecko libs Rs and BRs exact (#515640)
galeon-1.3.2-home.patch:
galeon.schemas.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE galeon-1.3.2-home.patch ---
--- galeon-1.3.2/galeon.schemas.in.home 2003-02-14 20:10:57.000000000 +0100
+++ galeon-1.3.2/galeon.schemas.in 2003-02-17 09:46:20.000000000 +0100
@@ -5,7 +5,7 @@
<applyto>/apps/galeon/Browsing/General/startpage</applyto>
<owner>galeon</owner>
<type>string</type>
- <default>myportal:</default>
+ <default>file:///usr/share/doc/HTML/index.html</default>
<locale name="C">
<short>Home page</short>
<long>URL for the user's home page. Displayed when Galeon starts up
galeon-2.0.7-fix-str-fmt.patch:
libegg/egg-recent-model.c | 2 +-
mozilla/GtkNSSSecurityWarningDialogs.cpp | 4 ++--
utils/gul-download.c | 4 ++--
utils/gul-gui.c | 1 +
4 files changed, 6 insertions(+), 5 deletions(-)
--- NEW FILE galeon-2.0.7-fix-str-fmt.patch ---
--- ./libegg/egg-recent-model.c.str 2008-12-24 10:23:19.000000000 +0100
+++ ./libegg/egg-recent-model.c 2008-12-24 10:23:43.000000000 +0100
@@ -735,7 +735,7 @@
error = NULL;
if (!g_markup_parse_context_parse (ctx, content, strlen (content),
&error)) {
- g_warning (error->message);
+ g_warning ("%s", error->message);
g_error_free (error);
error = NULL;
goto out;
--- ./mozilla/GtkNSSSecurityWarningDialogs.cpp.str 2008-12-24 10:27:16.000000000 +0100
+++ ./mozilla/GtkNSSSecurityWarningDialogs.cpp 2008-12-24 10:27:53.000000000 +0100
@@ -255,12 +255,12 @@
GtkDialogFlags flags = parent ? (GtkDialogFlags)0 : GTK_DIALOG_MODAL;
#if GTK_CHECK_VERSION(2,6,0)
GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (parent), flags,
- aType, aButtons, aPrimary);
+ aType, aButtons, "%s", aPrimary);
if (aSecondary)
{
gtk_message_dialog_format_secondary_markup
- (GTK_MESSAGE_DIALOG (dialog), aSecondary);
+ (GTK_MESSAGE_DIALOG (dialog), "%s", aSecondary);
}
#else
--- ./utils/gul-download.c.str 2008-12-24 10:24:19.000000000 +0100
+++ ./utils/gul-download.c 2008-12-24 10:25:00.000000000 +0100
@@ -287,7 +287,7 @@
text = g_strdup_printf (_("Failed to execute download "
"command."));
- g_warning (text);
+ g_warning ("%s", text);
g_free (text);
}
}
@@ -349,7 +349,7 @@
"\thttp://gtm.sourceforge.net"));
/* dialog = gnome_error_dialog (text); */
/* gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); */
- g_warning(text);
+ g_warning("%s",text);
g_free (text);
}
--- ./utils/gul-gui.c.str 2008-12-24 10:25:13.000000000 +0100
+++ ./utils/gul-gui.c 2008-12-24 10:25:41.000000000 +0100
@@ -793,6 +793,7 @@
GTK_RESPONSE_OK,
NULL);
hig_alert_set_secondary_printf (HIG_ALERT (dialog),
+ "%s",
error->message);
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (gtk_widget_destroy),
galeon-2.0.7-jsconsole.patch:
mozilla/mozilla-embed-shell.cpp | 2 --
src/galeon-window.c | 6 ------
ui/galeon-egg-ui.xml | 1 -
3 files changed, 9 deletions(-)
--- NEW FILE galeon-2.0.7-jsconsole.patch ---
--- 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-04-30 12:38:33.164540313 +0200
@@ -409,8 +409,6 @@
ret = mozilla_register_components ();
if (ret == FALSE) return FALSE;
- mozilla_init_js_console ();
-
mozilla_init_cookie_observer();
return TRUE;
--- galeon-2.0.7/ui/galeon-egg-ui.xml~ 2008-07-04 18:30:59.000000000 +0200
+++ galeon-2.0.7/ui/galeon-egg-ui.xml 2009-05-09 00:34:28.645768357 +0200
@@ -77,7 +77,6 @@
<menuitem name="WebAllowJava" action="WebAllowJavaAction" />
<menuitem name="WebAllowJS" action="WebAllowJSAction" />
<separator name="WSep4" />
- <menuitem name="WebJavaConsole" action="WebJavaConsoleAction" />
<menuitem name="WebJSConsole" action="WebJSConsoleAction" />
</menu>
<menu name="Go" action="GoMenuAction">
--- galeon-2.0.7/src/galeon-window.c~ 2008-07-04 18:30:50.000000000 +0200
+++ galeon-2.0.7/src/galeon-window.c 2009-05-09 00:33:50.173017926 +0200
@@ -190,7 +190,6 @@
#define WEB_POPUPS_ALWAYS_ACTION "WebPopupsAlwaysAction"
#define WEB_ALLOW_JAVA_ACTION "WebAllowJavaAction"
#define WEB_ALLOW_JS_ACTION "WebAllowJSAction"
-#define WEB_JAVA_CONSOLE_ACTION "WebJavaConsoleAction"
#define VIEW_SOURCE_ACTION "FilePageSourceAction"
#define FILE_PRINT_ACTION "FilePrintAction"
@@ -379,8 +378,6 @@
{ "ViewImagesAllowSiteAction", NULL, N_("_Allow Images From This Site"), NULL,
N_("Block Images from this site from loading"), G_CALLBACK(window_cmd_set_permission) },
- { WEB_JAVA_CONSOLE_ACTION, NULL, N_("Java _Console"), NULL,
- N_("Show Java console window"), G_CALLBACK(window_cmd_show_java_console) },
{ "WebJSConsoleAction", NULL, N_("J_avaScript Console"), NULL,
N_("Show JavaScript console window"), G_CALLBACK(window_cmd_show_js_console) },
@@ -1156,9 +1153,6 @@
java_enabled = eel_gconf_get_boolean(CONF_FILTERING_JAVA_ENABLED);
gtk_toggle_action_set_active(TOGGLE_ITEM(WEB_ALLOW_JAVA_ACTION), java_enabled);
-
- g_object_set (ACTION_ITEM(WEB_JAVA_CONSOLE_ACTION),
- "sensitive", java_enabled, NULL);
}
static void
Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-11/galeon.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- galeon.spec 9 Sep 2009 14:08:52 -0000 1.66
+++ galeon.spec 23 Sep 2009 07:34:19 -0000 1.67
@@ -3,30 +3,33 @@
Summary: GNOME2 Web browser based on Mozilla
Name: galeon
Version: 2.0.7
-Release: 14%{?dist}
+Release: 15%{?dist}
License: GPLv2+
Group: Applications/Internet
URL: http://galeon.sourceforge.net/
Source0: http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
-Patch0: galeon-2.0.7-plugins.patch
+#Patch0: galeon-2.0.7-plugins.patch
Patch1: galeon-2.0.7-confignspr.patch
Patch2: galeon-2.0.7-gtkprint.patch
Patch3: galeon-2.0.7-dfltfont.patch
Patch4: galeon-2.0.7-warnings.patch
Patch5: galeon-2.0.7-moz191.patch
+Patch6: galeon-2.0.7-jsconsole.patch
+Patch7: galeon-2.0.7-fix-str-fmt.patch
+Patch8: galeon-1.3.2-home.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
BuildRequires: gettext desktop-file-utils
BuildRequires: gtk2-devel >= 2.12.0
BuildRequires: gnome-desktop-devel
-BuildRequires: gecko-devel >= %{gecko_ver}
-BuildRequires: gecko-devel-unstable >= %{gecko_ver}
+BuildRequires: gecko-devel = %{gecko_ver}
+BuildRequires: gecko-devel-unstable = %{gecko_ver}
BuildRequires: libgnomeui-devel >= 2.5.2
BuildRequires: perl(XML::Parser) scrollkeeper
BuildRequires: intltool
BuildRequires: nspr-devel
-Requires: gecko-libs >= %{gecko_ver}
+Requires: gecko-libs = %{gecko_ver}
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
@@ -45,12 +48,15 @@ makes sense. Galeon was written to do ju
%prep
%setup -q -n %{name}-%{version}%{?extraversion}
-%patch0 -p1 -b .plugins
+#%patch0 -p1 -b .plugins
%patch2 -p1 -b .gtkprint
%patch1 -p1 -b .confignspr
%patch3 -p1 -b .dfltfont
%patch4 -p1 -b .warnings
%patch5 -p1 -b .moz191
+%patch6 -p1 -b .jsconsole
+%patch7 -p0 -b .fixfmt
+%patch8 -p1 -b .home
%build
@@ -125,6 +131,12 @@ update-desktop-database > /dev/null 2>&1
%changelog
+* Wed Sep 23 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-15
+- Added jsconsole patch
+- Changed default home location, Mandriva patch
+- Disable plugins wrap patch, causing spurious crashes
+- Made gecko libs Rs and BRs exact (#515640)
+
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-14
- Rebuild against newer gecko
More information about the fedora-extras-commits
mailing list