summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/epiphany/PKGBUILD29
-rw-r--r--libre/epiphany/pluginsdir.diff20
2 files changed, 22 insertions, 27 deletions
diff --git a/libre/epiphany/PKGBUILD b/libre/epiphany/PKGBUILD
index a305c0932..a0a044429 100644
--- a/libre/epiphany/PKGBUILD
+++ b/libre/epiphany/PKGBUILD
@@ -10,26 +10,22 @@
# - switched default searchengine to duckduckgo
pkgname=epiphany
-pkgver=3.26.6
+pkgver=3.28.1
pkgrel=1.parabola1
pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support"
url="https://wiki.gnome.org/Apps/Web"
arch=(x86_64 i686 armv7h)
license=(GPL)
-depends=(webkit2gtk gcr gnome-desktop icu)
+depends=(webkit2gtk gcr icu)
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=eb7a411968ecb42a49a4cfd108df036d8fdb034e # tags/3.28.1^0
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
libre.patch)
sha256sums=('SKIP'
- 'SKIP'
- 'SKIP'
- '0e4db79fe22a4ed447aa926eecd09fc660cf2f5aac2d42aa9adaacad45416faf'
+ 'b6c8ee6ace934c053f2fd89758e0b587cb8953c6b0246c1359aecaae4de70289'
'8cee8e5f896ce12832d50e7ab97ef16165d70d135018742e0f5bc15507d4e708')
pkgver() {
@@ -38,26 +34,17 @@ pkgver() {
}
prepare() {
- mkdir build
cd $pkgname
-
patch -Np1 -i ../pluginsdir.diff
patch -Np1 -i ../libre.patch
-
- 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="Parabola GNU/Linux-libre"
- ninja
+ arch-meson $pkgname build \
+ -D distributor_name="Parabola GNU/Linux-libre"
+ ninja -C build
}
package() {
- cd build
- DESTDIR="$pkgdir" ninja install
+ DESTDIR="$pkgdir" ninja -C build install
}
diff --git a/libre/epiphany/pluginsdir.diff b/libre/epiphany/pluginsdir.diff
index f2b0bb03f..7999e10be 100644
--- a/libre/epiphany/pluginsdir.diff
+++ b/libre/epiphany/pluginsdir.diff
@@ -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)