Update to 3.35.1; fix some broken patches and remove superseded ones--many pantheon-specific features have been implemented by the epiphany devs

12 files changed, 35 insertions, 426 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7def514ddb8d..fa0ed0a6d64d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = epiphany-pantheon
 	pkgdesc = A GNOME web browser based on the WebKit rendering engine (with elementary OS patches)
-	pkgver = 3.34.1
+	pkgver = 3.35.1
 	pkgrel = 2
 	url = https://wiki.gnome.org/Apps/Web
 	arch = x86_64
@@ -19,46 +19,28 @@ pkgbase = epiphany-pantheon
 	depends = gcr
 	depends = libdazzle
 	depends = libhandy
-	provides = epiphany=3.34.1
+	provides = epiphany=3.35.1
 	provides = epiphany-sync
-	source = epiphany-pantheon::git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=fae9ef019e39c8ca420344c8c01416a3184bb8fc
+	source = epiphany-pantheon::git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=aa3e99a5845daac749bab80bc600ec5797a3f9c7
 	source = epiphany-sync
 	source = epiphany-sync.service
-	source = 01-full-width-url-bar.patch
-	source = 02-24px-color-toolbar-icons.patch
 	source = 03-tab-close-buttons-on-the-left.patch
-	source = 04-new-tab-button-on-the-left.patch
 	source = 05-rename-to-epiphany.patch
 	source = 06-double-click-for-new-tab.patch
 	source = 07-overlay-bar-style.patch
 	source = 08-rename-incongito-class-to-dodge-GNOME-style.patch
 	source = 09-middle-click-closes-tab.patch
-	source = 10-add-preferences-menuitem.patch
-	source = 11-fix-menu-margins.patch
-	source = 12-remove-tab-menuitem.patch
-	source = 13-remove-text-encoding-menuitem.patch
-	source = 14-add-important-menuitems.patch
-	source = 15-remove-GNOME-menu.patch
 	source = 16-hide-the-fonts-and-styles-tab.patch
 	source = 17-give-notebook-a-margin.patch
 	sha1sums = SKIP
 	sha1sums = 2a8fda153bf3fb2d9a14b632082329ed6e2d8fab
 	sha1sums = 2c1c89aee5e1ea2ca47d518690b93238213e73fd
-	sha1sums = 3d1ae633eb4815cb0956125bb1810ce82a3c79ab
-	sha1sums = 3ebd0aadbf3ba145ccf5b5c07b810cc21c28f5a9
-	sha1sums = 824c797de664a7d5a904b49d76636ab929f5e400
-	sha1sums = ec44a91a1693c664e55ef42c21ae2d9e27c75148
+	sha1sums = 06b7c38fa4db3b3a69b2c0b92f88e1156f08a5a0
 	sha1sums = 7dbfdea116239bb3ee947e9175a43a6bdd768f1e
 	sha1sums = 71fc912aee1e01bc6d17907d7bfa33852ef15fb2
 	sha1sums = cb88f86c9e44936993ab2e3a02f71874de422ae7
 	sha1sums = 0f1085fb06e06298c7fb8feb12be0699d166dd2b
 	sha1sums = 5c0d41eda4b449ceba4699e1a1e8b6359d12deb4
-	sha1sums = 2b07c438cdabe254a33b6b5f180f9359e3e21422
-	sha1sums = 8deb1718a29e157e888a1358048200cc5887b1f3
-	sha1sums = 58227528aa8bc1d1480fbd0f5e18a6eb11450ba8
-	sha1sums = 33246f87659164729c55a201151c368bd0f02b9c
-	sha1sums = 67f6d0c60cbf4ea9252c56d3ac37090fd18a534c
-	sha1sums = e125a6e6ca85ad06d192e1c200190438ca2b1f8a
 	sha1sums = 0f3e50ecb72b9cf671dc75d5ac987f5e05b2ed66
 	sha1sums = cd1090f20a153d77060aa1d6304c4d5e621c125f
 
