Date: Wednesday, September 5, 2018 @ 20:47:04 Author: heftig Revision: 333559
3.30.0+8+g619f63050-1 Modified: epiphany/trunk/PKGBUILD (contents, properties) Deleted: epiphany/trunk/pluginsdir.diff -----------------+ PKGBUILD | 29 ++++++++++++++++------------- pluginsdir.diff | 28 ---------------------------- 2 files changed, 16 insertions(+), 41 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-09-05 20:39:17 UTC (rev 333558) +++ PKGBUILD 2018-09-05 20:47:04 UTC (rev 333559) @@ -1,22 +1,21 @@ -# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> # Maintainer: Jan de Groot <j...@archlinux.org> pkgname=epiphany -pkgver=3.28.3.1 -pkgrel=2 +pkgver=3.30.0+8+g619f63050 +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 icu) -makedepends=(itstool docbook-xml startup-notification lsb-release - gobject-introspection yelp-tools appstream-glib git meson) +depends=(webkit2gtk gcr icu libdazzle) +makedepends=(docbook-xml startup-notification lsb-release gobject-introspection yelp-tools + appstream-glib git meson) +checkdepends=(xorg-server-xvfb) groups=(gnome) -_commit=a5a9a7e2904e2206b3cc863ab13748255247e3eb # tags/3.28.3.1^0 -source=("git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit" - pluginsdir.diff) -sha256sums=('SKIP' - 'b6c8ee6ace934c053f2fd89758e0b587cb8953c6b0246c1359aecaae4de70289') +_commit=619f63050fe60a74cff7f9bec3d430316ef06371 # environments/review-gnome-3-30-hx4v5k/deployments/58 +source=("git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit") +sha256sums=('SKIP') pkgver() { cd $pkgname @@ -25,7 +24,6 @@ prepare() { cd $pkgname - patch -Np1 -i ../pluginsdir.diff } build() { @@ -34,6 +32,11 @@ 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 || : +} + package() { - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build } Property changes on: epiphany/trunk/PKGBUILD ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: pluginsdir.diff =================================================================== --- pluginsdir.diff 2018-09-05 20:39:17 UTC (rev 333558) +++ pluginsdir.diff 2018-09-05 20:47:04 UTC (rev 333559) @@ -1,28 +0,0 @@ - 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); -+ webkit_web_context_set_additional_plugins_directory (priv->web_context, EPHY_PLUGINS_DIR); - g_object_unref (manager); - } - -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) -+conf.set_quoted('EPHY_PLUGINS_DIR', join_paths(pkglibdir, 'plugins')) - conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) - conf.set_quoted('ISO_CODES_PREFIX', iso_codes_prefix) - conf.set_quoted('LOCALEDIR', localedir)