r24655 - in /desktop/unstable/epiphany-browser/debian: changelog patches/08_disable_page_cache.patch patches/13_accept-languages.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Jul 2 19:36:26 UTC 2010
Author: joss
Date: Fri Jul 2 19:36:25 2010
New Revision: 24655
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24655
Log:
* 13_accept-languages.patch: patch from Mario Sanchez Prada, approved
by upstream. Set the accept-languages string correctly.
Closes: #570142.
* 08_disable_page_cache.patch: disable the page cache for the moment,
given the amount of bugs related to history navigation. :(
Added:
desktop/unstable/epiphany-browser/debian/patches/08_disable_page_cache.patch
desktop/unstable/epiphany-browser/debian/patches/13_accept-languages.patch
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/patches/series
Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=24655&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Fri Jul 2 19:36:25 2010
@@ -1,10 +1,15 @@
-epiphany-browser (2.30.2-3) UNRELEASED; urgency=low
+epiphany-browser (2.30.2-3) unstable; urgency=low
* Stop renaming help files paths. Closes: #586721.
* Drop type-handling usage. Closes: #587864.
* Bump standards version accordingly.
-
- -- Josselin Mouette <joss at debian.org> Sat, 26 Jun 2010 09:03:21 +0200
+ * 13_accept-languages.patch: patch from Mario Sanchez Prada, approved
+ by upstream. Set the accept-languages string correctly.
+ Closes: #570142.
+ * 08_disable_page_cache.patch: disable the page cache for the moment,
+ given the amount of bugs related to history navigation. :(
+
+ -- Josselin Mouette <joss at debian.org> Fri, 02 Jul 2010 21:35:39 +0200
epiphany-browser (2.30.2-2) unstable; urgency=low
Added: desktop/unstable/epiphany-browser/debian/patches/08_disable_page_cache.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/08_disable_page_cache.patch?rev=24655&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/08_disable_page_cache.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/08_disable_page_cache.patch [utf-8] Fri Jul 2 19:36:25 2010
@@ -1,0 +1,13 @@
+Index: epiphany-2.30.2/embed/ephy-embed-prefs.c
+===================================================================
+--- epiphany-2.30.2.orig/embed/ephy-embed-prefs.c 2010-07-02 21:26:00.963610591 +0200
++++ epiphany-2.30.2/embed/ephy-embed-prefs.c 2010-07-02 21:26:05.435612257 +0200
+@@ -458,7 +458,7 @@ ephy_embed_prefs_init (void)
+ "auto-shrink-images", FALSE,
+ "enable-default-context-menu", FALSE,
+ "enable-site-specific-quirks", TRUE,
+- "enable-page-cache", TRUE,
++ "enable-page-cache", FALSE,
+ "auto-resize-window", TRUE,
+ NULL);
+
Added: desktop/unstable/epiphany-browser/debian/patches/13_accept-languages.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/13_accept-languages.patch?rev=24655&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/13_accept-languages.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/13_accept-languages.patch [utf-8] Fri Jul 2 19:36:25 2010
@@ -1,0 +1,98 @@
+From 8c6de6244609ade75abc3830bd9a1d9904618743 Mon Sep 17 00:00:00 2001
+From: Mario Sanchez Prada <msanchez at igalia.com>
+Date: Thu, 18 Mar 2010 17:35:44 +0100
+Subject: [PATCH] Set the quality values (qv) for the accept-languages string
+
+Make sure every item in the list of preferred languages gets an
+appropriate qv value according to the RFC2616, to better define the
+actual selection made by the user.
+
+Bug #602547
+---
+ embed/ephy-embed-prefs.c | 51 ++++++++++++++++++++++++++++++++++++++++++---
+ 1 files changed, 47 insertions(+), 4 deletions(-)
+
+diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c
+index 125cdde..cf79309 100644
+--- a/embed/ephy-embed-prefs.c
++++ b/embed/ephy-embed-prefs.c
+@@ -278,6 +278,48 @@ webkit_pref_callback_font_family (GConfClient *client,
+ }
+ }
+
++/* Part of this code taken from libsoup (soup-session.c) */
++static gchar *
++build_accept_languages_header (GArray *languages)
++{
++ gchar **langs = NULL;
++ gchar *langs_str = NULL;
++ gint delta;
++ gint i;
++
++ g_return_val_if_fail (languages != NULL, NULL);
++
++ /* Calculate deltas for the quality values */
++ if (languages->len < 10)
++ delta = 10;
++ else if (languages->len < 20)
++ delta = 5;
++ else
++ delta = 1;
++
++ /* Set quality values for each language */
++ langs = (gchar **) languages->data;
++ for (i = 0; langs[i] != NULL; i++) {
++ gchar *lang = (gchar *) langs[i];
++ gint quality = 100 - i * delta;
++
++ if (quality > 0 && quality < 100) {
++ double qvalue = quality / 100.0;
++ langs[i] = g_strdup_printf ("%s;q=%.2g", lang, qvalue);
++ } else {
++ /* Just dup the string in this case */
++ langs[i] = g_strdup (lang);
++ }
++ g_free (lang);
++ }
++
++ /* Get the result string */
++ if (languages->len > 0)
++ langs_str = g_strjoinv (", ", langs);
++
++ return langs_str;
++}
++
+ /* Based on Christian Persch's code from gecko backend of epiphany
+ (old transform_accept_languages_list() function) */
+ static void
+@@ -290,7 +332,7 @@ webkit_pref_callback_accept_languages (GConfClient *client,
+ GConfValue *gcvalue;
+ GArray *array;
+ GSList *languages, *l;
+- char **langs;
++ char **array_data;
+ char *langs_str;
+ char *webkit_pref;
+
+@@ -318,14 +360,15 @@ webkit_pref_callback_accept_languages (GConfClient *client,
+
+ ephy_langs_sanitise (array);
+
+- langs = (char **) g_array_free (array, FALSE);
+- langs_str = g_strjoinv (", ", langs);
++ langs_str = build_accept_languages_header (array);
+
+ /* Update Soup session */
+ session = webkit_get_default_session ();
+ g_object_set (G_OBJECT (session), webkit_pref, langs_str, NULL);
+
+- g_strfreev (langs);
++ /* Free memory */
++ array_data = (char **) g_array_free (array, FALSE);
++ g_strfreev (array_data);
+ g_free (langs_str);
+ }
+
+--
+1.7.0
+
Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=24655&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series [utf-8] Fri Jul 2 19:36:25 2010
@@ -4,7 +4,9 @@
03_dbus.patch
05_libexecdir.patch
07_bookmarks.patch
+08_disable_page_cache.patch
10_smart_bookmarks.patch
12_safetypes.patch
+13_accept-languages.patch
99_autoreconf.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list