commit: 8b8539fb4af81892dda144e6a11a7782da569664
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 15:25:06 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 10 15:57:15 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8b8539fb
www-client/epiphany: 3.14.2 → 3.16.0
...epiphany-9999.ebuild => epiphany-3.16.0.ebuild} | 37 +++++++++++-----------
www-client/epiphany/epiphany-9999.ebuild | 10 +++---
...st-1.patch => epiphany-3.16.0-unittest-1.patch} | 20 ++++++------
3 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/www-client/epiphany/epiphany-9999.ebuild
b/www-client/epiphany/epiphany-3.16.0.ebuild
similarity index 74%
copy from www-client/epiphany/epiphany-9999.ebuild
copy to www-client/epiphany/epiphany-3.16.0.ebuild
index ccd3c47..586636f 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-3.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,23 +6,16 @@ EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
-inherit eutils gnome2 pax-utils versionator virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
+inherit autotools eutils gnome2 pax-utils versionator virtualx
DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/";
+HOMEPAGE="https://wiki.gnome.org/Apps/Web";
# TODO: coverage
LICENSE="GPL-2"
SLOT="0"
IUSE="+jit +nss test"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
COMMON_DEPEND="
>=app-crypt/gcr-3.5.5
@@ -33,7 +26,7 @@ COMMON_DEPEND="
>=dev-libs/libxslt-1.1.7
>=gnome-base/gsettings-desktop-schemas-0.0.1
>=net-dns/avahi-0.6.22[dbus]
- >=net-libs/webkit-gtk-2.5.90:4[jit?]
+ >=net-libs/webkit-gtk-2.7.4:4[jit?]
>=net-libs/libsoup-2.48:2.4
>=x11-libs/gtk+-3.13:3
>=x11-libs/libnotify-0.5.1:=
@@ -55,25 +48,33 @@ RDEPEND="${COMMON_DEPEND}
# paxctl needed for bug #407085
# eautoreconf requires gnome-common-3.5.5
DEPEND="${COMMON_DEPEND}
+ >=gnome-base/gnome-common-3.6
>=dev-util/intltool-0.50
sys-apps/paxctl
sys-devel/gettext
virtual/pkgconfig
"
-if [[ ${PV} == 9999 ]]; then
- DEPEND="${DEPEND} app-text/yelp-tools"
-fi
+
+src_prepare() {
+ # Fix missing symbol in webextension.so, bug #728972
+ epatch "${FILESDIR}"/${PN}-3.14.0-missing-symbol.patch
+
+ # Fix unittests
+ epatch "${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
+ epatch "${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
src_configure() {
- local myconf=""
- [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
gnome2_src_configure \
--enable-shared \
--disable-static \
--with-distributor-name=Gentoo \
$(use_enable nss) \
$(use_enable test tests) \
- ${myconf}
+ ITSTOOL=$(type -P true)
}
src_compile() {
diff --git a/www-client/epiphany/epiphany-9999.ebuild
b/www-client/epiphany/epiphany-9999.ebuild
index ccd3c47..16aa1d6 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
fi
DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/";
+HOMEPAGE="https://wiki.gnome.org/Apps/Web";
# TODO: coverage
LICENSE="GPL-2"
@@ -33,7 +33,7 @@ COMMON_DEPEND="
>=dev-libs/libxslt-1.1.7
>=gnome-base/gsettings-desktop-schemas-0.0.1
>=net-dns/avahi-0.6.22[dbus]
- >=net-libs/webkit-gtk-2.5.90:4[jit?]
+ >=net-libs/webkit-gtk-2.7.4:4[jit?]
>=net-libs/libsoup-2.48:2.4
>=x11-libs/gtk+-3.13:3
>=x11-libs/libnotify-0.5.1:=
@@ -61,7 +61,9 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
if [[ ${PV} == 9999 ]]; then
- DEPEND="${DEPEND} app-text/yelp-tools"
+ DEPEND="${DEPEND}
+ app-text/yelp-tools
+ >=gnome-base/gnome-common-3.6"
fi
src_configure() {
diff --git a/www-client/epiphany/files/epiphany-3.14.0-unittest-1.patch
b/www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch
similarity index 64%
rename from www-client/epiphany/files/epiphany-3.14.0-unittest-1.patch
rename to www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch
index 3b948a5..baa8a42 100644
--- a/www-client/epiphany/files/epiphany-3.14.0-unittest-1.patch
+++ b/www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch
@@ -1,6 +1,6 @@
-From ddf0dea8e4eb5fe263ddc85d661ce58e55dd554f Mon Sep 17 00:00:00 2001
+From 7ed4a68e2106480f0984703f70b7c25734803161 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <[email protected]>
-Date: Sun, 19 Oct 2014 23:03:02 +0200
+Date: Sun, 10 May 2015 17:35:57 +0200
Subject: [PATCH 2/3] Gentoo tests run in ${PORTAGE_TMPDIR} which is not
guaranteed to be /tmp
@@ -9,22 +9,22 @@ Subject: [PATCH 2/3] Gentoo tests run in ${PORTAGE_TMPDIR}
which is not
1 file changed, 5 deletions(-)
diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
-index c33c1da..bdf7455 100644
+index 43d0009..0fcb585 100644
--- a/tests/ephy-file-helpers-test.c
+++ b/tests/ephy-file-helpers-test.c
-@@ -92,12 +92,7 @@ test_ephy_file_helpers_init (void)
- GFile *file;
+@@ -89,12 +89,7 @@ test_ephy_file_helpers_init (void)
- file = g_file_new_for_path (tmp_dir);
+ /* Cleanup dir left behind. */
+ if (keep_dir) {
- /* As a safety measure, only try recursive delete on paths
- * prefixed with /tmp. */
- if (g_str_has_prefix (tmp_dir, "/tmp"))
- g_assert (ephy_file_delete_dir_recursively (file, NULL));
+ g_assert (ephy_file_delete_dir_recursively (tmp_dir, NULL));
- else
- g_warning ("INIT: dangerous path returned as tmp_dir: %s", tmp_dir);
-
- g_object_unref (file);
}
+
+ g_free (tmp_dir);
--
-2.1.2
+2.3.6
