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

[Jan de Groot]

    Date: Saturday, April 8, 2017 @ 21:58:27
  Author: jgc
Revision: 292523

upgpkg: epiphany 3.24.0+37+g1ea57369a-1

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

-----------------+
 PKGBUILD        |   11 +++++++----
 pluginsdir.diff |   32 ++++++++++++--------------------
 2 files changed, 19 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-08 20:35:43 UTC (rev 292522)
+++ PKGBUILD	2017-04-08 21:58:27 UTC (rev 292523)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=epiphany
-pkgver=3.22.6
+pkgver=3.24.0+37+g1ea57369a
 pkgrel=1
 pkgdesc="A GNOME web browser based on the WebKit rendering engine"
 url="https://wiki.gnome.org/Apps/Web"
@@ -12,13 +12,15 @@
 makedepends=(intltool itstool docbook-xml startup-notification lsb-release
              gobject-introspection yelp-tools autoconf-archive appstream-glib git)
 groups=(gnome)
-_commit=dfeedecc5c92980e0c6cf57f297063503bf0b013  # tags/3.22.6^0
+_commit=1ea57369aaa369b37669bbbae233f6d7cdcde783  # master
 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'
-            '42a7b820fd659fee8508a9b9a57e385c658b3b312c7a8f9456078223e4d78f22')
+            'SKIP'
+            '3bbd4b36e697a3a9165e0b71d5af566fe96a8f1237d854b9dee9a7e0b9fef8e3')
 
 pkgver() {
   cd $pkgname
@@ -31,6 +33,7 @@
 
   git submodule init
   git config --local submodule.libgd.url "$srcdir/libgd"
+  git config --local submodule.gvdb.url "$srcdir/gvdb"
   git submodule update
 
   NOCONFIGURE=1 ./autogen.sh
@@ -39,7 +42,7 @@
 build() {
   cd $pkgname
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/$pkgname
+      --localstatedir=/var --libexecdir=/usr/lib/$pkgname --enable-compile-warnings=yes
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool

Modified: pluginsdir.diff
===================================================================
--- pluginsdir.diff	2017-04-08 20:35:43 UTC (rev 292522)
+++ pluginsdir.diff	2017-04-08 21:58:27 UTC (rev 292523)
@@ -1,23 +1,5 @@
- 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
+--- a/embed/ephy-embed-shell.c
++++ b/embed/ephy-embed-shell.c
 @@ -671,6 +671,7 @@ ephy_embed_shell_create_web_context (EphyEmbedShell *shell)
    g_free (cache_dir);
  
@@ -26,3 +8,13 @@
    g_object_unref (manager);
  }
  
+--- a/embed/Makefile.am.orig	2017-04-08 12:22:50.192861523 +0000
++++ b/embed/Makefile.am	2017-04-08 12:23:13.926290709 +0000
+@@ -61,6 +61,7 @@
+ 	-I$(top_srcdir)/lib/widgets		\
+ 	-I$(top_srcdir)/libgd			\
+ 	-DPKGDATADIR=\"$(pkgdatadir)\"		\
++	-DEPHY_PLUGINS_DIR=\""$(libdir)/epiphany/plugins"\" \
+ 	-DEPHY_WEB_EXTENSIONS_DIR=\"$(pkglibdir)/web-extensions\"	\
+ 	$(GDK_CFLAGS)				\
+ 	$(GIO_CFLAGS)				\