diff --git a/epiphany-3.9.90.tar.xz b/epiphany-3.9.90.tar.xz deleted file mode 100644 index 73a577d..0000000 --- a/epiphany-3.9.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56d339d86a758b1b17b96b53d01455f410c2cbd0aeec3e0e6e36af3a80a7c3fa -size 2789464 diff --git a/epiphany-3.9.91.tar.xz b/epiphany-3.9.91.tar.xz new file mode 100644 index 0000000..96eeae7 --- /dev/null +++ b/epiphany-3.9.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:080f9d89126b0243adec0197514d1f300d6b6584b8401d598083bad9e22d7fab +size 3075844 diff --git a/epiphany-fix-nonvoid.patch b/epiphany-fix-nonvoid.patch new file mode 100644 index 0000000..bcfe8f7 --- /dev/null +++ b/epiphany-fix-nonvoid.patch @@ -0,0 +1,24 @@ +From d95e5525ce70f768c9e0986588df26ec17b83adb Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Sat, 21 Sep 2013 13:41:40 +0200 +Subject: [PATCH] fix no-return-in-nonvoid function + +--- + src/ephy-navigation-history-action.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ephy-navigation-history-action.c b/src/ephy-navigation-history-action.c +index 4f7f1c9..c7d7c37 100644 +--- a/src/ephy-navigation-history-action.c ++++ b/src/ephy-navigation-history-action.c +@@ -656,6 +656,7 @@ tool_button_press_event_cb (GtkButton *button, + popup_history_menu (action, GTK_WIDGET (button), event); + return TRUE; + } ++ return FALSE; + } + + static gboolean +-- +1.8.4 + diff --git a/epiphany.changes b/epiphany.changes index 47c97bf..6d48091 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Sep 20 13:32:49 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.9.91: + + Do not open a new window when resuming a session (bgo#707451). + + RTL UI fixes. + + Minor code fixes and UI polishing. + + Bump WK dependency to 2.1.4. +- Add epiphany-fix-nonvoid.patch: Fix non-void function not + returning a value. + ------------------------------------------------------------------- Tue Sep 3 06:38:21 UTC 2013 - dimstar@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index 6dbfe2b..eb5157d 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -17,7 +17,7 @@ Name: epiphany -Version: 3.9.90 +Version: 3.9.91 Release: 0 %define _base_version 3.9 Summary: GNOME Web Browser @@ -26,7 +26,9 @@ Group: Productivity/Networking/Web/Browsers Url: http://www.gnome.org/projects/epiphany/ Source: http://download.gnome.org/sources/epiphany/3.9/%{name}-%{version}.tar.xz # 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 +Patch0: epiphany-safe-one-click-install.patch +# PATCH-FIX-UPSTREAM epiphany-fix-nonvoid.patch bgo#708461 dimstar@opensuse.org -- Fix non-void function not returning value +Patch1: epiphany-fix-nonvoid.patch BuildRequires: fdupes BuildRequires: gnome-icon-theme BuildRequires: intltool >= 0.50 @@ -53,7 +55,7 @@ BuildRequires: pkgconfig(libxml-2.0) >= 2.6.12 BuildRequires: pkgconfig(libxslt) >= 1.1.7 BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(webkit2gtk-3.0) >= 2.1.1 +BuildRequires: pkgconfig(webkit2gtk-3.0) >= 2.1.4 BuildRequires: pkgconfig(x11) Requires: %{name}-branding = %{version} Requires: NetworkManager @@ -102,7 +104,8 @@ string. %prep %setup -q translation-update-upstream -%patch6 -p1 +%patch0 -p1 +%patch1 -p1 %build %configure \