upstream has some unkown voodoo doing this already...

3 files changed, 2 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fa0ed0a6d64d..26c7a392ba33 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = epiphany-pantheon
 	pkgdesc = A GNOME web browser based on the WebKit rendering engine (with elementary OS patches)
 	pkgver = 3.35.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://wiki.gnome.org/Apps/Web
 	arch = x86_64
 	groups = pantheon
@@ -24,7 +24,6 @@ pkgbase = epiphany-pantheon
 	source = epiphany-pantheon::git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=aa3e99a5845daac749bab80bc600ec5797a3f9c7
 	source = epiphany-sync
 	source = epiphany-sync.service
-	source = 03-tab-close-buttons-on-the-left.patch
 	source = 05-rename-to-epiphany.patch
 	source = 06-double-click-for-new-tab.patch
 	source = 07-overlay-bar-style.patch
@@ -35,7 +34,6 @@ pkgbase = epiphany-pantheon
 	sha1sums = SKIP
 	sha1sums = 2a8fda153bf3fb2d9a14b632082329ed6e2d8fab
 	sha1sums = 2c1c89aee5e1ea2ca47d518690b93238213e73fd
-	sha1sums = 06b7c38fa4db3b3a69b2c0b92f88e1156f08a5a0
 	sha1sums = 7dbfdea116239bb3ee947e9175a43a6bdd768f1e
 	sha1sums = 71fc912aee1e01bc6d17907d7bfa33852ef15fb2
 	sha1sums = cb88f86c9e44936993ab2e3a02f71874de422ae7
diff --git a/03-tab-close-buttons-on-the-left.patch b/03-tab-close-buttons-on-the-left.patch
deleted file mode 100644
index 94f586fd130c..000000000000
--- a/03-tab-close-buttons-on-the-left.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/ephy-tab-label.c b/src/ephy-tab-label.c
-index bddbaef23..6bb8e6086 100644
---- 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/PKGBUILD b/PKGBUILD
index 3e212368cca5..6fa4d799c30b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=epiphany-pantheon
 pkgver=3.35.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A GNOME web browser based on the WebKit rendering engine (with elementary OS patches)"
 url="https://wiki.gnome.org/Apps/Web"
 arch=(x86_64)
@@ -18,7 +18,6 @@ provides=(epiphany="${pkgver}" epiphany-sync)
 _commit=aa3e99a5845daac749bab80bc600ec5797a3f9c7  # tags/3.35.1^0
 source=("$pkgname::git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit"
         epiphany-sync{,.service}
-        "03-tab-close-buttons-on-the-left.patch"
         "05-rename-to-epiphany.patch"
         "06-double-click-for-new-tab.patch"
         "07-overlay-bar-style.patch"
@@ -29,7 +28,6 @@ source=("$pkgname::git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_comm
 sha1sums=('SKIP'
           '2a8fda153bf3fb2d9a14b632082329ed6e2d8fab'
           '2c1c89aee5e1ea2ca47d518690b93238213e73fd'
-          '06b7c38fa4db3b3a69b2c0b92f88e1156f08a5a0'
           '7dbfdea116239bb3ee947e9175a43a6bdd768f1e'
           '71fc912aee1e01bc6d17907d7bfa33852ef15fb2'
           'cb88f86c9e44936993ab2e3a02f71874de422ae7'
@@ -46,7 +44,6 @@ pkgver() {
 prepare() {
   cd $pkgname
 
-  msg2 "tab close buttons on the left"; patch -Np1 < ../03-tab-close-buttons-on-the-left.patch
   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