diff --git a/01-full-width-url-bar.patch b/01-full-width-url-bar.patch
deleted file mode 100644
index 0cfb5516497b..000000000000
--- a/01-full-width-url-bar.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c
-index 389c34b3b..00cb6f038 100644
---- a/src/ephy-header-bar.c
-+++ b/src/ephy-header-bar.c
-@@ -176,7 +177,7 @@
-   column = hdy_column_new ();
-   gtk_widget_set_hexpand (GTK_WIDGET (column), TRUE);
-   gtk_widget_show (GTK_WIDGET (column));
--  hdy_column_set_maximum_width (column, 860);
-+  hdy_column_set_maximum_width (column, gdk_screen_width ());
--  hdy_column_set_linear_growth_width (column, 560);
-+  hdy_column_set_linear_growth_width (column, gdk_screen_width ());
-   gtk_container_add (GTK_CONTAINER (column), GTK_WIDGET (header_bar->title_widget));
-   gtk_header_bar_set_custom_title (GTK_HEADER_BAR (header_bar), GTK_WIDGET (column));
diff --git a/02-24px-color-toolbar-icons.patch b/02-24px-color-toolbar-icons.patch
deleted file mode 100644
index d8fc7233a77c..000000000000
--- a/02-24px-color-toolbar-icons.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/src/resources/gtk/action-bar-end.ui
-+++ b/src/resources/gtk/action-bar-end.ui
-@@ -16,7 +16,7 @@
-           <object class="GtkImage" id="bookmarks_image">
-             <property name="visible">True</property>
-             <property name="icon-name">ephy-bookmarks-symbolic</property>
--            <property name="icon-size">1</property>
-+            <property name="icon-size">3</property>
-           </object>
-         </child>
-       </object>
---- a/src/resources/gtk/action-bar-start.ui
-+++ b/src/resources/gtk/action-bar-start.ui
-@@ -25,7 +25,7 @@
-               <object class="GtkImage" id="back_image">
-                 <property name="visible">True</property>
-                 <property name="icon-name">go-previous-symbolic</property>
--                <property name="icon-size">1</property>
-+                <property name="icon-size">3</property>
-               </object>
-             </child>
-           </object>
-@@ -44,7 +44,7 @@
-               <object class="GtkImage" id="forward_image">
-                 <property name="visible">True</property>
-                 <property name="icon-name">go-next-symbolic</property>
--                <property name="icon-size">1</property>
-+                <property name="icon-size">3</property>
-               </object>
-             </child>
-           </object>
-@@ -63,7 +63,7 @@
-           <object class="GtkImage" id="combined_stop_reload_image">
-             <property name="visible">True</property>
-             <property name="icon-name">view-refresh-symbolic</property>
--            <property name="icon-size">1</property>
-+            <property name="icon-size">3</property>
-           </object>
-         </child>
-       </object>
-@@ -82,7 +82,7 @@
-           <object class="GtkImage" id="homepage_image">
-             <property name="visible">True</property>
-             <property name="icon-name">go-home-symbolic</property>
--            <property name="icon-size">1</property>
-+            <property name="icon-size">3</property>
-           </object>
-         </child>
-       </object>
-@@ -101,7 +101,7 @@
-           <object class="GtkImage" id="new_tab_image">
-             <property name="visible">True</property>
-             <property name="icon-name">tab-new-symbolic</property>
--            <property name="icon-size">1</property>
-+            <property name="icon-size">3</property>
-           </object>
-         </child>
-       </object>
diff --git a/03-tab-close-buttons-on-the-left.patch b/03-tab-close-buttons-on-the-left.patch
index 5a913130be61..94f586fd130c 100644
--- a/03-tab-close-buttons-on-the-left.patch
+++ b/03-tab-close-buttons-on-the-left.patch
@@ -1,103 +1,29 @@
-diff --git a/src/resources/gtk/tab-label.ui b/src/resources/gtk/tab-label.ui
+diff --git a/src/ephy-tab-label.c b/src/ephy-tab-label.c
 index bddbaef23..6bb8e6086 100644
