[epiphany] Backport a fix for a crash with some password forms

[Kalev Lember]

commit 5f5f14a9f62eb43b3acf71337fc914bf2dd330fc
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed May 7 11:03:51 2014 +0200

    Backport a fix for a crash with some password forms

 ...-embed-Fix-crash-with-some-password-forms.patch |   31 ++++++++++++++++++++
 epiphany.spec                                      |    9 +++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/0001-embed-Fix-crash-with-some-password-forms.patch b/0001-embed-Fix-crash-with-some-password-forms.patch
new file mode 100644
index 0000000..22df4e4
--- /dev/null
+++ b/0001-embed-Fix-crash-with-some-password-forms.patch
@@ -0,0 +1,31 @@
+From 0c050be0a1cd2196c85967be390bfa751d64457a Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 14 Apr 2014 13:51:10 +0200
+Subject: [PATCH] embed: Fix crash with some password forms
+
+31bc1fe6 transformed a simple escape hatch of a comparison into an
+assertion. But that assertion keeps getting triggered, so it's clearly
+the wrong option for now.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=723909
+---
+ embed/ephy-web-view.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
+index f58b6b0..36bb023 100644
+--- a/embed/ephy-web-view.c
++++ b/embed/ephy-web-view.c
+@@ -681,7 +681,8 @@ form_auth_data_save_requested (EphyWebExtensionProxy *web_extension,
+   GtkWidget *info_bar;
+   FormAuthRequestData *data;
+ 
+-  g_assert (webkit_web_view_get_page_id (WEBKIT_WEB_VIEW (web_view)) == page_id);
++  if (webkit_web_view_get_page_id (WEBKIT_WEB_VIEW (web_view)) != page_id)
++    return;
+ 
+   info_bar = ephy_web_view_create_form_auth_save_confirmation_info_bar (web_view, hostname, username);
+   data = g_slice_new (FormAuthRequestData);
+-- 
+1.9.0
+
diff --git a/epiphany.spec b/epiphany.spec
index e90bf37..9115b73 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -2,7 +2,7 @@ Summary: Web browser for GNOME
 Name: epiphany
 Epoch: 1
 Version: 3.12.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
 URL: https://wiki.gnome.org/Apps/Web
@@ -44,6 +44,9 @@ Requires: gnome-icon-theme-symbolic
 Obsoletes: epiphany-extensions < 3.7.0
 Obsoletes: epiphany-devel < 1:3.7.90
 
+# Backported crash fix from upstream
+Patch0: 0001-embed-Fix-crash-with-some-password-forms.patch
+
 # Patches
 Patch2: epiphany-default-bookmarks.patch
 
@@ -63,6 +66,7 @@ installing the epiphany application itself.
 %prep
 %setup -q
 
+%patch0 -p1 -b .password-forms
 %patch2 -p1 -b .default-bookmarks
 
 # Fedora Epiphany version
@@ -123,6 +127,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Wed May 07 2014 Kalev Lember <kalevlember at gmail.com> - 1:3.12.0-2
+- Backport a fix for a crash with some password forms
+
 * Tue Mar 25 2014 Richard Hughes <rhughes at redhat.com> - 1:3.12.0-1
 - Update to 3.12.0