Accepting request 29709 from GNOME:Factory
Copy from GNOME:Factory/epiphany based on submit request 29709 from user vuntz OBS-URL: https://build.opensuse.org/request/show/29709 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany?expand=0&rev=52
This commit is contained in:
OBS User autobuild
Git OBS Bridge
commit
234874b47f
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f69defb18eb1c8b873187e88f9e152d45b35687b671778df3b2b7e4e95b86ea7
|
||||
size 5698603
|
||||
3
epiphany-2.29.5.tar.bz2
Normal file
3
epiphany-2.29.5.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ffea07630dca774771776af420801524fd68eec5126b9e40f0c32f5f70b42af2
|
||||
size 5723188
|
||||
@ -1,89 +0,0 @@
|
||||
Index: epiphany-2.29.3/data/epiphany.schemas.in
|
||||
===================================================================
|
||||
--- epiphany-2.29.3.orig/data/epiphany.schemas.in
|
||||
+++ epiphany-2.29.3/data/epiphany.schemas.in
|
||||
@@ -478,6 +478,17 @@
|
||||
<short>Browse with caret</short>
|
||||
</locale>
|
||||
</schema>
|
||||
+ <schema>
|
||||
+ <key>/schemas/apps/epiphany/web/user_agent_vendor</key>
|
||||
+ <applyto>/apps/epiphany/web/user_agent_vendor</applyto>
|
||||
+ <owner>epiphany</owner>
|
||||
+ <type>string</type>
|
||||
+ <default>GNOME.org</default>
|
||||
+ <locale name="C">
|
||||
+ <short>Vendor to include in the user agent</short>
|
||||
+ <long>String that will be appended to the user agent, containing vendor-specific information.</long>
|
||||
+ </locale>
|
||||
+ </schema>
|
||||
<schema>
|
||||
<key>/schemas/apps/epiphany/general/managed_network</key>
|
||||
<applyto>/apps/epiphany/general/managed_network</applyto>
|
||||
Index: epiphany-2.29.3/embed/ephy-embed-prefs.c
|
||||
===================================================================
|
||||
--- epiphany-2.29.3.orig/embed/ephy-embed-prefs.c
|
||||
+++ epiphany-2.29.3/embed/ephy-embed-prefs.c
|
||||
@@ -134,6 +134,38 @@ webkit_pref_callback_user_stylesheet (GC
|
||||
}
|
||||
|
||||
static void
|
||||
+webkit_pref_callback_user_agent_vendor (GConfClient *client,
|
||||
+ guint cnxn_id,
|
||||
+ GConfEntry *entry,
|
||||
+ gpointer data)
|
||||
+{
|
||||
+ GConfValue *gcvalue;
|
||||
+ const char *value = NULL;
|
||||
+ static char *webkit_user_agent = NULL;
|
||||
+ char *user_agent = NULL;
|
||||
+ char *webkit_pref = data;
|
||||
+
|
||||
+ gcvalue = gconf_entry_get_value (entry);
|
||||
+
|
||||
+ /* happens on initial notify if the key doesn't exist */
|
||||
+ if (gcvalue != NULL &&
|
||||
+ gcvalue->type == GCONF_VALUE_STRING) {
|
||||
+ value = gconf_value_get_string (gcvalue);
|
||||
+ }
|
||||
+
|
||||
+ if (webkit_user_agent == NULL) {
|
||||
+ g_object_get (G_OBJECT(settings), "user-agent", &webkit_user_agent, NULL);
|
||||
+ }
|
||||
+
|
||||
+ user_agent = g_strconcat (webkit_user_agent, " ",
|
||||
+ "Epiphany/"VERSION, value ? " " : NULL,
|
||||
+ value, NULL);
|
||||
+
|
||||
+ g_object_set (settings, webkit_pref, user_agent, NULL);
|
||||
+ g_free (user_agent);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
webkit_pref_callback_font_size (GConfClient *client,
|
||||
guint cnxn_id,
|
||||
GConfEntry *entry,
|
||||
@@ -231,7 +263,10 @@ static const PrefData webkit_pref_entrie
|
||||
webkit_pref_callback_boolean },
|
||||
{ CONF_SECURITY_ALLOW_POPUPS,
|
||||
"javascript-can-open-windows-automatically",
|
||||
- webkit_pref_callback_boolean }
|
||||
+ webkit_pref_callback_boolean },
|
||||
+ { CONF_USER_AGENT_VENDOR,
|
||||
+ "user-agent",
|
||||
+ webkit_pref_callback_user_agent_vendor }
|
||||
};
|
||||
|
||||
static void
|
||||
Index: epiphany-2.29.3/embed/ephy-embed-prefs.h
|
||||
===================================================================
|
||||
--- epiphany-2.29.3.orig/embed/ephy-embed-prefs.h
|
||||
+++ epiphany-2.29.3/embed/ephy-embed-prefs.h
|
||||
@@ -41,6 +41,7 @@
|
||||
#define CONF_DISPLAY_SMOOTHSCROLL "/apps/epiphany/web/smooth_scroll"
|
||||
#define CONF_WEB_INSPECTOR_ENABLED "/apps/epiphany/web/inspector_enabled"
|
||||
#define CONF_CARET_BROWSING_ENABLED "/apps/epiphany/web/browse_with_caret"
|
||||
+#define CONF_USER_AGENT_VENDOR "/apps/epiphany/web/user_agent_vendor"
|
||||
|
||||
/* These are defined gnome wide now */
|
||||
#define CONF_NETWORK_PROXY_MODE "/system/proxy/mode"
|
||||
@ -1,3 +1,31 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 13 02:36:56 CET 2010 - captain.magnus@opensuse.org
|
||||
|
||||
- Update to version 2.29.5:
|
||||
+ Reimplement EphyEmbedSingle::handle-content signal, useful for
|
||||
external download managers
|
||||
+ Add a gconf key (/apps/epiphany/general/url_search) to set the
|
||||
default search engine. (bgo#604087)
|
||||
+ Reimplement favicon support (bgo#601859)
|
||||
+ Do not override page specific context menus with our own
|
||||
(bgo#603326)
|
||||
+ Store all form auth data in GNOME Keyring, and ask the user to
|
||||
remember and prefill new logins/passwords with an infobar.
|
||||
(bgo#582267)
|
||||
+ Reimplement EphyWebView::ge-feed-link, emitted when a feed link
|
||||
is found in the view.
|
||||
+ Reimplement support for the 'Accept-Language' HTTP header
|
||||
(bgo#528893)
|
||||
+ Reimplement custom User Agent support, see commit e896b194fbff
|
||||
for details (bgo#580903)
|
||||
+ Reimplement support for window.close (bgo#599009)
|
||||
+ Reimplement support for mime type safety check during
|
||||
downloads (bgo#605026)
|
||||
+ Reimplement EphyWebView::new-window signal, emitted when the
|
||||
view opens a new window (like a JS window)
|
||||
+ Lots of bugfixes
|
||||
- Remove epiphany-user-agent.patch. Fixed upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 23 11:02:43 CET 2009 - vuntz@opensuse.org
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package epiphany (Version 2.29.3)
|
||||
# spec file for package epiphany (Version 2.29.5)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -18,16 +18,14 @@
|
||||
|
||||
|
||||
Name: epiphany
|
||||
Version: 2.29.3
|
||||
Release: 2
|
||||
Version: 2.29.5
|
||||
Release: 1
|
||||
%define major_version 2.29
|
||||
License: GPLv2+
|
||||
Summary: GNOME Web Browser Based on the Mozilla Rendering Engine
|
||||
Url: http://www.gnome.org/projects/epiphany/
|
||||
Group: Productivity/Networking/Web/Browsers
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
# PATCH-FEATURE-UPSTREAM epiphany-user-agent.patch bgo580903 vuntz@novell.com -- Set user agent with a vendor part, via a gconf key
|
||||
Patch0: epiphany-user-agent.patch
|
||||
# PATCH-FEATURE-OPENSUSE epiphany-safe-one-click-install.patch bnc330070 vuntz@novell.com -- Make one-click install work with one-click
|
||||
Patch6: epiphany-safe-one-click-install.patch
|
||||
BuildRequires: NetworkManager-devel
|
||||
@ -113,7 +111,6 @@ This package provides upstream Look and Feel for Epiphany.
|
||||
%prep
|
||||
%setup -q
|
||||
translation-update-upstream
|
||||
%patch0 -p1
|
||||
%patch6 -p1
|
||||
|
||||
%build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user