Date: Saturday, April 8, 2017 @ 21:58:31
Author: jgc
Revision: 292524
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added:
epiphany/repos/gnome-unstable-i686/
epiphany/repos/gnome-unstable-i686/PKGBUILD
(from rev 292523, epiphany/trunk/PKGBUILD)
epiphany/repos/gnome-unstable-i686/pluginsdir.diff
(from rev 292523, epiphany/trunk/pluginsdir.diff)
epiphany/repos/gnome-unstable-x86_64/
epiphany/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 292523, epiphany/trunk/PKGBUILD)
epiphany/repos/gnome-unstable-x86_64/pluginsdir.diff
(from rev 292523, epiphany/trunk/pluginsdir.diff)
---------------------------------------+
gnome-unstable-i686/PKGBUILD | 56 ++++++++++++++++++++++++++++++++
gnome-unstable-i686/pluginsdir.diff | 20 +++++++++++
gnome-unstable-x86_64/PKGBUILD | 56 ++++++++++++++++++++++++++++++++
gnome-unstable-x86_64/pluginsdir.diff | 20 +++++++++++
4 files changed, 152 insertions(+)
Copied: epiphany/repos/gnome-unstable-i686/PKGBUILD (from rev 292523,
epiphany/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD (rev 0)
+++ gnome-unstable-i686/PKGBUILD 2017-04-08 21:58:31 UTC (rev 292524)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+
+pkgname=epiphany
+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";
+arch=(i686 x86_64)
+license=(GPL)
+depends=(webkit2gtk gcr gnome-desktop)
+makedepends=(intltool itstool docbook-xml startup-notification lsb-release
+ gobject-introspection yelp-tools autoconf-archive appstream-glib
git)
+groups=(gnome)
+_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'
+ 'SKIP'
+ '3bbd4b36e697a3a9165e0b71d5af566fe96a8f1237d854b9dee9a7e0b9fef8e3')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+ patch -Np1 -i ../pluginsdir.diff
+
+ 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
+}
+
+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
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+}
Copied: epiphany/repos/gnome-unstable-i686/pluginsdir.diff (from rev 292523,
epiphany/trunk/pluginsdir.diff)
===================================================================
--- gnome-unstable-i686/pluginsdir.diff (rev 0)
+++ gnome-unstable-i686/pluginsdir.diff 2017-04-08 21:58:31 UTC (rev 292524)
@@ -0,0 +1,20 @@
+--- 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);
+
+ 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);
+ }
+
+--- 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) \
Copied: epiphany/repos/gnome-unstable-x86_64/PKGBUILD (from rev 292523,
epiphany/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD 2017-04-08 21:58:31 UTC (rev 292524)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+
+pkgname=epiphany
+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";
+arch=(i686 x86_64)
+license=(GPL)
+depends=(webkit2gtk gcr gnome-desktop)
+makedepends=(intltool itstool docbook-xml startup-notification lsb-release
+ gobject-introspection yelp-tools autoconf-archive appstream-glib
git)
+groups=(gnome)
+_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'
+ 'SKIP'
+ '3bbd4b36e697a3a9165e0b71d5af566fe96a8f1237d854b9dee9a7e0b9fef8e3')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+ patch -Np1 -i ../pluginsdir.diff
+
+ 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
+}
+
+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
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+}
Copied: epiphany/repos/gnome-unstable-x86_64/pluginsdir.diff (from rev 292523,
epiphany/trunk/pluginsdir.diff)
===================================================================
--- gnome-unstable-x86_64/pluginsdir.diff (rev 0)
+++ gnome-unstable-x86_64/pluginsdir.diff 2017-04-08 21:58:31 UTC (rev
292524)
@@ -0,0 +1,20 @@
+--- 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);
+
+ 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);
+ }
+
+--- 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) \
