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

2018-09-05 Thread Jan Steffens via arch-commits 
Date: Wednesday, September 5, 2018 @ 20:47:04
  Author: heftig
Revision: 333559

3.30.0+8+g619f63050-1

Modified:
  epiphany/trunk/PKGBUILD   (contents, properties)
Deleted:
  epiphany/trunk/pluginsdir.diff

-+
 PKGBUILD|   29 -
 pluginsdir.diff |   28 
 2 files changed, 16 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-05 20:39:17 UTC (rev 333558)
+++ PKGBUILD2018-09-05 20:47:04 UTC (rev 333559)
@@ -1,22 +1,21 @@
-# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) 
 # Maintainer: Jan de Groot 
 
 pkgname=epiphany
-pkgver=3.28.3.1
-pkgrel=2
+pkgver=3.30.0+8+g619f63050
+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 icu)
-makedepends=(itstool docbook-xml startup-notification lsb-release
- gobject-introspection yelp-tools appstream-glib git meson)
+depends=(webkit2gtk gcr icu libdazzle)
+makedepends=(docbook-xml startup-notification lsb-release 
gobject-introspection yelp-tools
+ appstream-glib git meson)
+checkdepends=(xorg-server-xvfb)
 groups=(gnome)
-_commit=a5a9a7e2904e2206b3cc863ab13748255247e3eb  # tags/3.28.3.1^0
-source=("git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit;
-pluginsdir.diff)
-sha256sums=('SKIP'
-'b6c8ee6ace934c053f2fd89758e0b587cb8953c6b0246c1359aecaae4de70289')
+_commit=619f63050fe60a74cff7f9bec3d430316ef06371  # 
environments/review-gnome-3-30-hx4v5k/deployments/58
+source=("git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit;)
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -25,7 +24,6 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../pluginsdir.diff
 }
 
 build() {
@@ -34,6 +32,11 @@
   ninja -C build
 }
 
+check() {
+  # 
ERROR:../epiphany/tests/ephy-web-app-utils-test.c:109:test_web_app_lifetime: 
assertion failed (g_list_length (apps) == 1): (0 == 1)
+  xvfb-run meson test -C build || :
+}
+
 package() {
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" meson install -C build
 }


Property changes on: epiphany/trunk/PKGBUILD
___
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Deleted: pluginsdir.diff
===
--- pluginsdir.diff 2018-09-05 20:39:17 UTC (rev 333558)
+++ pluginsdir.diff 2018-09-05 20:47:04 UTC (rev 333559)
@@ -1,28 +0,0 @@
- embed/ephy-embed-shell.c | 1 +
- meson.build  | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git c/embed/ephy-embed-shell.c i/embed/ephy-embed-shell.c
-index b4837f834..1b5012bae 100644
 c/embed/ephy-embed-shell.c
-+++ i/embed/ephy-embed-shell.c
-@@ -910,6 +910,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);
- }
- 
-diff --git c/meson.build i/meson.build
-index a4a8a36b7..0c98f6c36 100644
 c/meson.build
-+++ i/meson.build
-@@ -25,6 +25,7 @@ conf = configuration_data()
- 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)

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

2018-03-14 Thread Jan Steffens via arch-commits 
Date: Wednesday, March 14, 2018 @ 20:31:23
  Author: heftig
Revision: 319115

3.28.0.1+4+g051d4f616-1

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

-+
 PKGBUILD|   30 +-
 pluginsdir.diff |   20 ++--
 2 files changed, 23 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-14 20:31:22 UTC (rev 319114)
+++ PKGBUILD2018-03-14 20:31:23 UTC (rev 319115)
@@ -2,25 +2,21 @@
 # Maintainer: Jan de Groot 
 
 pkgname=epiphany
-pkgver=3.26.6
+pkgver=3.28.0.1+4+g051d4f616
 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)
+depends=(webkit2gtk gcr libdazzle icu libhttpseverywhere)
 makedepends=(itstool docbook-xml startup-notification lsb-release
  gobject-introspection yelp-tools appstream-glib git meson)
 groups=(gnome)
-_commit=0b74e24c3ff3bd7641e90ee97ff44abf949606e5  # tags/3.26.6^0
+_commit=051d4f6167651a2de54b5822c5f968f4c236079d  # gnome-3-28
 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')
