Split epiphany-sync off epiphany-pantheon, for use with any epiphany.

9 files changed, 15 insertions, 254 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43c31754f309..8c45de0080ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,46 +1,15 @@
-pkgbase = epiphany-pantheon
-	pkgdesc = A GNOME web browser based on the WebKit rendering engine (with elementary OS patches)
-	pkgver = 3.35.2+1+g16a4219dc
+pkgbase = epiphany-sync
+	pkgdesc = Load whole profile in memory (synced to tmpfs)
+	pkgver = 1
 	pkgrel = 1
-	url = https://wiki.gnome.org/Apps/Web
-	arch = x86_64
-	groups = pantheon
+	arch = any
 	license = GPL
-	checkdepends = xorg-server-xvfb
-	makedepends = docbook-xml
-	makedepends = startup-notification
-	makedepends = lsb-release
-	makedepends = gobject-introspection
-	makedepends = yelp-tools
-	makedepends = appstream-glib
-	makedepends = git
-	makedepends = meson
-	depends = webkit2gtk
-	depends = gcr
-	depends = libdazzle
-	depends = libhandy
-	provides = epiphany=3.35.2+1+g16a4219dc
-	provides = epiphany-sync
-	source = epiphany-pantheon::git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=16a4219dcb44b23d23c9ebe69ad466cb2ea7e597
+	depends = bash
+	depends = systemd
 	source = epiphany-sync
 	source = epiphany-sync.service
-	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 = 16-hide-the-fonts-and-styles-tab.patch
-	source = 17-give-notebook-a-margin.patch
-	sha1sums = SKIP
 	sha1sums = 2a8fda153bf3fb2d9a14b632082329ed6e2d8fab
 	sha1sums = 2c1c89aee5e1ea2ca47d518690b93238213e73fd
-	sha1sums = 7dbfdea116239bb3ee947e9175a43a6bdd768f1e
-	sha1sums = 71fc912aee1e01bc6d17907d7bfa33852ef15fb2
-	sha1sums = cb88f86c9e44936993ab2e3a02f71874de422ae7
-	sha1sums = 0f1085fb06e06298c7fb8feb12be0699d166dd2b
-	sha1sums = 5c0d41eda4b449ceba4699e1a1e8b6359d12deb4
-	sha1sums = 0f3e50ecb72b9cf671dc75d5ac987f5e05b2ed66
-	sha1sums = cd1090f20a153d77060aa1d6304c4d5e621c125f
 
-pkgname = epiphany-pantheon
+pkgname = epiphany-sync
 
