From 5acd4bd4ff425317aaff102fe8fbf141fb6819cd8441d06c365b5feccf7324e6 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 5 Dec 2009 09:07:04 +0000 Subject: [PATCH] Accepting request 25671 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/epiphany via accept of submit request 25671 revision 12. Request was accepted with message: accept OBS-URL: https://build.opensuse.org/request/show/25671 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=47 --- epiphany-2.28.0.tar.bz2 | 3 --- epiphany-2.29.3.tar.bz2 | 3 +++ epiphany-user-agent.patch | 34 +++++++++++++++---------------- epiphany.changes | 43 +++++++++++++++++++++++++++++++++++++++ epiphany.spec | 18 ++++++++-------- 5 files changed, 73 insertions(+), 28 deletions(-) delete mode 100644 epiphany-2.28.0.tar.bz2 create mode 100644 epiphany-2.29.3.tar.bz2 diff --git a/epiphany-2.28.0.tar.bz2 b/epiphany-2.28.0.tar.bz2 deleted file mode 100644 index 5030caa..0000000 --- a/epiphany-2.28.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23e0379c41c378221338fb327d747f3e42b2b98cdf1512c9df7cbeab45f311ea -size 5690293 diff --git a/epiphany-2.29.3.tar.bz2 b/epiphany-2.29.3.tar.bz2 new file mode 100644 index 0000000..dd0bf2a --- /dev/null +++ b/epiphany-2.29.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f69defb18eb1c8b873187e88f9e152d45b35687b671778df3b2b7e4e95b86ea7 +size 5698603 diff --git a/epiphany-user-agent.patch b/epiphany-user-agent.patch index 5a2dc2b..9dc4c31 100644 --- a/epiphany-user-agent.patch +++ b/epiphany-user-agent.patch @@ -1,7 +1,7 @@ -diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in -index a847aa2..98f8db2 100644 ---- a/data/epiphany.schemas.in -+++ b/data/epiphany.schemas.in +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 @@ Browse with caret @@ -20,11 +20,11 @@ index a847aa2..98f8db2 100644 /schemas/apps/epiphany/general/managed_network /apps/epiphany/general/managed_network -diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c -index c1a14df..8c8f19b 100644 ---- a/embed/ephy-embed-prefs.c -+++ b/embed/ephy-embed-prefs.c -@@ -134,6 +134,38 @@ webkit_pref_callback_user_stylesheet (GConfClient *client, +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 @@ -63,10 +63,10 @@ index c1a14df..8c8f19b 100644 webkit_pref_callback_font_size (GConfClient *client, guint cnxn_id, GConfEntry *entry, -@@ -228,7 +260,10 @@ static const PrefData webkit_pref_entries[] = - webkit_pref_callback_user_stylesheet }, - { CONF_CARET_BROWSING_ENABLED, - "enable-caret-browsing", +@@ -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, @@ -75,10 +75,10 @@ index c1a14df..8c8f19b 100644 }; static void -diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h -index ada4ac8..cbe7423 100644 ---- a/embed/ephy-embed-prefs.h -+++ b/embed/ephy-embed-prefs.h +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" diff --git a/epiphany.changes b/epiphany.changes index 651dc2a..0fe7e5e 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Sat Dec 5 01:51:59 CET 2009 - vuntz@opensuse.org + +- Update to version 2.29.3: + + Don't assume all seed extensions return an object as a value + (bgo#599714) + + Fix refcounting of seed extensions (bgo#599838) + + Provide the Inspect Element menu item in context menus again + (bgo#599473) + + Many fixes to our gobject-introspection support (bgo#599757) + + Disconnect dbus callbacks when disposing of the network monitor + (bgo#572326) + + Only use the main frame to fetch the document type for pages + (bgo#602400) + + Restore 'Close' and 'Help' buttons in dialogs (bgo#590387) + + Fix auto-google search when using Ctrl-Enter (bgo#603324) +- Changes from version 2.29.1: + + Reimplement middle-click-to-open-clipboard-contents. + + Reimplement traditional epiphany context menu(s). (bgo#562617) + + Reimplement Up arrow behavior (bgo#595653) + + Make most of epiphany compile with sealed GTK+ structs + (bgo#595791) + + Prevent PDM from getting keyring passwords in private mode + (bgo#591395) + + Take into account WEBKIT_LOAD_FAILED status for is_loading API. + + Depend on libtool 2.2 and dump dolt. + + Replace .glade files with .ui files natively instead of + generating .ui files at compile time from the .glade files. + (bgo#590387) + + Several fixes in the automatic search of url entry contents on + enter feature (bgo#596717, bgo#595690) + + Use new syntax for Seed imports (bgo#598562) + + Add back support for javascript: and mailto: URIs + + Fix for Seed extensions preventing epiphany from shutting down + (bgo#573551) + + Allow popups when the user asks for them (bgo#528799) + + Refactor EphyShell lifetime tracking (bgo#599348) + + Don't crash when detaching multiple Seed extensions + (bgo#599422) + + Reimplement type checking on downloads and "Open" dialog option + (bgo#598167) +- Rebase epiphany-user-agent.patch. + ------------------------------------------------------------------- Tue Sep 22 18:14:30 CEST 2009 - dimstar@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index 3d15d41..ac4fd8b 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -1,5 +1,5 @@ # -# spec file for package epiphany (Version 2.28.0) +# spec file for package epiphany (Version 2.29.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,9 +18,10 @@ Name: epiphany -Version: 2.28.0 +Version: 2.29.3 +# FIXME: en@shaw is always removed; fix it when new filesystem package is accepted in factory Release: 1 -%define major_version 2.28 +%define major_version 2.29 License: GPL v2 or later Summary: GNOME Web Browser Based on the Mozilla Rendering Engine Url: http://www.gnome.org/projects/epiphany/ @@ -129,6 +130,12 @@ ACLOCAL="aclocal -I m4" autoreconf -f -i %install %makeinstall +%if 0%{?suse_version} <= 1110 +%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* +%endif +# %if 0%{?suse_version} <= 1120 +%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +# %endif mkdir %{buildroot}%{_datadir}/pixmaps ln -s ../icons/gnome/scalable/apps/web-browser.svg %{buildroot}%{_datadir}/pixmaps/ # In case make install did not create the extensions folder @@ -174,11 +181,6 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/epiphany.1.gz %files lang -f %{name}.lang -%defattr(-,root,root) -%if 0%{suse_version} <= 1110 -%dir %{_datadir}/locale/ig -%dir %{_datadir}/locale/ig/LC_MESSAGES -%endif %files devel %defattr(-,root,root)