+'b6c8ee6ace934c053f2fd89758e0b587cb8953c6b0246c1359aecaae4de70289')
 
 pkgver() {
   cd $pkgname
@@ -28,25 +24,17 @@
 }
 
 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
+  arch-meson $pkgname build \
+-D https_everywhere=true \
+-D distributor_name="Arch Linux®"
+  ninja -C build
 }
 
 package() {
-  cd build
-  DESTDIR="$pkgdir" ninja install
+  DESTDIR="$pkgdir" ninja -C build install
 }

Modified: pluginsdir.diff
===
--- pluginsdir.diff 2018-03-14 20:31:22 UTC (rev 319114)
+++ pluginsdir.diff 2018-03-14 20:31:23 UTC (rev 319115)
@@ -1,6 +1,12 @@
 a/embed/ephy-embed-shell.c
-+++ b/embed/ephy-embed-shell.c
-@@ -671,6 +671,7 @@ ephy_embed_shell_create_web_context (EphyEmbedShell *shell)
+ embed/ephy-embed-shell.c | 1 +
+ meson.build  | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git c/embed/ephy-embed-shell.c i/embed/ephy-embed-shell.c
+index b4837f834..1b5012bae 100644
+--- c/embed/ephy-embed-shell.c
 i/embed/ephy-embed-shell.c
+@@ -910,6 +910,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);
@@ -8,9 +14,11 @@
g_object_unref (manager);
  }
  
 a/meson.build  2017-09-18 11:49:28.745287692 +
-+++ b/meson.build  2017-09-18 11:52:53.432417200 +
-@@ -25,6 +25,7 @@
+diff --git c/meson.build i/meson.build
+index a4a8a36b7..0c98f6c36 100644
+--- c/meson.build
 i/meson.build
+@@ -25,6 +25,7 @@ conf = configuration_data()
  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)

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

2017-09-18 Thread 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
===
--- PKGBUILD2017-09-18 12:56:01 UTC (rev 305795)
+++ PKGBUILD2017-09-18 12:59:51 UTC (rev 305796)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 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 +
-+++ b/embed/Makefile.am2017-04-08 12:23:13.926290709 +
-@@ -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 +
 b/meson.build  2017-09-18 11:52:53.432417200 +
+@@ -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)

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

2017-04-08 Thread 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
===
--- PKGBUILD2017-04-08 20:35:43 UTC (rev 292522)
+++ PKGBUILD2017-04-08 21:58:27 UTC (rev 292523)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 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 +
 b/embed/Makefile.am2017-04-08 12:23:13.926290709 +
+@@ -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)   \

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

2016-08-11 Thread Jan Steffens 
Date: Thursday, August 11, 2016 @ 11:56:00
  Author: heftig
Revision: 273592

3.20.3-2: Create a plugin dir that only Epiphany will find

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

-+
 PKGBUILD|   14 +++---
 pluginsdir.diff |   28 
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-11 10:27:57 UTC (rev 273591)
+++ PKGBUILD2016-08-11 11:56:00 UTC (rev 273592)
@@ -3,7 +3,7 @@
 
 pkgname=epiphany
 pkgver=3.20.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A GNOME web browser based on the WebKit rendering engine"
 url="https://wiki.gnome.org/Apps/Web;
 arch=(i686 x86_64)
@@ -14,9 +14,17 @@
  gobject-introspection)
 options=(!emptydirs)
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4d9de1bdb44c14adf25aa6dc02ea3de60925cff5eb01fe89545e6032c9b424a2')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+pluginsdir.diff)
+sha256sums=('4d9de1bdb44c14adf25aa6dc02ea3de60925cff5eb01fe89545e6032c9b424a2'
+'42a7b820fd659fee8508a9b9a57e385c658b3b312c7a8f9456078223e4d78f22')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../pluginsdir.diff
+  autoreconf -fvi
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \

Added: pluginsdir.diff
===
--- pluginsdir.diff (rev 0)
+++ pluginsdir.diff 2016-08-11 11:56:00 UTC (rev 273592)
@@ -0,0 +1,28 @@
+ 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
+@@ -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);
+ }
+