[arch-commits] Commit in epiphany/repos (8 files)
Jan Steffens
heftig at archlinux.org
Wed Oct 12 16:53:05 UTC 2016
Date: Wednesday, October 12, 2016 @ 16:53:04
Author: heftig
Revision: 278499
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
epiphany/repos/extra-i686/PKGBUILD
(from rev 278498, epiphany/trunk/PKGBUILD)
epiphany/repos/extra-i686/pluginsdir.diff
(from rev 278498, epiphany/trunk/pluginsdir.diff)
epiphany/repos/extra-x86_64/PKGBUILD
(from rev 278498, epiphany/trunk/PKGBUILD)
epiphany/repos/extra-x86_64/pluginsdir.diff
(from rev 278498, epiphany/trunk/pluginsdir.diff)
Deleted:
epiphany/repos/extra-i686/PKGBUILD
epiphany/repos/extra-i686/pluginsdir.diff
epiphany/repos/extra-x86_64/PKGBUILD
epiphany/repos/extra-x86_64/pluginsdir.diff
------------------------------+
/PKGBUILD | 108 +++++++++++++++++++++++++++++++++++++++++
/pluginsdir.diff | 56 +++++++++++++++++++++
extra-i686/PKGBUILD | 47 -----------------
extra-i686/pluginsdir.diff | 28 ----------
extra-x86_64/PKGBUILD | 47 -----------------
extra-x86_64/pluginsdir.diff | 28 ----------
6 files changed, 164 insertions(+), 150 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-10-12 16:51:11 UTC (rev 278498)
+++ extra-i686/PKGBUILD 2016-10-12 16:53:04 UTC (rev 278499)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=epiphany
-pkgver=3.22.0+6+gdbb6b80
-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=(libsoup libnotify gsettings-desktop-schemas webkit2gtk nss iso-codes
- dconf gcr gnome-desktop libwnck3 gnome-themes-standard)
-makedepends=(intltool itstool docbook-xml startup-notification
- gobject-introspection yelp-tools autoconf-archive appstream-glib git)
-groups=(gnome)
-_commit=dbb6b80fda3d68a5bf2a2d13a674b3c3007480b5 # gnome-3-22
-source=("git://git.gnome.org/epiphany#commit=$_commit"
- pluginsdir.diff)
-sha256sums=('SKIP'
- '42a7b820fd659fee8508a9b9a57e385c658b3b312c7a8f9456078223e4d78f22')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $pkgname
- patch -Np1 -i ../pluginsdir.diff
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --libexecdir=/usr/lib/$pkgname
-
- # 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/extra-i686/PKGBUILD (from rev 278498, epiphany/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-10-12 16:53:04 UTC (rev 278499)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=epiphany
+pkgver=3.22.1+5+g5d281a8
+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=(libsoup libnotify gsettings-desktop-schemas webkit2gtk nss iso-codes
+ dconf gcr gnome-desktop libwnck3 gnome-themes-standard)
+makedepends=(intltool itstool docbook-xml startup-notification
+ gobject-introspection yelp-tools autoconf-archive appstream-glib git)
+groups=(gnome)
+_commit=5d281a891b956ad714ce91d37c64438eadeca7bc # gnome-3-22
+source=("git://git.gnome.org/epiphany#commit=$_commit"
+ "git://git.gnome.org/libgd"
+ pluginsdir.diff)
+sha256sums=('SKIP'
+ 'SKIP'
+ '42a7b820fd659fee8508a9b9a57e385c658b3b312c7a8f9456078223e4d78f22')
+
+pkgver() {
+ cd $pkgname
+
+ git submodule init
+ git config --local submodule.libgd.url "$srcdir/libgd"
+ git submodule update
+
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+ patch -Np1 -i ../pluginsdir.diff
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --libexecdir=/usr/lib/$pkgname
+
+ # 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
+}
Deleted: extra-i686/pluginsdir.diff
===================================================================
--- extra-i686/pluginsdir.diff 2016-10-12 16:51:11 UTC (rev 278498)
+++ extra-i686/pluginsdir.diff 2016-10-12 16:53:04 UTC (rev 278499)
@@ -1,28 +0,0 @@
- 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);
- }
-
Copied: epiphany/repos/extra-i686/pluginsdir.diff (from rev 278498, epiphany/trunk/pluginsdir.diff)
===================================================================
--- extra-i686/pluginsdir.diff (rev 0)
+++ extra-i686/pluginsdir.diff 2016-10-12 16:53:04 UTC (rev 278499)
@@ -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);
+ }
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-10-12 16:51:11 UTC (rev 278498)
+++ extra-x86_64/PKGBUILD 2016-10-12 16:53:04 UTC (rev 278499)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=epiphany
-pkgver=3.22.0+6+gdbb6b80
-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=(libsoup libnotify gsettings-desktop-schemas webkit2gtk nss iso-codes
- dconf gcr gnome-desktop libwnck3 gnome-themes-standard)
-makedepends=(intltool itstool docbook-xml startup-notification
- gobject-introspection yelp-tools autoconf-archive appstream-glib git)
-groups=(gnome)
-_commit=dbb6b80fda3d68a5bf2a2d13a674b3c3007480b5 # gnome-3-22
-source=("git://git.gnome.org/epiphany#commit=$_commit"
- pluginsdir.diff)
-sha256sums=('SKIP'
- '42a7b820fd659fee8508a9b9a57e385c658b3b312c7a8f9456078223e4d78f22')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $pkgname
- patch -Np1 -i ../pluginsdir.diff
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --libexecdir=/usr/lib/$pkgname
-
- # 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/extra-x86_64/PKGBUILD (from rev 278498, epiphany/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-10-12 16:53:04 UTC (rev 278499)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=epiphany
+pkgver=3.22.1+5+g5d281a8
+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=(libsoup libnotify gsettings-desktop-schemas webkit2gtk nss iso-codes
+ dconf gcr gnome-desktop libwnck3 gnome-themes-standard)
+makedepends=(intltool itstool docbook-xml startup-notification
+ gobject-introspection yelp-tools autoconf-archive appstream-glib git)
+groups=(gnome)
+_commit=5d281a891b956ad714ce91d37c64438eadeca7bc # gnome-3-22
+source=("git://git.gnome.org/epiphany#commit=$_commit"
+ "git://git.gnome.org/libgd"
+ pluginsdir.diff)
+sha256sums=('SKIP'
+ 'SKIP'
+ '42a7b820fd659fee8508a9b9a57e385c658b3b312c7a8f9456078223e4d78f22')
+
+pkgver() {
+ cd $pkgname
+
+ git submodule init
+ git config --local submodule.libgd.url "$srcdir/libgd"
+ git submodule update
+
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+ patch -Np1 -i ../pluginsdir.diff
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --libexecdir=/usr/lib/$pkgname
+
+ # 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
+}
Deleted: extra-x86_64/pluginsdir.diff
===================================================================
--- extra-x86_64/pluginsdir.diff 2016-10-12 16:51:11 UTC (rev 278498)
+++ extra-x86_64/pluginsdir.diff 2016-10-12 16:53:04 UTC (rev 278499)
@@ -1,28 +0,0 @@
- 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);
- }
-
Copied: epiphany/repos/extra-x86_64/pluginsdir.diff (from rev 278498, epiphany/trunk/pluginsdir.diff)
===================================================================
--- extra-x86_64/pluginsdir.diff (rev 0)
+++ extra-x86_64/pluginsdir.diff 2016-10-12 16:53:04 UTC (rev 278499)
@@ -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);
+ }
+
More information about the arch-commits
mailing list