diff --git a/05-rename-to-epiphany.patch b/05-rename-to-epiphany.patch
deleted file mode 100644
index aea7a68bc911..000000000000
--- a/05-rename-to-epiphany.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/data/org.gnome.Epiphany.desktop.in.in b/data/org.gnome.Epiphany.desktop.in.in
-index c02164e1e..4c2e2fea0 100644
---- a/data/org.gnome.Epiphany.desktop.in.in
-+++ b/data/org.gnome.Epiphany.desktop.in.in
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=Web
-+Name=Epiphany
- GenericName=Web Browser
- Comment=Browse the web
- # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
diff --git a/06-double-click-for-new-tab.patch b/06-double-click-for-new-tab.patch
deleted file mode 100644
index cee8ca127dec..000000000000
--- a/06-double-click-for-new-tab.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
-index dee8f1b4b..3947ff681 100644
---- a/src/ephy-notebook.c
-+++ b/src/ephy-notebook.c
-@@ -234,6 +234,20 @@ button_press_cb (EphyNotebook   *notebook,
-     gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), tab_clicked);
-   }
- 
-+	/* Open a new tab when double-clicked. */
-+	if (event->type == GDK_2BUTTON_PRESS &&
-+	    event->button == 1 &&
-+	    (event->state & gtk_accelerator_get_default_mod_mask ()) == 0)
-+	{
-+		GtkWindow *window;
-+		GActionGroup *group;
-+		GAction *action;
-+		window = gtk_widget_get_toplevel (GTK_WIDGET (notebook));
-+		group = gtk_widget_get_action_group (GTK_WIDGET (window), "win");
-+  		action = g_action_map_lookup_action (G_ACTION_MAP (group), "new-tab");
-+		g_action_activate (action, NULL);
-+	}
-+
-   return GDK_EVENT_PROPAGATE;
- }
- 
diff --git a/07-overlay-bar-style.patch b/07-overlay-bar-style.patch
deleted file mode 100644
index fd3bdee01f26..000000000000
--- a/07-overlay-bar-style.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
-index 563f73670..c6b66a290 100644
---- a/embed/ephy-embed.c
-+++ b/embed/ephy-embed.c
-@@ -156,6 +156,11 @@ static void
- ephy_embed_set_statusbar_label (EphyEmbed *embed, const char *label)
- {
-   nautilus_floating_bar_set_primary_label (NAUTILUS_FLOATING_BAR (embed->floating_bar), label);
-+  g_object_set (NAUTILUS_FLOATING_BAR (embed->floating_bar),
-+              "margin-bottom", 3,
-+              "margin-start", 3,
-+              "margin-end", 3,
-+              NULL);
- 
-   if (label == NULL || label[0] == '\0') {
-     gtk_widget_hide (embed->floating_bar);
-diff --git a/lib/widgets/contrib/nautilus-floating-bar.c b/lib/widgets/contrib/nautilus-floating-bar.c
-index 72bd1b02b..08fd83f18 100644
---- a/lib/widgets/contrib/nautilus-floating-bar.c
-+++ b/lib/widgets/contrib/nautilus-floating-bar.c
-@@ -364,10 +364,10 @@ nautilus_floating_bar_constructed (GObject *obj)
-   labels_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-   gtk_box_pack_start (GTK_BOX (box), labels_box, TRUE, TRUE, 0);
-   g_object_set (labels_box,
--                "margin-top", 2,
--                "margin-bottom", 2,
--                "margin-start", 12,
--                "margin-end", 12,
-+                "margin-top", 0,
-+                "margin-bottom", 0,
-+                "margin-start", 0,
-+                "margin-end", 0,
-                 NULL);
-   gtk_widget_show (labels_box);
- 
-@@ -394,7 +394,7 @@ nautilus_floating_bar_init (NautilusFloatingBar *self)
-                                             NautilusFloatingBarDetails);
- 
-   context = gtk_widget_get_style_context (GTK_WIDGET (self));
--  gtk_style_context_add_class (context, "floating-bar");
-+  gtk_style_context_add_class (context, "overlay-bar");
- }
- 
- static void
diff --git a/08-rename-incongito-class-to-dodge-GNOME-style.patch b/08-rename-incongito-class-to-dodge-GNOME-style.patch
deleted file mode 100644
index 82a38dbc833a..000000000000
--- a/08-rename-incongito-class-to-dodge-GNOME-style.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/ephy-window.c b/src/ephy-window.c
-index 3d90f2610..279c9c358 100644
---- a/src/ephy-window.c
-+++ b/src/ephy-window.c
-@@ -3722,7 +3722,7 @@
- 
-   /* Setup incognito mode style */
-   if (mode == EPHY_EMBED_SHELL_MODE_INCOGNITO)
--    gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (window)), "incognito-mode");
-+    gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (window)), "incognito");
-   else if (mode == EPHY_EMBED_SHELL_MODE_AUTOMATION)
-     gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (window)), "automation-mode");
- 
diff --git a/09-middle-click-closes-tab.patch b/09-middle-click-closes-tab.patch
deleted file mode 100644
index 65bbb1387559..000000000000
--- a/09-middle-click-closes-tab.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
-index 3947ff681..07c0afa7f 100644
---- a/src/ephy-notebook.c
-+++ b/src/ephy-notebook.c
-@@ -248,6 +248,16 @@ button_press_cb (EphyNotebook   *notebook,
- 		g_action_activate (action, NULL);
- 	}
- 
-+  /* Close the tab if it gets middle clicked */
-+  if (event->type == GDK_BUTTON_PRESS &&
-+      event->button == 2 &&
-+      (event->state & gtk_accelerator_get_default_mod_mask ()) == 0)
-+  {
-+    GtkWidget *tab;
-+    tab = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), tab_clicked);
-+    g_signal_emit (notebook, signals[TAB_CLOSE_REQUEST], 0, tab);
-+  }
-+
-   return GDK_EVENT_PROPAGATE;
- }
- 
diff --git a/16-hide-the-fonts-and-styles-tab.patch b/16-hide-the-fonts-and-styles-tab.patch
deleted file mode 100644
index 6e8b0acda814..000000000000
--- a/16-hide-the-fonts-and-styles-tab.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/resources/gtk/prefs-dialog.ui b/src/resources/gtk/prefs-dialog.ui
-index e2584996a..943af2552 100644
---- a/src/resources/gtk/prefs-dialog.ui
-+++ b/src/resources/gtk/prefs-dialog.ui
-@@ -393,7 +393,7 @@
-               <object class="HdyPreferencesPage">
-                 <property name="icon_name">document-edit-symbolic</property>
-                 <property name="title" translatable="yes">Fonts &amp; Style</property>
--                <property name="visible">True</property>
-+                <property name="visible">False</property>
-                 <style>
-                   <class name="background"/>
-                 </style>
-@@ -557,16 +557,6 @@
-                 <property name="position">1</property>
-               </packing>
-             </child>
--            <child type="tab">
--              <object class="GtkLabel">
--                <property name="visible">True</property>
--                <property name="label" translatable="yes">Fonts &amp; Style</property>
--              </object>
--              <packing>
--                <property name="position">1</property>
--                <property name="tab_fill">False</property>
--              </packing>
--            </child>
-             <child>
-               <object class="HdyPreferencesPage">
-                 <property name="icon_name">drive-harddisk-symbolic</property>
diff --git a/17-give-notebook-a-margin.patch b/17-give-notebook-a-margin.patch
deleted file mode 100644
index 5c3ee902a41b..000000000000
--- a/17-give-notebook-a-margin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/resources/gtk/prefs-dialog.ui b/src/resources/gtk/prefs-dialog.ui
-index 943af2552..4a248d22f 100644
---- a/src/resources/gtk/prefs-dialog.ui
-+++ b/src/resources/gtk/prefs-dialog.ui
-@@ -24,6 +24,7 @@
-           <object class="GtkNotebook" id="notebook">
-             <property name="visible">True</property>
-             <property name="show_border">False</property>
-+            <property name="margin">12</property>
-             <child>
-               <object class="GtkBox">
-                 <property name="visible">True</property>
diff --git a/PKGBUILD b/PKGBUILD
index 142077af1a7e..c9b8681c4e2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,69 +2,17 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
-pkgname=epiphany-pantheon
-pkgver=3.35.2+1+g16a4219dc
+pkgname=epiphany-sync
+pkgver=1
 pkgrel=1
