[epiphany/f20] Update search-provider-causing-problems patch series to make the search

catanzaro catanzaro at fedoraproject.org
Sun Sep 7 17:21:41 UTC 2014 

commit 80a8694d6e5a819ed100d169cd05e92a9d6789c5
Author: Michael Catanzaro <mcatanzaro at gnome.org>
Date:   Sun Sep 7 12:21:33 2014 -0500

    Update search-provider-causing-problems patch series to make the search
    
      provider work again.

 0004-search-provider-causing-problems.patch |   33 +++++++++------------------
 0007-search-provider-causing-problems.patch |   25 ++++++++++++++++++++
 epiphany.spec                               |   10 +++++--
 3 files changed, 43 insertions(+), 25 deletions(-)
---
diff --git a/0004-search-provider-causing-problems.patch b/0004-search-provider-causing-problems.patch
index c3d8259..ee2402e 100644
--- a/0004-search-provider-causing-problems.patch
+++ b/0004-search-provider-causing-problems.patch
@@ -1,4 +1,4 @@
-From 78e8d7f045396cd753a73f9106e19b3bb3fe5d57 Mon Sep 17 00:00:00 2001
+From a7042c92528a3a3477ba0131f6d3004d27b55bf0 Mon Sep 17 00:00:00 2001
 From: Carlos Garcia Campos <cgarcia at igalia.com>
 Date: Mon, 9 Dec 2013 20:16:02 +0100
 Subject: Move the search provider to its own binary
@@ -41,7 +41,7 @@ index 5af8cf1..1c4633f 100644
 +Name=org.gnome.EpiphanySearchProvider
 +Exec=@libexecdir@/epiphany-search-provider
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 544bac3..2de16bc 100644
+index 0046e67..6d1b905 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -44,7 +44,6 @@ INST_H_FILES = \
@@ -52,7 +52,7 @@ index 544bac3..2de16bc 100644
  	ephy-action-helper.c			\
  	ephy-completion-model.c			\
  	ephy-completion-model.h			\
-@@ -60,7 +59,6 @@ libephymain_la_SOURCES = \
+@@ -61,7 +60,6 @@ libephymain_la_SOURCES = \
  	ephy-navigation-history-action.c	\
  	ephy-notebook.c				\
  	ephy-page-menu-action.c			\
@@ -60,7 +60,7 @@ index 544bac3..2de16bc 100644
  	ephy-session.c				\
  	ephy-shell.c				\
  	ephy-toolbar.c				\
-@@ -165,6 +163,34 @@ epiphany_LDADD = \
+@@ -167,6 +165,34 @@ epiphany_LDADD = \
  	$(CODE_COVERAGE_LDFLAGS) \
  	$(LIBINTL)
  
@@ -426,7 +426,7 @@ index 5ad7d92..74faac3 100644
  
  #endif /* _EPHY_SEARCH_PROVIDER_H */
 diff --git a/src/ephy-shell.c b/src/ephy-shell.c
-index 4f182e7..3be7cf0 100644
+index 5fd9d3d..af5b8cc 100644
 --- a/src/ephy-shell.c
 +++ b/src/ephy-shell.c
 @@ -35,7 +35,6 @@
@@ -445,7 +445,7 @@ index 4f182e7..3be7cf0 100644
    EphySession *session;
    GList *windows;
    GObject *lockdown;
-@@ -518,42 +516,6 @@ ephy_shell_constructed (GObject *object)
+@@ -523,42 +521,6 @@ ephy_shell_constructed (GObject *object)
      G_OBJECT_CLASS (ephy_shell_parent_class)->constructed (object);
  }
  
@@ -488,7 +488,7 @@ index 4f182e7..3be7cf0 100644
  static void
  ephy_shell_class_init (EphyShellClass *klass)
  {
-@@ -568,8 +530,6 @@ ephy_shell_class_init (EphyShellClass *klass)
+@@ -573,8 +535,6 @@ ephy_shell_class_init (EphyShellClass *klass)
    application_class->activate = ephy_shell_activate;
    application_class->before_emit = ephy_shell_before_emit;
    application_class->add_platform_data = ephy_shell_add_platform_data;
@@ -497,18 +497,7 @@ index 4f182e7..3be7cf0 100644
  
    g_type_class_add_private (object_class, sizeof(EphyShellPrivate));
  }