---- a/src/resources/gtk/tab-label.ui
-+++ b/src/resources/gtk/tab-label.ui
-@@ -12,71 +12,71 @@
-     <property name="spacing">6</property>
-     <signal name="style-updated" handler="style_updated_cb" swapped="no"/>
-     <child>
--      <object class="GtkImage" id="icon">
-+      <object class="GtkButton" id="close_button">
-         <property name="visible">True</property>
-         <property name="can_focus">False</property>
-+        <property name="focus_on_click">False</property>
-+        <property name="receives_default">False</property>
-+        <property name="tooltip_text" translatable="yes">Close Document</property>
-+        <property name="image">close_button_image</property>
-+        <property name="relief">none</property>
-+        <signal name="clicked" handler="close_button_clicked_cb" object="EphyTabLabel" swapped="no"/>
-+        <style>
-+          <class name="small-button"/>
-+          <class name="flat"/>
-+        </style>
-       </object>
-       <packing>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
--        <property name="position">0</property>
-+        <property name="pack_type">end</property>
-+        <property name="position">3</property>
-       </packing>
-     </child>
--    <child>
--      <object class="GtkSpinner" id="spinner">
-+    <child type="center">
-+      <object class="GtkLabel" id="label">
-+        <property name="visible">True</property>
-         <property name="can_focus">False</property>
-+        <property name="ellipsize">end</property>
-       </object>
-       <packing>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
--        <property name="position">1</property>
-+        <property name="position">0</property>
-       </packing>
-     </child>
--    <child type="center">
--      <object class="GtkLabel" id="label">
-+    <child>
-+      <object class="GtkImage" id="audio_button">
-         <property name="visible">True</property>
-         <property name="can_focus">False</property>
--        <property name="ellipsize">end</property>
-+        <property name="icon_name">audio-volume-high-symbolic</property>
-       </object>
-       <packing>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
--        <property name="position">0</property>
-+        <property name="pack_type">end</property>
-+        <property name="position">5</property>
-       </packing>
-     </child>
-     <child>
--      <object class="GtkButton" id="close_button">
--        <property name="visible">True</property>
-+      <object class="GtkSpinner" id="spinner">
-         <property name="can_focus">False</property>
--        <property name="focus_on_click">False</property>
--        <property name="receives_default">False</property>
--        <property name="tooltip_text" translatable="yes">Close Document</property>
--        <property name="image">close_button_image</property>
--        <property name="relief">none</property>
--        <signal name="clicked" handler="close_button_clicked_cb" object="EphyTabLabel" swapped="no"/>
--        <style>
--          <class name="small-button"/>
--          <class name="flat"/>
--        </style>
-       </object>
-       <packing>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
--        <property name="pack_type">end</property>
--        <property name="position">3</property>
-+        <property name="position">1</property>
-       </packing>
-     </child>
-     <child>
--      <object class="GtkImage" id="audio_button">
-+      <object class="GtkImage" id="icon">
-         <property name="visible">True</property>
-         <property name="can_focus">False</property>
--        <property name="icon_name">audio-volume-high-symbolic</property>
-       </object>
-       <packing>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
--        <property name="pack_type">end</property>
--        <property name="position">5</property>
-+        <property name="position">0</property>
-       </packing>
-     </child>
-   </template>
+--- a/src/ephy-tab-label.c
++++ b/src/ephy-tab-label.c
+@@ -278,11 +278,19 @@
+   /* Bind class to template */
+   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/epiphany/gtk/tab-label.ui");
+ 
+-  gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, spinner);
+-  gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, icon);
+-  gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, label);
+-  gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, audio_button);
+-  gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, close_button);
++  if (is_desktop_pantheon ()) {
++    gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, close_button);
++    gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, label);
++    gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, audio_button);
++    gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, spinner);
++    gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, icon);
++  } else {
++    gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, spinner);
++    gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, icon);
++    gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, label);
++    gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, audio_button);
++    gtk_widget_class_bind_template_child (widget_class, EphyTabLabel, close_button);
++  }
+ 
+   gtk_widget_class_bind_template_callback (widget_class, close_button_clicked_cb);
+   gtk_widget_class_bind_template_callback (widget_class, style_updated_cb);
diff --git a/04-new-tab-button-on-the-left.patch b/04-new-tab-button-on-the-left.patch
deleted file mode 100644
index 2e67a4c78952..000000000000
--- a/04-new-tab-button-on-the-left.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
-index 6bb8e6086..dee8f1b4b 100644
---- a/src/ephy-notebook.c
-+++ b/src/ephy-notebook.c
-@@ -477,7 +477,7 @@ ephy_notebook_constructed (GObject *object)
-   gtk_actionable_set_action_name (GTK_ACTIONABLE (button), "win.new-tab");
-   /* Translators: tooltip for the new tab button */
-   gtk_widget_set_tooltip_text (button, _("Open a new tab"));
--  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-+  gtk_notebook_set_action_widget (GTK_NOTEBOOK (notebook), button, GTK_PACK_START);
-   gtk_widget_show (button);
- 
-   button = gtk_menu_button_new ();
diff --git a/10-add-preferences-menuitem.patch b/10-add-preferences-menuitem.patch
deleted file mode 100644
index 29b9104b3b59..000000000000
--- a/10-add-preferences-menuitem.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/src/resources/gtk/page-menu-popover.ui b/src/resources/gtk/page-menu-popover.ui
-index 651ae4140..2601450a4 100644
---- a/src/resources/gtk/page-menu-popover.ui
-+++ b/src/resources/gtk/page-menu-popover.ui
-@@ -181,6 +181,22 @@
-             <property name="visible">True</property>
-           </object>
-         </child>
-+        <child>
-+          <object class="GtkSeparator" id="preferences-separator">
-+            <property name="orientation">horizontal</property>
-+            <property name="margin-top">6</property>
-+            <property name="margin-bottom">6</property>
-+            <property name="visible">True</property>
-+          </object>
-+        </child>
-+        <child>
-+          <object class="GtkModelButton" id="preferences-button">
-+            <property name="can_focus">True</property>
-+            <property name="text" translatable="yes">Preferences</property>
-+            <property name="action-name">app.preferences</property>
-+            <property name="visible">True</property>
-+          </object>
-+        </child>
-       </object>
-     </child>
-   </object>
diff --git a/11-fix-menu-margins.patch b/11-fix-menu-margins.patch
deleted file mode 100644
index d38d5834743b..000000000000
--- a/11-fix-menu-margins.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/resources/gtk/page-menu-popover.ui b/src/resources/gtk/page-menu-popover.ui
-index 2601450a4..42e3acde2 100644
---- a/src/resources/gtk/page-menu-popover.ui
-+++ b/src/resources/gtk/page-menu-popover.ui
-@@ -4,7 +4,7 @@
-     <child>
-       <object class="GtkBox">
-         <property name="can_focus">False</property>
--        <property name="border_width">12</property>
-+        <property name="margin-bottom">6</property>
-         <property name="orientation">vertical</property>
-         <property name="visible">True</property>
-         <child>
-@@ -12,7 +12,8 @@
-             <property name="visible">True</property>
-             <property name="orientation">horizontal</property>
-             <property name="homogeneous">True</property>
--            <property name="margin-bottom">6</property>
-+            <property name="margin">12</property>
-+            <property name="margin_bottom">0</property>
-             <style>
-                 <class name="linked"/>
-             </style>
-@@ -69,7 +70,9 @@
-             <property name="orientation">horizontal</property>
-             <property name="spacing">6</property>
-             <property name="homogeneous">True</property>
--            <property name="margin-bottom">6</property>
-+            <property name="margin">12</property>
-+            <property name="margin_bottom">6</property>
-+            <property name="margin_top">0</property>
-             <child>
-               <object class="GtkModelButton">
-                 <property name="text" translatable="yes">Zoom Out</property>
diff --git a/12-remove-tab-menuitem.patch b/12-remove-tab-menuitem.patch
deleted file mode 100644
index c9a043b43a4d..000000000000
--- a/12-remove-tab-menuitem.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/resources/gtk/page-menu-popover.ui b/src/resources/gtk/page-menu-popover.ui
-index 42e3acde2..e0c32c4d3 100644
---- a/src/resources/gtk/page-menu-popover.ui
-+++ b/src/resources/gtk/page-menu-popover.ui
-@@ -128,14 +128,6 @@
-             <property name="visible">True</property>
-           </object>
-         </child>
--        <child>
--          <object class="GtkModelButton">
--            <property name="can_focus">True</property>
--            <property name="text" translatable="yes">_New Tab</property>
--            <property name="action-name">win.new-tab</property>
--            <property name="visible">True</property>
--          </object>
--        </child>
-         <child>
-           <object class="GtkModelButton">
-             <property name="can_focus">True</property>
diff --git a/13-remove-text-encoding-menuitem.patch b/13-remove-text-encoding-menuitem.patch
deleted file mode 100644
index 565e9dc4bdef..000000000000
--- a/13-remove-text-encoding-menuitem.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/src/resources/gtk/page-menu-popover.ui b/src/resources/gtk/page-menu-popover.ui
-index e0c32c4d3..216e31479 100644
---- a/src/resources/gtk/page-menu-popover.ui
-+++ b/src/resources/gtk/page-menu-popover.ui
-@@ -144,22 +144,6 @@
-             <property name="visible">True</property>
-           </object>
-         </child>
--        <child>
--          <object class="GtkSeparator">
--            <property name="orientation">horizontal</property>
--            <property name="margin-top">6</property>
--            <property name="margin-bottom">6</property>
--            <property name="visible">True</property>
--          </object>
--        </child>
--        <child>
--          <object class="GtkModelButton">
--            <property name="can_focus">True</property>
--            <property name="text" translatable="yes">Text _Encoding</property>
--            <property name="action-name">win.encoding</property>
--            <property name="visible">True</property>
--          </object>
--        </child>
-         <child>
-           <object class="GtkSeparator" id="save-as-application-separator">
-             <property name="orientation">horizontal</property>
diff --git a/14-add-important-menuitems.patch b/14-add-important-menuitems.patch
deleted file mode 100644
index ce62264b6eb3..000000000000
--- a/14-add-important-menuitems.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/src/resources/gtk/page-menu-popover.ui b/src/resources/gtk/page-menu-popover.ui
-index 216e31479..c14812e6e 100644
---- a/src/resources/gtk/page-menu-popover.ui
-+++ b/src/resources/gtk/page-menu-popover.ui
-@@ -160,6 +160,46 @@
-             <property name="visible">True</property>
-           </object>
-         </child>
-+        <child>
-+          <object class="GtkSeparator">
-+            <property name="orientation">horizontal</property>
-+            <property name="margin-top">6</property>
-+            <property name="margin-bottom">6</property>
-+            <property name="visible">True</property>
-+          </object>
-+        </child>
-+        <child>
-+          <object class="GtkModelButton">
-+            <property name="can_focus">True</property>
-+            <property name="text" translatable="yes">I_mport Bookmarks</property>
-+            <property name="action-name">app.import-bookmarks</property>
-+            <property name="visible">True</property>
-+          </object>
-+        </child>
-+        <child>
-+          <object class="GtkModelButton">
-+            <property name="can_focus">True</property>
-+            <property name="text" translatable="yes">E_xport Bookmarks</property>
-+            <property name="action-name">app.export-bookmarks</property>
-+            <property name="visible">True</property>
-+          </object>
-+        </child>
-+        <child>
-+          <object class="GtkSeparator">
-+            <property name="orientation">horizontal</property>
-+            <property name="margin-top">6</property>
-+            <property name="margin-bottom">6</property>
-+            <property name="visible">True</property>
-+          </object>
-+        </child>
-+        <child>
-+          <object class="GtkModelButton">
-+            <property name="can_focus">True</property>
-+            <property name="text" translatable="yes">_History</property>
-+            <property name="action-name">app.history</property>
-+            <property name="visible">True</property>
-+          </object>
-+        </child>
-         <child>
-           <object class="GtkSeparator" id="preferences-separator">
-             <property name="orientation">horizontal</property>
-@@ -168,6 +208,14 @@
-             <property name="visible">True</property>
-           </object>
-         </child>
-+        <child>
-+          <object class="GtkModelButton">
-+            <property name="can_focus">True</property>
-+            <property name="text" translatable="yes">_Keyboard Shortcuts</property>
-+            <property name="action-name">app.shortcuts</property>
-+            <property name="visible">True</property>
-+          </object>
-+        </child>
-         <child>
-           <object class="GtkModelButton" id="preferences-button">
-             <property name="can_focus">True</property>
diff --git a/15-remove-GNOME-menu.patch b/15-remove-GNOME-menu.patch
deleted file mode 100644
index 672f4350cd0f..000000000000
--- a/15-remove-GNOME-menu.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/ephy-shell.c b/src/ephy-shell.c
-index d91fbcbf7..57eb3be6c 100644
---- a/src/ephy-shell.c
-+++ b/src/ephy-shell.c
-@@ -420,9 +420,6 @@ ephy_shell_startup (GApplication *application)
-         ephy_shell_get_sync_service (shell);
-       }
-     }
--
--    gtk_application_set_app_menu (GTK_APPLICATION (application),
--                                  G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")));
-   } else {
-     g_action_map_add_action_entries (G_ACTION_MAP (application),
-                                      app_mode_app_entries, G_N_ELEMENTS (app_mode_app_entries),
diff --git a/PKGBUILD b/PKGBUILD
index b92039125f32..3e212368cca5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany-pantheon
-pkgver=3.34.1
+pkgver=3.35.1
 pkgrel=2
 pkgdesc="A GNOME web browser based on the WebKit rendering engine (with elementary OS patches)"
 url="https://wiki.gnome.org/Apps/Web"
@@ -15,44 +15,26 @@ makedepends=(docbook-xml startup-notification lsb-release gobject-introspection
 checkdepends=(xorg-server-xvfb)
 groups=(pantheon)
 provides=(epiphany="${pkgver}" epiphany-sync)
-_commit=fae9ef019e39c8ca420344c8c01416a3184bb8fc  # tags/3.34.1^0
+_commit=aa3e99a5845daac749bab80bc600ec5797a3f9c7  # tags/3.35.1^0
 source=("$pkgname::git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit"
         epiphany-sync{,.service}
-        "01-full-width-url-bar.patch"
-        "02-24px-color-toolbar-icons.patch"
         "03-tab-close-buttons-on-the-left.patch"
-        "04-new-tab-button-on-the-left.patch"
         "05-rename-to-epiphany.patch"
         "06-double-click-for-new-tab.patch"
         "07-overlay-bar-style.patch"
         "08-rename-incongito-class-to-dodge-GNOME-style.patch"
         "09-middle-click-closes-tab.patch"
-        "10-add-preferences-menuitem.patch"
-        "11-fix-menu-margins.patch"
-        "12-remove-tab-menuitem.patch"
-        "13-remove-text-encoding-menuitem.patch"
-        "14-add-important-menuitems.patch"
-        "15-remove-GNOME-menu.patch"
         "16-hide-the-fonts-and-styles-tab.patch"
         "17-give-notebook-a-margin.patch")
 sha1sums=('SKIP'
           '2a8fda153bf3fb2d9a14b632082329ed6e2d8fab'
           '2c1c89aee5e1ea2ca47d518690b93238213e73fd'
-          '3d1ae633eb4815cb0956125bb1810ce82a3c79ab'
-          '3ebd0aadbf3ba145ccf5b5c07b810cc21c28f5a9'
-          '824c797de664a7d5a904b49d76636ab929f5e400'
-          'ec44a91a1693c664e55ef42c21ae2d9e27c75148'
+          '06b7c38fa4db3b3a69b2c0b92f88e1156f08a5a0'
           '7dbfdea116239bb3ee947e9175a43a6bdd768f1e'
           '71fc912aee1e01bc6d17907d7bfa33852ef15fb2'
           'cb88f86c9e44936993ab2e3a02f71874de422ae7'
           '0f1085fb06e06298c7fb8feb12be0699d166dd2b'
           '5c0d41eda4b449ceba4699e1a1e8b6359d12deb4'
-          '2b07c438cdabe254a33b6b5f180f9359e3e21422'
-          '8deb1718a29e157e888a1358048200cc5887b1f3'
-          '58227528aa8bc1d1480fbd0f5e18a6eb11450ba8'
-          '33246f87659164729c55a201151c368bd0f02b9c'
-          '67f6d0c60cbf4ea9252c56d3ac37090fd18a534c'
-          'e125a6e6ca85ad06d192e1c200190438ca2b1f8a'
           '0f3e50ecb72b9cf671dc75d5ac987f5e05b2ed66'
           'cd1090f20a153d77060aa1d6304c4d5e621c125f')
 
@@ -64,21 +46,12 @@ pkgver() {
 prepare() {
   cd $pkgname
 
-  msg2 "full width url bar"; patch -Np1 < ../01-full-width-url-bar.patch
-  msg2 "24px color toolbar icons"; patch -Np1 < ../02-24px-color-toolbar-icons.patch
   msg2 "tab close buttons on the left"; patch -Np1 < ../03-tab-close-buttons-on-the-left.patch
-  #msg2 "new tab button on the left"; patch -Np1 < ../04-new-tab-button-on-the-left.patch #COMPLICATED
   msg2 "rename to epiphany"; patch -Np1 < ../05-rename-to-epiphany.patch
   msg2 "double click for new tab"; patch -Np1 < ../06-double-click-for-new-tab.patch
   msg2 "overlay bar style"; patch -Np1 < ../07-overlay-bar-style.patch
   msg2 "rename incognito class"; patch -Np1 < ../08-rename-incongito-class-to-dodge-GNOME-style.patch
   msg2 "middle click closes tab"; patch -Np1 < ../09-middle-click-closes-tab.patch
-  msg2 "add preferences menuitem"; patch -Np1 < ../10-add-preferences-menuitem.patch
-  msg2 "fix menu margins"; patch -Np1 < ../11-fix-menu-margins.patch
-  #msg2 "remove tab menuitem"; patch -Np1 < ../12-remove-tab-menuitem.patch #REMOVED UPSTREAM
-  #msg2 "remove text encoding menuitem"; patch -Np1 < ../13-remove-text-encoding-menuitem.patch #REMOVED UPSTREAM
-  msg2 "add important menuitems"; patch -Np1 < ../14-add-important-menuitems.patch
-  #msg2 "remove GNOME menu"; patch -Np1 < ../15-remove-GNOME-menu.patch #REMOVED UPSTREAM
   msg2 "hide the fonts and styles tab"; patch -Np1 < ../16-hide-the-fonts-and-styles-tab.patch
   msg2 "give notebook a margin"; patch -Np1 < ../17-give-notebook-a-margin.patch
 }