-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)
+pkgdesc="Load whole profile in memory (synced to tmpfs)"
+arch=(any)
 license=(GPL)
-depends=(webkit2gtk gcr libdazzle libhandy)
-makedepends=(docbook-xml startup-notification lsb-release gobject-introspection yelp-tools
-             appstream-glib git meson)
-checkdepends=(xorg-server-xvfb)
-groups=(pantheon)
-provides=(epiphany="${pkgver}" epiphany-sync)
-_commit=16a4219dcb44b23d23c9ebe69ad466cb2ea7e597 # tags/3.35.2+1
-source=("$pkgname::git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit"
-        epiphany-sync{,.service}
-        "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"
-        "16-hide-the-fonts-and-styles-tab.patch"
-        "17-give-notebook-a-margin.patch")
-sha1sums=('SKIP'
-          '2a8fda153bf3fb2d9a14b632082329ed6e2d8fab'
-          '2c1c89aee5e1ea2ca47d518690b93238213e73fd'
-          '7dbfdea116239bb3ee947e9175a43a6bdd768f1e'
-          '71fc912aee1e01bc6d17907d7bfa33852ef15fb2'
-          'cb88f86c9e44936993ab2e3a02f71874de422ae7'
-          '0f1085fb06e06298c7fb8feb12be0699d166dd2b'
-          '5c0d41eda4b449ceba4699e1a1e8b6359d12deb4'
-          '0f3e50ecb72b9cf671dc75d5ac987f5e05b2ed66'
-          'cd1090f20a153d77060aa1d6304c4d5e621c125f')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  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 "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
-}
-
-build() {
-  arch-meson $pkgname build
-  ninja -C build
-}
-
-check() {
-  # ERROR:../epiphany/tests/ephy-web-app-utils-test.c:109:test_web_app_lifetime: assertion failed (g_list_length (apps) == 1): (0 == 1)
-  xvfb-run meson test -C build --print-errorlogs || :
-}
-
+depends=(bash systemd)
+source=(epiphany-sync{,.service})
+sha1sums=('2a8fda153bf3fb2d9a14b632082329ed6e2d8fab'
+          '2c1c89aee5e1ea2ca47d518690b93238213e73fd')
 package() {
-  DESTDIR="$pkgdir" meson install -C build
   install -Dm 755 {"${srcdir}","${pkgdir}"/usr/bin}/epiphany-sync
   install -Dm 644 {"${srcdir}","${pkgdir}"/usr/lib/systemd/user}/epiphany-sync.service
 }