Date: Friday, September 29, 2017 @ 18:20:07 Author: heftig Revision: 306477
archrelease: copy trunk to testing-i686, testing-x86_64 Added: epiphany/repos/testing-i686/PKGBUILD (from rev 306476, epiphany/trunk/PKGBUILD) epiphany/repos/testing-i686/pluginsdir.diff (from rev 306476, epiphany/trunk/pluginsdir.diff) epiphany/repos/testing-x86_64/PKGBUILD (from rev 306476, epiphany/trunk/PKGBUILD) epiphany/repos/testing-x86_64/pluginsdir.diff (from rev 306476, epiphany/trunk/pluginsdir.diff) Deleted: epiphany/repos/testing-i686/PKGBUILD epiphany/repos/testing-i686/pluginsdir.diff epiphany/repos/testing-x86_64/PKGBUILD epiphany/repos/testing-x86_64/pluginsdir.diff --------------------------------+ /PKGBUILD | 104 +++++++++++++++++++++++++++++++++++++++ /pluginsdir.diff | 40 +++++++++++++++ testing-i686/PKGBUILD | 52 ------------------- testing-i686/pluginsdir.diff | 20 ------- testing-x86_64/PKGBUILD | 52 ------------------- testing-x86_64/pluginsdir.diff | 20 ------- 6 files changed, 144 insertions(+), 144 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2017-09-29 18:18:58 UTC (rev 306476) +++ testing-i686/PKGBUILD 2017-09-29 18:20:07 UTC (rev 306477) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=epiphany -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" -arch=(i686 x86_64) -license=(GPL) -depends=(webkit2gtk gcr gnome-desktop icu) -makedepends=(itstool docbook-xml startup-notification lsb-release - gobject-introspection yelp-tools appstream-glib git meson) -groups=(gnome) -_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" - pluginsdir.diff) -sha256sums=('SKIP' - 'SKIP' - 'SKIP' - '0e4db79fe22a4ed447aa926eecd09fc660cf2f5aac2d42aa9adaacad45416faf') - -pkgver() { - cd $pkgname - git describe --tags | sed 's/-/+/g' -} - -prepare() { - mkdir build - 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 - -} - -build() { - cd build - meson setup --prefix=/usr --libexecdir=/usr/lib --buildtype=release ../$pkgname - ninja -} - -package() { - cd build - DESTDIR="$pkgdir" ninja install -} Copied: epiphany/repos/testing-i686/PKGBUILD (from rev 306476, epiphany/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2017-09-29 18:20:07 UTC (rev 306477) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=epiphany +pkgver=3.26.1 +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 icu) +makedepends=(itstool docbook-xml startup-notification lsb-release + gobject-introspection yelp-tools appstream-glib git meson) +groups=(gnome) +_commit=70755404799e4393bf5605c9debec6877acf0177 # tags/3.26.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) +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + '0e4db79fe22a4ed447aa926eecd09fc660cf2f5aac2d42aa9adaacad45416faf') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + +prepare() { + mkdir build + 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 + +} + +build() { + cd build + arch-meson ../$pkgname -Ddistributor_name="Arch Linux®" + ninja +} + +package() { + cd build + DESTDIR="$pkgdir" ninja install +} Deleted: testing-i686/pluginsdir.diff =================================================================== --- testing-i686/pluginsdir.diff 2017-09-29 18:18:58 UTC (rev 306476) +++ testing-i686/pluginsdir.diff 2017-09-29 18:20:07 UTC (rev 306477) @@ -1,20 +0,0 @@ ---- 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/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) Copied: epiphany/repos/testing-i686/pluginsdir.diff (from rev 306476, epiphany/trunk/pluginsdir.diff) =================================================================== --- testing-i686/pluginsdir.diff (rev 0) +++ testing-i686/pluginsdir.diff 2017-09-29 18:20:07 UTC (rev 306477) @@ -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/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) Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2017-09-29 18:18:58 UTC (rev 306476) +++ testing-x86_64/PKGBUILD 2017-09-29 18:20:07 UTC (rev 306477) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=epiphany -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" -arch=(i686 x86_64) -license=(GPL) -depends=(webkit2gtk gcr gnome-desktop icu) -makedepends=(itstool docbook-xml startup-notification lsb-release - gobject-introspection yelp-tools appstream-glib git meson) -groups=(gnome) -_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" - pluginsdir.diff) -sha256sums=('SKIP' - 'SKIP' - 'SKIP' - '0e4db79fe22a4ed447aa926eecd09fc660cf2f5aac2d42aa9adaacad45416faf') - -pkgver() { - cd $pkgname - git describe --tags | sed 's/-/+/g' -} - -prepare() { - mkdir build - 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 - -} - -build() { - cd build - meson setup --prefix=/usr --libexecdir=/usr/lib --buildtype=release ../$pkgname - ninja -} - -package() { - cd build - DESTDIR="$pkgdir" ninja install -} Copied: epiphany/repos/testing-x86_64/PKGBUILD (from rev 306476, epiphany/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2017-09-29 18:20:07 UTC (rev 306477) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=epiphany +pkgver=3.26.1 +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 icu) +makedepends=(itstool docbook-xml startup-notification lsb-release + gobject-introspection yelp-tools appstream-glib git meson) +groups=(gnome) +_commit=70755404799e4393bf5605c9debec6877acf0177 # tags/3.26.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) +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + '0e4db79fe22a4ed447aa926eecd09fc660cf2f5aac2d42aa9adaacad45416faf') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + +prepare() { + mkdir build + 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 + +} + +build() { + cd build + arch-meson ../$pkgname -Ddistributor_name="Arch Linux®" + ninja +} + +package() { + cd build + DESTDIR="$pkgdir" ninja install +} Deleted: testing-x86_64/pluginsdir.diff =================================================================== --- testing-x86_64/pluginsdir.diff 2017-09-29 18:18:58 UTC (rev 306476) +++ testing-x86_64/pluginsdir.diff 2017-09-29 18:20:07 UTC (rev 306477) @@ -1,20 +0,0 @@ ---- 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/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) Copied: epiphany/repos/testing-x86_64/pluginsdir.diff (from rev 306476, epiphany/trunk/pluginsdir.diff) =================================================================== --- testing-x86_64/pluginsdir.diff (rev 0) +++ testing-x86_64/pluginsdir.diff 2017-09-29 18:20:07 UTC (rev 306477) @@ -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/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)