[arch-commits] Commit in epiphany/trunk (PKGBUILD pluginsdir.diff)

[Jan Steffens]

    Date: Wednesday, March 14, 2018 @ 20:31:23
  Author: heftig
Revision: 319115

3.28.0.1+4+g051d4f616-1

Modified:
  epiphany/trunk/PKGBUILD
  epiphany/trunk/pluginsdir.diff

-----------------+
 PKGBUILD        |   30 +++++++++---------------------
 pluginsdir.diff |   20 ++++++++++++++------
 2 files changed, 23 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-14 20:31:22 UTC (rev 319114)
+++ PKGBUILD	2018-03-14 20:31:23 UTC (rev 319115)
@@ -2,25 +2,21 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=epiphany
-pkgver=3.26.6
+pkgver=3.28.0.1+4+g051d4f616
 pkgrel=1
 pkgdesc="A GNOME web browser based on the WebKit rendering engine"
 url="https://wiki.gnome.org/Apps/Web"
 arch=(x86_64)
 license=(GPL)
-depends=(webkit2gtk gcr gnome-desktop icu)
+depends=(webkit2gtk gcr libdazzle icu libhttpseverywhere)
 makedepends=(itstool docbook-xml startup-notification lsb-release
              gobject-introspection yelp-tools appstream-glib git meson)
 groups=(gnome)
-_commit=0b74e24c3ff3bd7641e90ee97ff44abf949606e5  # tags/3.26.6^0
+_commit=051d4f6167651a2de54b5822c5f968f4c236079d  # gnome-3-28
 source=("git+https://git.gnome.org/browse/epiphany#commit=$_commit"
-        "git+https://git.gnome.org/browse/libgd"
-        "git+https://git.gnome.org/browse/gvdb"
         pluginsdir.diff)
 sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            '0e4db79fe22a4ed447aa926eecd09fc660cf2f5aac2d42aa9adaacad45416faf')
+            'b6c8ee6ace934c053f2fd89758e0b587cb8953c6b0246c1359aecaae4de70289')
 
 pkgver() {
   cd $pkgname
@@ -28,25 +24,17 @@
 }
 
 prepare() {
-  mkdir build
   cd $pkgname
-
   patch -Np1 -i ../pluginsdir.diff
-
-  git submodule init
-  git config --local submodule.libgd.url "$srcdir/libgd"
-  git config --local submodule.gvdb.url "$srcdir/gvdb"
-  git submodule update
-
 }
 
 build() {
-  cd build
-  arch-meson ../$pkgname -Ddistributor_name="Arch Linux®"
-  ninja
+  arch-meson $pkgname build \
+    -D https_everywhere=true \
+    -D distributor_name="Arch Linux®"
+  ninja -C build
 }
 
 package() {
-  cd build
-  DESTDIR="$pkgdir" ninja install
+  DESTDIR="$pkgdir" ninja -C build install
 }

Modified: pluginsdir.diff
===================================================================
--- pluginsdir.diff	2018-03-14 20:31:22 UTC (rev 319114)
+++ pluginsdir.diff	2018-03-14 20:31:23 UTC (rev 319115)
@@ -1,6 +1,12 @@
---- a/embed/ephy-embed-shell.c
-+++ b/embed/ephy-embed-shell.c
-@@ -671,6 +671,7 @@ ephy_embed_shell_create_web_context (EphyEmbedShell *shell)
+ embed/ephy-embed-shell.c | 1 +
+ meson.build              | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git c/embed/ephy-embed-shell.c i/embed/ephy-embed-shell.c
+index b4837f834..1b5012bae 100644
+--- c/embed/ephy-embed-shell.c
++++ i/embed/ephy-embed-shell.c
+@@ -910,6 +910,7 @@ ephy_embed_shell_create_web_context (EphyEmbedShell *shell)
    g_free (cache_dir);
  
    priv->web_context = webkit_web_context_new_with_website_data_manager (manager);
@@ -8,9 +14,11 @@
    g_object_unref (manager);
  }
  
---- a/meson.build	2017-09-18 11:49:28.745287692 +0000
-+++ b/meson.build	2017-09-18 11:52:53.432417200 +0000
-@@ -25,6 +25,7 @@
+diff --git c/meson.build i/meson.build
+index a4a8a36b7..0c98f6c36 100644
+--- c/meson.build
++++ i/meson.build
+@@ -25,6 +25,7 @@ conf = configuration_data()
  conf.set_quoted('BUILD_ROOT', meson.build_root())
  conf.set_quoted('DISTRIBUTOR_NAME', get_option('distributor_name'))
  conf.set_quoted('EPHY_WEB_EXTENSIONS_DIR', webextensionsdir)