-@@ -644,10 +604,6 @@ ephy_shell_init (EphyShell *shell)
- 
-   webkit_web_context_set_favicon_database_directory (web_context, favicon_db_path);
-   g_free (favicon_db_path);
--
--  shell->priv->search_provider = ephy_search_provider_new ();
--
--  g_application_set_inactivity_timeout (G_APPLICATION (shell), 60 * 1000);
- }
- 
- static void
-@@ -657,7 +613,6 @@ ephy_shell_dispose (GObject *object)
+@@ -669,7 +629,6 @@ ephy_shell_dispose (GObject *object)
  
    LOG ("EphyShell disposing");
  
@@ -516,9 +505,9 @@ index 4f182e7..3be7cf0 100644
    g_clear_object (&priv->session);
    g_clear_object (&priv->lockdown);
    g_clear_pointer (&priv->bme, gtk_widget_destroy);
-@@ -1169,9 +1124,6 @@ ephy_shell_open_uris_idle (OpenURIsData *data)
-   const char *url;
-   WebKitURIRequest *request = NULL;
+@@ -1227,9 +1186,6 @@ ephy_shell_open_uris_idle (OpenURIsData *data)
+   WebKitNetworkRequest *request = NULL;
+ #endif
  
 -  if (!data->window && !data->flags)
 -    return FALSE;
diff --git a/0007-search-provider-causing-problems.patch b/0007-search-provider-causing-problems.patch
new file mode 100644
index 0000000..4ab0816
--- /dev/null
+++ b/0007-search-provider-causing-problems.patch
@@ -0,0 +1,25 @@
+From e372e2935ebd9703684a260c584f53f8f3faa4c5 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro at igalia.com>
+Date: Sun, 7 Sep 2014 10:23:58 -0500
+Subject: Fix build
+
+Looks like I mishandled a merge conflict?
+
+diff --git a/src/ephy-shell.c b/src/ephy-shell.c
+index 4e56020..7c43c30 100644
+--- a/src/ephy-shell.c
++++ b/src/ephy-shell.c
+@@ -596,10 +596,6 @@ ephy_shell_init (EphyShell *shell)
+   webkit_web_context_set_favicon_database_directory (web_context, favicon_db_path);
+   g_free (favicon_db_path);
+ #endif
+-
+-  shell->priv->search_provider = ephy_search_provider_new ();
+-
+-  g_application_set_inactivity_timeout (G_APPLICATION (shell), 60 * 1000);
+ }
+ 
+ static void
+-- 
+cgit v0.10.1
+
diff --git a/epiphany.spec b/epiphany.spec
index 68192cf..adf2360 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -2,7 +2,7 @@ Summary: Web browser for GNOME
 Name: epiphany
 Epoch: 1
 Version: 3.10.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
 URL: https://wiki.gnome.org/Apps/Web
@@ -57,6 +57,7 @@ Patch11: 0003-search-provider-causing-problems.patch
 Patch12: 0004-search-provider-causing-problems.patch
 Patch13: 0005-search-provider-causing-problems.patch
 Patch14: 0006-search-provider-causing-problems.patch
+Patch15: 0007-search-provider-causing-problems.patch
 
 %description
 Epiphany is the web browser for the GNOME desktop. Its goal is to be
@@ -67,8 +68,6 @@ application.
 
 %prep
 %setup -q
-# Temporary, to avoid rebasing patch12
-%global _default_patch_fuzz 3
 # Fedora bookmarks
 %patch2 -p1 -b .default-bookmarks
 # https://bugzilla.gnome.org/show_bug.cgi?id=719821
@@ -91,6 +90,7 @@ application.
 %patch12 -p1 -b .4-search-provider-causing-problems.patch
 %patch13 -p1 -b .5-search-provider-causing-problems.patch
 %patch14 -p1 -b .6-search-provider-causing-problems.patch
+%patch15 -p1 -b .7-search-provider-causing-problems.patch
 
 # Fedora Epiphany version
 cat >> data/default-prefs-common.js << EOF
@@ -147,6 +147,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Sun Sep 07 2014 Michael Catanzaro <mcatanzaro at gnome.org> - 1:3.10.3-4
+- Update search-provider-causing-problems patch series to make the search
+  provider work again.
+
 * Fri Aug 22 2014 Michael Catanzaro <mcatanzaro at gnome.org> - 1:3.10.3-3
 - Add epiphany-fix-adblock.patch
 - Add epiphany-overaggressive-adblock.patch

More information about the scm-commits mailing list