[arch-commits] Commit in epiphany/repos/extra-x86_64 (4 files)

[Jan Steffens]

    Date: Thursday, December 21, 2017 @ 23:13:18
  Author: heftig
Revision: 313511

archrelease: copy trunk to extra-x86_64

Added:
  epiphany/repos/extra-x86_64/PKGBUILD
    (from rev 313510, epiphany/trunk/PKGBUILD)
  epiphany/repos/extra-x86_64/pluginsdir.diff
    (from rev 313510, epiphany/trunk/pluginsdir.diff)
Deleted:
  epiphany/repos/extra-x86_64/PKGBUILD
  epiphany/repos/extra-x86_64/pluginsdir.diff

-----------------+
 PKGBUILD        |  104 +++++++++++++++++++++++++++---------------------------
 pluginsdir.diff |   40 ++++++++++----------
 2 files changed, 72 insertions(+), 72 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-21 23:12:33 UTC (rev 313510)
+++ PKGBUILD	2017-12-21 23:13:18 UTC (rev 313511)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=epiphany
-pkgver=3.26.5
-pkgrel=1
-pkgdesc="A GNOME web browser based on the WebKit rendering engine"
-url="https://wiki.gnome.org/Apps/Web"
-arch=(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=7d46f6af21101c0957fa00e5eabb187131434acf  # tags/3.26.5^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
-}

Copied: epiphany/repos/extra-x86_64/PKGBUILD (from rev 313510, epiphany/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-12-21 23:13:18 UTC (rev 313511)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=epiphany
+pkgver=3.26.5.1
+pkgrel=1
+pkgdesc="A GNOME web browser based on the WebKit rendering engine"
+url="https://wiki.gnome.org/Apps/Web"
+arch=(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=086d247df945d2948043a6d5cee5d9042326ee0c  # tags/3.26.5.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: pluginsdir.diff
===================================================================
--- pluginsdir.diff	2017-12-21 23:12:33 UTC (rev 313510)
+++ pluginsdir.diff	2017-12-21 23:13:18 UTC (rev 313511)
@@ -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/extra-x86_64/pluginsdir.diff (from rev 313510, epiphany/trunk/pluginsdir.diff)
===================================================================
--- pluginsdir.diff	                        (rev 0)
+++ pluginsdir.diff	2017-12-21 23:13:18 UTC (rev 313511)
@@ -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)