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

[Jan de Groot]

    Date: Monday, September 18, 2017 @ 12:59:51
  Author: jgc
Revision: 305796

upgpkg: epiphany 3.26.0+11+ga24a88175-1

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

-----------------+
 PKGBUILD        |   28 ++++++++++++----------------
 pluginsdir.diff |   20 ++++++++++----------
 2 files changed, 22 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-18 12:56:01 UTC (rev 305795)
+++ PKGBUILD	2017-09-18 12:59:51 UTC (rev 305796)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=epiphany
-pkgver=3.24.3
+pkgver=3.26.0+11+ga24a88175
 pkgrel=1
 pkgdesc="A GNOME web browser based on the WebKit rendering engine"
 url="https://wiki.gnome.org/Apps/Web"
@@ -9,10 +9,10 @@
 arch=(i686 x86_64)
 license=(GPL)
 depends=(webkit2gtk gcr gnome-desktop icu)
-makedepends=(intltool itstool docbook-xml startup-notification lsb-release
-             gobject-introspection yelp-tools autoconf-archive appstream-glib git)
+makedepends=(itstool docbook-xml startup-notification lsb-release
+             gobject-introspection yelp-tools appstream-glib git meson)
 groups=(gnome)
-_commit=43489a7d54b89a45709fadd6a90d0e99cf0dc45d  # tags/3.24.3^0
+_commit=a24a88175df9cc7b37f8870d9726bbc7b5d20546  # gnome-3-26
 source=("git+https://git.gnome.org/browse/epiphany#commit=$_commit"
         "git+https://git.gnome.org/browse/libgd"
         "git+https://git.gnome.org/browse/gvdb"
@@ -20,7 +20,7 @@
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
-            '3bbd4b36e697a3a9165e0b71d5af566fe96a8f1237d854b9dee9a7e0b9fef8e3')
+            '0e4db79fe22a4ed447aa926eecd09fc660cf2f5aac2d42aa9adaacad45416faf')
 
 pkgver() {
   cd $pkgname
@@ -28,7 +28,9 @@
 }
 
 prepare() {
+  mkdir build
   cd $pkgname
+
   patch -Np1 -i ../pluginsdir.diff
 
   git submodule init
@@ -36,21 +38,15 @@
   git config --local submodule.gvdb.url "$srcdir/gvdb"
   git submodule update
 
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --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
-
-  make
+  cd build
+  meson setup --prefix=/usr --libexecdir=/usr/lib --buildtype=release ../$pkgname
+  ninja
 }
 
 package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
+  cd build
+  DESTDIR="$pkgdir" ninja install
 }

Modified: pluginsdir.diff
===================================================================
--- pluginsdir.diff	2017-09-18 12:56:01 UTC (rev 305795)
+++ pluginsdir.diff	2017-09-18 12:59:51 UTC (rev 305796)
@@ -8,13 +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)				\
+--- 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 @@
+ 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)