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

[Jan Steffens]

    Date: Thursday, August 11, 2016 @ 11:56:00
  Author: heftig
Revision: 273592

3.20.3-2: Create a plugin dir that only Epiphany will find

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

-----------------+
 PKGBUILD        |   14 +++++++++++---
 pluginsdir.diff |   28 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-11 10:27:57 UTC (rev 273591)
+++ PKGBUILD	2016-08-11 11:56:00 UTC (rev 273592)
@@ -3,7 +3,7 @@
 
 pkgname=epiphany
 pkgver=3.20.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A GNOME web browser based on the WebKit rendering engine"
 url="https://wiki.gnome.org/Apps/Web"
 arch=(i686 x86_64)
@@ -14,9 +14,17 @@
              gobject-introspection)
 options=(!emptydirs)
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4d9de1bdb44c14adf25aa6dc02ea3de60925cff5eb01fe89545e6032c9b424a2')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        pluginsdir.diff)
+sha256sums=('4d9de1bdb44c14adf25aa6dc02ea3de60925cff5eb01fe89545e6032c9b424a2'
+            '42a7b820fd659fee8508a9b9a57e385c658b3b312c7a8f9456078223e4d78f22')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../pluginsdir.diff
+  autoreconf -fvi
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \

Added: pluginsdir.diff
===================================================================
--- pluginsdir.diff	                        (rev 0)
+++ pluginsdir.diff	2016-08-11 11:56:00 UTC (rev 273592)
@@ -0,0 +1,28 @@
+ embed/Makefile.am        | 1 +
+ embed/ephy-embed-shell.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git c/embed/Makefile.am i/embed/Makefile.am
+index 8969e1b59e252c19..7c3225b02c2ec5fb 100644
+--- c/embed/Makefile.am
++++ i/embed/Makefile.am
+@@ -65,6 +65,7 @@ libephyembed_la_CPPFLAGS = \
+ libephyembed_la_CFLAGS = \
+ 	-DDATADIR="\"$(datadir)\""	\
+ 	-DSHARE_DIR=\"$(pkgdatadir)\"	\
++	-DEPHY_PLUGINS_DIR=\""$(libdir)/epiphany/plugins"\" \
+ 	-DEPHY_WEB_EXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/web-extensions"\" \
+ 	$(DEPENDENCIES_CFLAGS) 	\
+ 	$(CODE_COVERAGE_CFLAGS) \
+diff --git c/embed/ephy-embed-shell.c i/embed/ephy-embed-shell.c
+index cd74f7d144b37ed3..624020f3c39383c6 100644
+--- c/embed/ephy-embed-shell.c
++++ i/embed/ephy-embed-shell.c
+@@ -671,6 +671,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);
+ }
+