[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/files/, www-client/epiphany/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/gnome:master commit in: www-client/epiphany/files/, www-client/epiphany/
@ 2011-10-19  8:24 Alexandre Restovtsev
  0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Restovtsev @ 2011-10-19  8:24 UTC (permalink / raw
  To: gentoo-commits

commit:     1f21111b5fe22a8d627f4428ce1ce5f746321c45
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Oct 19 08:14:43 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Oct 19 08:14:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1f21111b

www-client/epiphany: 3.2.0 → 3.2.1

Bump, patch was applied upstream.

---
 ...epiphany-3.2.0.ebuild => epiphany-3.2.1.ebuild} |    3 --
 .../epiphany-3.2.0-networkmanager-crash.patch      |   31 --------------------
 2 files changed, 0 insertions(+), 34 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.2.0.ebuild b/www-client/epiphany/epiphany-3.2.1.ebuild
similarity index 95%
rename from www-client/epiphany/epiphany-3.2.0.ebuild
rename to www-client/epiphany/epiphany-3.2.1.ebuild
index 08c4fc7..95b0ea4 100644
--- a/www-client/epiphany/epiphany-3.2.0.ebuild
+++ b/www-client/epiphany/epiphany-3.2.1.ebuild
@@ -78,9 +78,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Upstream patch to fix a crash, will be in next release
-	epatch "${FILESDIR}/${P}-networkmanager-crash.patch"
-
 	# Make networkmanager optional for prefix people
 	epatch "${FILESDIR}/${PN}-3.2.0-optional-networkmanager.patch"
 	gnome2_src_prepare

diff --git a/www-client/epiphany/files/epiphany-3.2.0-networkmanager-crash.patch b/www-client/epiphany/files/epiphany-3.2.0-networkmanager-crash.patch
deleted file mode 100644
index 0742af3..0000000
--- a/www-client/epiphany/files/epiphany-3.2.0-networkmanager-crash.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1cb7fb1109aecedd224d03fda202165adf3423a7 Mon Sep 17 00:00:00 2001
-From: Ionut Biru <ibiru@archlinux.org>
-Date: Mon, 26 Sep 2011 18:12:40 +0000
-Subject: Don't crash when network manager is not available
-
-https://bugzilla.gnome.org/show_bug.cgi?id=659103
-
-Signed-off-by: Ionut Biru <ibiru@archlinux.org>
----
-diff --git a/src/ephy-shell.c b/src/ephy-shell.c
-index bf8eb18..c436da1 100644
---- a/src/ephy-shell.c
-+++ b/src/ephy-shell.c
-@@ -470,10 +470,11 @@ impl_get_embed_single (EphyEmbedShell *embed_shell)
-     priv->embed_single_connected = TRUE;
- 
-     /* Now we need the net monitor   */
--    ephy_shell_get_net_monitor (shell);
--    ephy_shell_sync_network_status (priv->nm_proxy,
--                                    ephy_network_manager_get_state (priv->nm_proxy),
--                                    shell);
-+    if (ephy_shell_get_net_monitor (shell)) {
-+        ephy_shell_sync_network_status (priv->nm_proxy,
-+                                        ephy_network_manager_get_state (priv->nm_proxy),
-+                                        shell);
-+    }
-   }
- 
-   return embed_single;
---
-cgit v0.9.0.2



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: www-client/epiphany/files/, www-client/epiphany/
@ 2012-01-17 11:30 Priit Laes
  0 siblings, 0 replies; 9+ messages in thread
From: Priit Laes @ 2012-01-17 11:30 UTC (permalink / raw
  To: gentoo-commits

commit:     61b4b3f2989f3a183e2eacefe564c25afc2479b9
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jan 17 11:27:30 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jan 17 11:27:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=61b4b3f2

www-client/epiphany: Added 3.3.4 to overlay

---
 ...{epiphany-9999.ebuild => epiphany-3.3.4.ebuild} |   27 ++----
 www-client/epiphany/epiphany-9999.ebuild           |   15 ++--
 .../epiphany-3.2.0-optional-networkmanager.patch   |   94 -------------------
 .../epiphany-3.3-optional-networkmanager.patch     |   96 ++++++++++++++++++++
 4 files changed, 110 insertions(+), 122 deletions(-)

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-3.3.4.ebuild
similarity index 72%
copy from www-client/epiphany/epiphany-9999.ebuild
copy to www-client/epiphany/epiphany-3.3.4.ebuild
index a06f542..7e4d9c2 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-3.3.4.ebuild
@@ -1,14 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2.ebuild,v 1.1 2010/06/13 21:09:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.2.1.ebuild,v 1.1 2011/11/06 04:57:01 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 
 inherit eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
@@ -16,22 +13,16 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="avahi doc +introspection +networkmanager +nss test"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-	>=x11-libs/gtk+-3.0.2:3[introspection?]
+COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
+	>=x11-libs/gtk+-3.3.8:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.6.1:3[introspection?]
-	>=net-libs/libsoup-gnome-2.33.1:2.4
+	>=net-libs/webkit-gtk-1.7.3:3[introspection?]
+	>=net-libs/libsoup-gnome-2.37.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 	>=x11-libs/libnotify-0.5.1
@@ -57,7 +48,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	doc? ( >=dev-util/gtk-doc-1 )"
 
-
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 	G2CONF="${G2CONF}
@@ -66,18 +56,17 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-static
 		--with-distributor-name=Gentoo
-		--with-ca-file=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
 		$(use_enable avahi zeroconf)
 		$(use_enable introspection)
 		$(use_enable nss)
 		$(use_enable test tests)"
 	# Upstream no longer makes networkmanager optional, but we still want
 	# to make it possible for prefix users to use epiphany
-	use networkmanager && CFLAGS="${CFLAGS} -DENABLE_NETWORK_MANAGER"
+	use networkmanager && CFLAGS="${CFLAGS} -DENABLE_NETWORKMANAGER"
 }
 
 src_prepare() {
 	# Make networkmanager optional for prefix people
-	epatch "${FILESDIR}/${PN}-3.2.0-optional-networkmanager.patch"
+	epatch "${FILESDIR}/${PN}-3.3-optional-networkmanager.patch"
 	gnome2_src_prepare
 }

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index a06f542..8e95b26 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -23,15 +23,13 @@ else
 fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-	>=x11-libs/gtk+-3.0.2:3[introspection?]
+COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
+	>=x11-libs/gtk+-3.3.8:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.6.1:3[introspection?]
-	>=net-libs/libsoup-gnome-2.33.1:2.4
+	>=net-libs/webkit-gtk-1.7.3:3[introspection?]
+	>=net-libs/libsoup-gnome-2.37.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 	>=x11-libs/libnotify-0.5.1
@@ -66,18 +64,17 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-static
 		--with-distributor-name=Gentoo
-		--with-ca-file=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
 		$(use_enable avahi zeroconf)
 		$(use_enable introspection)
 		$(use_enable nss)
 		$(use_enable test tests)"
 	# Upstream no longer makes networkmanager optional, but we still want
 	# to make it possible for prefix users to use epiphany
-	use networkmanager && CFLAGS="${CFLAGS} -DENABLE_NETWORK_MANAGER"
+	use networkmanager && CFLAGS="${CFLAGS} -DENABLE_NETWORKMANAGER"
 }
 
 src_prepare() {
 	# Make networkmanager optional for prefix people
-	epatch "${FILESDIR}/${PN}-3.2.0-optional-networkmanager.patch"
+	epatch "${FILESDIR}/${PN}-3.3-optional-networkmanager.patch"
 	gnome2_src_prepare
 }

diff --git a/www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch b/www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch
deleted file mode 100644
index 0ac6112..0000000
--- a/www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From c29d0825816a541c98a3b0b7f1d6bae454cba2b5 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Wed, 7 Sep 2011 17:17:42 -0400
-Subject: [PATCH] Make networkmanager optional
-
-Some people cannot use it for various reasons (e.g. prefix).
----
- src/ephy-shell.c |   14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/src/ephy-shell.c b/src/ephy-shell.c
-index c436da1..29b79e6 100644
---- a/src/ephy-shell.c
-+++ b/src/ephy-shell.c
-@@ -63,7 +63,9 @@ struct _EphyShellPrivate {
-   EggToolbarsModel *toolbars_model;
-   EggToolbarsModel *fs_toolbars_model;
-   EphyExtensionsManager *extensions_manager;
-+#ifdef ENABLE_NETWORK_MANAGER
-   EphyNetworkManager *nm_proxy;
-+#endif
-   GtkWidget *bme;
-   GtkWidget *history_window;
-   GObject *pdm_dialog;
-@@ -435,6 +437,8 @@ ephy_shell_new_window_cb (EphyEmbedSingle *single,
-      NULL, NULL, flags, chromemask, is_popup, 0);
- }
- 
-+#ifdef ENABLE_NETWORK_MANAGER
-+
- static void
- ephy_shell_sync_network_status (EphyNetworkManager *nm_proxy,
-                                 NMState state,
-@@ -452,6 +456,8 @@ ephy_shell_sync_network_status (EphyNetworkManager *nm_proxy,
-   ephy_embed_single_set_network_status (single, net_status);
- }
- 
-+#endif /* ENABLE_NETWORK_MANAGER */
-+
- static GObject*
- impl_get_embed_single (EphyEmbedShell *embed_shell)
- {
-@@ -469,12 +475,14 @@ impl_get_embed_single (EphyEmbedShell *embed_shell)
- 
-     priv->embed_single_connected = TRUE;
- 
-+#ifdef ENABLE_NETWORK_MANAGER
-     /* Now we need the net monitor   */
-     if (ephy_shell_get_net_monitor (shell)) {
-         ephy_shell_sync_network_status (priv->nm_proxy,
-                                         ephy_network_manager_get_state (priv->nm_proxy),
-                                         shell);
-     }
-+#endif
-   }
- 
-   return embed_single;
-@@ -563,6 +571,7 @@ ephy_shell_dispose (GObject *object)
-     priv->bookmarks = NULL;
-   }
- 
-+#ifdef ENABLE_NETWORK_MANAGER
-   if (priv->nm_proxy != NULL) {
-     LOG ("Unref net monitor ");
-     g_signal_handlers_disconnect_by_func
-@@ -570,6 +579,7 @@ ephy_shell_dispose (GObject *object)
-     g_object_unref (priv->nm_proxy);
-     priv->nm_proxy = NULL;
-   }
-+#endif /* ENABLE_NETWORK_MANAGER */
- 
-   G_OBJECT_CLASS (ephy_shell_parent_class)->dispose (object);
- }
-@@ -915,6 +925,7 @@ ephy_shell_get_extensions_manager (EphyShell *es)
- GObject *
- ephy_shell_get_net_monitor (EphyShell *shell)
- {
-+#ifdef ENABLE_NETWORK_MANAGER
-   EphyShellPrivate *priv = shell->priv;
- 
-   if (priv->nm_proxy == NULL) {
-@@ -929,6 +940,9 @@ ephy_shell_get_net_monitor (EphyShell *shell)
-   }
- 
-   return G_OBJECT (priv->nm_proxy);
-+#else
-+  return NULL;
-+#endif /* ENABLE_NETWORK_MANAGER */
- }
- 
- static void
--- 
-1.7.6.1
-

diff --git a/www-client/epiphany/files/epiphany-3.3-optional-networkmanager.patch b/www-client/epiphany/files/epiphany-3.3-optional-networkmanager.patch
new file mode 100644
index 0000000..cb8d520
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-3.3-optional-networkmanager.patch
@@ -0,0 +1,96 @@
+From 0d814802873ca8ca58479b32886ef7c4fef493bb Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Tue, 17 Jan 2012 13:05:04 +0200
+Subject: [PATCH] [PATCH] Make networkmanager optional
+
+Original patch by Alexandre Rostovtsev
+---
+ src/ephy-shell.c |   14 ++++++++++++--
+ 1 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/ephy-shell.c b/src/ephy-shell.c
+index 40d2f72..4a19925 100644
+--- a/src/ephy-shell.c
++++ b/src/ephy-shell.c
+@@ -57,7 +57,9 @@ struct _EphyShellPrivate {
+   GObject *lockdown;
+   EphyBookmarks *bookmarks;
+   EphyExtensionsManager *extensions_manager;
++#ifdef ENABLE_NETWORKMANAGER
+   GNetworkMonitor *network_monitor;
++#endif /* ENABLE_NETWORKMANAGER */
+   GtkWidget *bme;
+   GtkWidget *history_window;
+   GObject *pdm_dialog;
+@@ -549,6 +551,7 @@ ephy_shell_new_window_cb (EphyEmbedSingle *single,
+      NULL, NULL, flags, chromemask, is_popup, 0);
+ }
+ 
++#ifdef ENABLE_NETWORKMANAGER
+ static void
+ ephy_shell_sync_network_status (GNetworkMonitor *monitor,
+                                 gboolean available,
+@@ -563,6 +566,7 @@ ephy_shell_sync_network_status (GNetworkMonitor *monitor,
+ 
+   ephy_embed_single_set_network_status (single, available);
+ }
++#endif /* ENABLE_NETWORKMANAGER */
+ 
+ static GObject*
+ impl_get_embed_single (EphyEmbedShell *embed_shell)
+@@ -581,14 +585,15 @@ impl_get_embed_single (EphyEmbedShell *embed_shell)
+ 
+     priv->embed_single_connected = TRUE;
+ 
++#ifdef ENABLE_NETWORKMANAGER
+     /* Now we need the net monitor   */
+     if (ephy_shell_get_net_monitor (shell)) {
+         ephy_shell_sync_network_status (priv->network_monitor,
+                                         g_network_monitor_get_network_available (priv->network_monitor),
+                                         shell);
+     }
++#endif /* ENABLE_NETWORKMANAGER */
+   }
+-
+   return embed_single;
+ }
+ 
+@@ -663,6 +668,7 @@ ephy_shell_dispose (GObject *object)
+     priv->bookmarks = NULL;
+   }
+ 
++#ifdef ENABLE_NETWORKMANAGER
+   if (priv->network_monitor != NULL) {
+     LOG ("Unref net monitor ");
+     g_signal_handlers_disconnect_by_func
+@@ -670,6 +676,7 @@ ephy_shell_dispose (GObject *object)
+     g_object_unref (priv->network_monitor);
+     priv->network_monitor = NULL;
+   }
++#endif /* ENABLE_NETWORKMANAGER */
+ 
+   G_OBJECT_CLASS (ephy_shell_parent_class)->dispose (object);
+ }
+@@ -969,6 +976,7 @@ ephy_shell_get_extensions_manager (EphyShell *es)
+ GObject *
+ ephy_shell_get_net_monitor (EphyShell *shell)
+ {
++#ifdef ENABLE_NETWORKMANAGER
+   EphyShellPrivate *priv = shell->priv;
+ 
+   if (priv->network_monitor == NULL) {
+@@ -976,8 +984,10 @@ ephy_shell_get_net_monitor (EphyShell *shell)
+     g_signal_connect (priv->network_monitor, "network-changed",
+                       G_CALLBACK (ephy_shell_sync_network_status), shell);
+   }
+-
+   return G_OBJECT (priv->network_monitor);
++#else
++  return NULL;
++#endif /* ENABLE_NETWORKMANAGER */
+ }
+ 
+ static void
+-- 
+1.7.8.3
+



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: www-client/epiphany/files/, www-client/epiphany/
@ 2012-01-17 11:38 Priit Laes
  0 siblings, 0 replies; 9+ messages in thread
From: Priit Laes @ 2012-01-17 11:38 UTC (permalink / raw
  To: gentoo-commits

commit:     793617b90c7c92cc884cee7bc0fa99d2d3a649ea
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jan 17 11:33:17 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jan 17 11:35:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=793617b9

www-client/epiphany: Clean up depends

  * Drop USE=networkmanager, as it now uses glib's GNetworkMonitor
  * Demote nss to regular USE flag status, as it's used only for
    migrating from ancient gecko-based versions.
  * Drop gdbus-codegen dependency

---
 www-client/epiphany/epiphany-3.3.4.ebuild          |   16 +---
 www-client/epiphany/epiphany-9999.ebuild           |   16 +---
 .../epiphany-3.3-optional-networkmanager.patch     |   96 --------------------
 3 files changed, 4 insertions(+), 124 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.3.4.ebuild b/www-client/epiphany/epiphany-3.3.4.ebuild
index 7e4d9c2..1c5ec4d 100644
--- a/www-client/epiphany/epiphany-3.3.4.ebuild
+++ b/www-client/epiphany/epiphany-3.3.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avahi doc +introspection +networkmanager +nss test"
+IUSE="avahi doc +introspection nss test"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
@@ -37,12 +37,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
 	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	nss? ( dev-libs/nss )"
-# networkmanager is used purely via dbus
-RDEPEND="${COMMON_DEPEND}
-	networkmanager? ( >=net-misc/networkmanager-0.8.997 )"
+DEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	app-text/gnome-doc-utils
-	>=dev-util/gdbus-codegen-2.30.0
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
 	sys-devel/gettext
@@ -60,13 +57,4 @@ pkg_setup() {
 		$(use_enable introspection)
 		$(use_enable nss)
 		$(use_enable test tests)"
-	# Upstream no longer makes networkmanager optional, but we still want
-	# to make it possible for prefix users to use epiphany
-	use networkmanager && CFLAGS="${CFLAGS} -DENABLE_NETWORKMANAGER"
-}
-
-src_prepare() {
-	# Make networkmanager optional for prefix people
-	epatch "${FILESDIR}/${PN}-3.3-optional-networkmanager.patch"
-	gnome2_src_prepare
 }

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 8e95b26..1c43e64 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avahi doc +introspection +networkmanager +nss test"
+IUSE="avahi doc +introspection nss test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -44,12 +44,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
 	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	nss? ( dev-libs/nss )"
-# networkmanager is used purely via dbus
-RDEPEND="${COMMON_DEPEND}
-	networkmanager? ( >=net-misc/networkmanager-0.8.997 )"
+RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	app-text/gnome-doc-utils
-	>=dev-util/gdbus-codegen-2.30.0
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
 	sys-devel/gettext
@@ -68,13 +65,4 @@ pkg_setup() {
 		$(use_enable introspection)
 		$(use_enable nss)
 		$(use_enable test tests)"
-	# Upstream no longer makes networkmanager optional, but we still want
-	# to make it possible for prefix users to use epiphany
-	use networkmanager && CFLAGS="${CFLAGS} -DENABLE_NETWORKMANAGER"
-}
-
-src_prepare() {
-	# Make networkmanager optional for prefix people
-	epatch "${FILESDIR}/${PN}-3.3-optional-networkmanager.patch"
-	gnome2_src_prepare
 }

diff --git a/www-client/epiphany/files/epiphany-3.3-optional-networkmanager.patch b/www-client/epiphany/files/epiphany-3.3-optional-networkmanager.patch
deleted file mode 100644
index cb8d520..0000000
--- a/www-client/epiphany/files/epiphany-3.3-optional-networkmanager.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 0d814802873ca8ca58479b32886ef7c4fef493bb Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Tue, 17 Jan 2012 13:05:04 +0200
-Subject: [PATCH] [PATCH] Make networkmanager optional
-
-Original patch by Alexandre Rostovtsev
----
- src/ephy-shell.c |   14 ++++++++++++--
- 1 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/ephy-shell.c b/src/ephy-shell.c
-index 40d2f72..4a19925 100644
---- a/src/ephy-shell.c
-+++ b/src/ephy-shell.c
-@@ -57,7 +57,9 @@ struct _EphyShellPrivate {
-   GObject *lockdown;
-   EphyBookmarks *bookmarks;
-   EphyExtensionsManager *extensions_manager;
-+#ifdef ENABLE_NETWORKMANAGER
-   GNetworkMonitor *network_monitor;
-+#endif /* ENABLE_NETWORKMANAGER */
-   GtkWidget *bme;
-   GtkWidget *history_window;
-   GObject *pdm_dialog;
-@@ -549,6 +551,7 @@ ephy_shell_new_window_cb (EphyEmbedSingle *single,
-      NULL, NULL, flags, chromemask, is_popup, 0);
- }
- 
-+#ifdef ENABLE_NETWORKMANAGER
- static void
- ephy_shell_sync_network_status (GNetworkMonitor *monitor,
-                                 gboolean available,
-@@ -563,6 +566,7 @@ ephy_shell_sync_network_status (GNetworkMonitor *monitor,
- 
-   ephy_embed_single_set_network_status (single, available);
- }
-+#endif /* ENABLE_NETWORKMANAGER */
- 
- static GObject*
- impl_get_embed_single (EphyEmbedShell *embed_shell)
-@@ -581,14 +585,15 @@ impl_get_embed_single (EphyEmbedShell *embed_shell)
- 
-     priv->embed_single_connected = TRUE;
- 
-+#ifdef ENABLE_NETWORKMANAGER
-     /* Now we need the net monitor   */
-     if (ephy_shell_get_net_monitor (shell)) {
-         ephy_shell_sync_network_status (priv->network_monitor,
-                                         g_network_monitor_get_network_available (priv->network_monitor),
-                                         shell);
-     }
-+#endif /* ENABLE_NETWORKMANAGER */
-   }
--
-   return embed_single;
- }
- 
-@@ -663,6 +668,7 @@ ephy_shell_dispose (GObject *object)
-     priv->bookmarks = NULL;
-   }
- 
-+#ifdef ENABLE_NETWORKMANAGER
-   if (priv->network_monitor != NULL) {
-     LOG ("Unref net monitor ");
-     g_signal_handlers_disconnect_by_func
-@@ -670,6 +676,7 @@ ephy_shell_dispose (GObject *object)
-     g_object_unref (priv->network_monitor);
-     priv->network_monitor = NULL;
-   }
-+#endif /* ENABLE_NETWORKMANAGER */
- 
-   G_OBJECT_CLASS (ephy_shell_parent_class)->dispose (object);
- }
-@@ -969,6 +976,7 @@ ephy_shell_get_extensions_manager (EphyShell *es)
- GObject *
- ephy_shell_get_net_monitor (EphyShell *shell)
- {
-+#ifdef ENABLE_NETWORKMANAGER
-   EphyShellPrivate *priv = shell->priv;
- 
-   if (priv->network_monitor == NULL) {
-@@ -976,8 +984,10 @@ ephy_shell_get_net_monitor (EphyShell *shell)
-     g_signal_connect (priv->network_monitor, "network-changed",
-                       G_CALLBACK (ephy_shell_sync_network_status), shell);
-   }
--
-   return G_OBJECT (priv->network_monitor);
-+#else
-+  return NULL;
-+#endif /* ENABLE_NETWORKMANAGER */
- }
- 
- static void
--- 
-1.7.8.3
-



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: www-client/epiphany/files/, www-client/epiphany/
@ 2012-03-05  3:03 Alexandre Restovtsev
  0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Restovtsev @ 2012-03-05  3:03 UTC (permalink / raw
  To: gentoo-commits

commit:     26a4d843313d00ba269b64e217f29e16224ac973
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  5 02:57:15 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Mar  5 03:02:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=26a4d843

www-client/epiphany: PaX fixes

Fix build problems on PaX with USE=introspection and mark
/usr/bin/epiphany so that it runs on PaX when webkit-gtk was built with
USE=jit.

---
 ...any-3.3.90.ebuild => epiphany-3.3.90-r1.ebuild} |   15 +++++++++++-
 www-client/epiphany/epiphany-9999.ebuild           |   15 +++++++++++-
 .../epiphany-3.3.90-paxctl-introspection.patch     |   24 ++++++++++++++++++++
 www-client/epiphany/files/paxctl.sh                |   24 ++++++++++++++++++++
 4 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.3.90.ebuild b/www-client/epiphany/epiphany-3.3.90-r1.ebuild
similarity index 84%
rename from www-client/epiphany/epiphany-3.3.90.ebuild
rename to www-client/epiphany/epiphany-3.3.90-r1.ebuild
index 7196555..5b5ecf5 100644
--- a/www-client/epiphany/epiphany-3.3.90.ebuild
+++ b/www-client/epiphany/epiphany-3.3.90-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2 versionator virtualx
+inherit autotools eutils gnome2 pax-utils versionator virtualx
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
@@ -58,6 +58,14 @@ pkg_setup() {
 		$(use_enable test tests)"
 }
 
+src_prepare() {
+	# Build-time segfaults under PaX with USE=introspection
+	epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
+	cp "${FILESDIR}/paxctl.sh" "${S}/" || die
+	eautoreconf
+	gnome2_src_prepare
+}
+
 src_test() {
 	# Tests require gsettings schemas from >=epiphany-3.3.5 to be installed
 	local v=$(best_version www-client/epiphany)
@@ -69,3 +77,8 @@ src_test() {
 		ewarn "installed on the system."
 	fi
 }
+
+src_install() {
+	gnome2_src_install
+	pax-mark m "${ED}usr/bin/epiphany"
+}

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 1377caf..fccc78e 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2 versionator virtualx
+inherit autotools eutils gnome2 pax-utils versionator virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -65,6 +65,14 @@ pkg_setup() {
 		$(use_enable test tests)"
 }
 
+src_prepare() {
+	# Build-time segfaults under PaX with USE=introspection
+	epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
+	cp "${FILESDIR}/paxctl.sh" "${S}/" || die
+	eautoreconf
+	gnome2_src_prepare
+}
+
 src_test() {
 	# Tests require gsettings schemas from >=epiphany-3.3.5 to be installed
 	local v=$(best_version www-client/epiphany)
@@ -76,3 +84,8 @@ src_test() {
 		ewarn "installed on the system."
 	fi
 }
+
+src_install() {
+	gnome2_src_install
+	pax-mark m "${ED}usr/bin/epiphany"
+}

diff --git a/www-client/epiphany/files/epiphany-3.3.90-paxctl-introspection.patch b/www-client/epiphany/files/epiphany-3.3.90-paxctl-introspection.patch
new file mode 100644
index 0000000..f9e0616
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-3.3.90-paxctl-introspection.patch
@@ -0,0 +1,24 @@
+From 1eee9260eba23a7fc17df49c5a0e24a99f88482a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 4 Mar 2012 21:55:20 -0500
+Subject: [PATCH] Add PaX marking to allow building introspection under PaX
+
+---
+ src/Makefile.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d6bf77f..ce52591 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -277,6 +277,7 @@ EPHY_GIR_C_FILES = \
+ 
+ Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \
+                                       $(EPHY_GIR_C_FILES) epiphany
++	bash $(top_srcdir)/paxctl.sh -m ./epiphany
+ 	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
+ 	$(INTROSPECTION_SCANNER) -v --warn-all \
+ 		--identifier-prefix=Ephy \
+-- 
+1.7.8.5
+

diff --git a/www-client/epiphany/files/paxctl.sh b/www-client/epiphany/files/paxctl.sh
new file mode 100755
index 0000000..bb1b6e0
--- /dev/null
+++ b/www-client/epiphany/files/paxctl.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# PaX marking code stolen from pax-utils.eclass
+
+flags=${1//-}; shift
+
+if type -p paxctl > /dev/null; then
+	echo "PT PaX marking -${flags} $@"
+	for f in "$@"; do
+		# First, try modifying the existing PAX_FLAGS header
+		paxctl -q${flags} "${f}" && continue
+		# Second, try stealing the (unused under PaX) PT_GNU_STACK header
+		paxctl -qc${flags} "${f}" && continue
+		# Third, try pulling the base down a page, to create space and
+		# insert a PT_GNU_STACK header (works on ET_EXEC)
+		paxctl -qC${flags} "${f}" && continue
+	done
+elif type -p scanelf > /dev/null; then
+	# Try scanelf, the Gentoo swiss-army knife ELF utility
+	# Currently this sets PT if it can, no option to control what it does.
+	echo "Fallback PaX marking -${flags} $@"
+	scanelf -Xxz ${flags} "$@"
+fi
+
+exit 0



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: www-client/epiphany/files/, www-client/epiphany/
@ 2012-09-07  5:58 Priit Laes
  0 siblings, 0 replies; 9+ messages in thread
From: Priit Laes @ 2012-09-07  5:58 UTC (permalink / raw
  To: gentoo-commits

commit:     53b40b56543aedc50a46026b181dcaa038350823
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Sep  7 05:56:38 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Sep  7 05:57:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=53b40b56

www-client/epiphany: Revbump to fix 64-bit issues

---
 ...3.5.91.1.ebuild => epiphany-3.5.91.1-r1.ebuild} |    2 +
 .../epiphany/files/epiphany-64bit-troubles.patch   |   36 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.5.91.1.ebuild b/www-client/epiphany/epiphany-3.5.91.1-r1.ebuild
similarity index 98%
rename from www-client/epiphany/epiphany-3.5.91.1.ebuild
rename to www-client/epiphany/epiphany-3.5.91.1-r1.ebuild
index f6c8d34..6e81739 100644
--- a/www-client/epiphany/epiphany-3.5.91.1.ebuild
+++ b/www-client/epiphany/epiphany-3.5.91.1-r1.ebuild
@@ -70,6 +70,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-64bit-troubles.patch"
+
 	# Build-time segfaults under PaX with USE=introspection when building
 	# against webkit-gtk[introspection,jit]
 	if use introspection && use jit; then

diff --git a/www-client/epiphany/files/epiphany-64bit-troubles.patch b/www-client/epiphany/files/epiphany-64bit-troubles.patch
new file mode 100644
index 0000000..e5091c4
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-64bit-troubles.patch
@@ -0,0 +1,36 @@
+From 8431cabd4d8f72dfaadbe64adf9f8dc89a26ae62 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Thu, 6 Sep 2012 17:40:51 +0200
+Subject: [PATCH] EphyOverviewStore: don't register the snapshot mtime as long
+
+All code paths use int, and this breaks on architechtures where
+long is not the same as int (such as x86_64).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=683029
+
+[Do the same for the visit time column]
+Signed-off-by: Claudio Saavedra <csaavedra@igalia.com>
+---
+ lib/widgets/ephy-overview-store.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/widgets/ephy-overview-store.c b/lib/widgets/ephy-overview-store.c
+index 99ef2cf..074ec8b 100644
+--- a/lib/widgets/ephy-overview-store.c
++++ b/lib/widgets/ephy-overview-store.c
+@@ -161,10 +161,10 @@ ephy_overview_store_init (EphyOverviewStore *self)
+   types[EPHY_OVERVIEW_STORE_TITLE] = G_TYPE_STRING;
+   types[EPHY_OVERVIEW_STORE_AUTHOR] = G_TYPE_STRING;
+   types[EPHY_OVERVIEW_STORE_SNAPSHOT] = GDK_TYPE_PIXBUF;
+-  types[EPHY_OVERVIEW_STORE_LAST_VISIT] = G_TYPE_LONG;
++  types[EPHY_OVERVIEW_STORE_LAST_VISIT] = G_TYPE_INT;
+   types[EPHY_OVERVIEW_STORE_SELECTED] = G_TYPE_BOOLEAN;
+   types[EPHY_OVERVIEW_STORE_SNAPSHOT_CANCELLABLE] = G_TYPE_CANCELLABLE;
+-  types[EPHY_OVERVIEW_STORE_SNAPSHOT_MTIME] = G_TYPE_LONG;
++  types[EPHY_OVERVIEW_STORE_SNAPSHOT_MTIME] = G_TYPE_INT;
+   types[EPHY_OVERVIEW_STORE_CLOSE_BUTTON_RENDER_POLICY] = EPHY_TYPE_REMOVABLE_PIXBUF_RENDER_POLICY;
+ 
+   gtk_list_store_set_column_types (GTK_LIST_STORE (self),
+-- 
+1.7.12
+


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: www-client/epiphany/files/, www-client/epiphany/
@ 2012-09-25 17:49 Priit Laes
  0 siblings, 0 replies; 9+ messages in thread
From: Priit Laes @ 2012-09-25 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     fa911c1394935d5e420cfc202fd1900fca1d114e
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Sep 25 17:48:03 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Sep 25 17:48:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fa911c13

www-client/epiphany: 3.5.91.1 → 3.6.0

---
 ...ny-3.5.91.1-r1.ebuild => epiphany-3.6.0.ebuild} |    2 -
 .../epiphany/files/epiphany-64bit-troubles.patch   |   36 --------------------
 2 files changed, 0 insertions(+), 38 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.5.91.1-r1.ebuild b/www-client/epiphany/epiphany-3.6.0.ebuild
similarity index 98%
rename from www-client/epiphany/epiphany-3.5.91.1-r1.ebuild
rename to www-client/epiphany/epiphany-3.6.0.ebuild
index 6e81739..f6c8d34 100644
--- a/www-client/epiphany/epiphany-3.5.91.1-r1.ebuild
+++ b/www-client/epiphany/epiphany-3.6.0.ebuild
@@ -70,8 +70,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-64bit-troubles.patch"
-
 	# Build-time segfaults under PaX with USE=introspection when building
 	# against webkit-gtk[introspection,jit]
 	if use introspection && use jit; then

diff --git a/www-client/epiphany/files/epiphany-64bit-troubles.patch b/www-client/epiphany/files/epiphany-64bit-troubles.patch
deleted file mode 100644
index e5091c4..0000000
--- a/www-client/epiphany/files/epiphany-64bit-troubles.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8431cabd4d8f72dfaadbe64adf9f8dc89a26ae62 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Thu, 6 Sep 2012 17:40:51 +0200
-Subject: [PATCH] EphyOverviewStore: don't register the snapshot mtime as long
-
-All code paths use int, and this breaks on architechtures where
-long is not the same as int (such as x86_64).
-
-https://bugzilla.gnome.org/show_bug.cgi?id=683029
-
-[Do the same for the visit time column]
-Signed-off-by: Claudio Saavedra <csaavedra@igalia.com>
----
- lib/widgets/ephy-overview-store.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/widgets/ephy-overview-store.c b/lib/widgets/ephy-overview-store.c
-index 99ef2cf..074ec8b 100644
---- a/lib/widgets/ephy-overview-store.c
-+++ b/lib/widgets/ephy-overview-store.c
-@@ -161,10 +161,10 @@ ephy_overview_store_init (EphyOverviewStore *self)
-   types[EPHY_OVERVIEW_STORE_TITLE] = G_TYPE_STRING;
-   types[EPHY_OVERVIEW_STORE_AUTHOR] = G_TYPE_STRING;
-   types[EPHY_OVERVIEW_STORE_SNAPSHOT] = GDK_TYPE_PIXBUF;
--  types[EPHY_OVERVIEW_STORE_LAST_VISIT] = G_TYPE_LONG;
-+  types[EPHY_OVERVIEW_STORE_LAST_VISIT] = G_TYPE_INT;
-   types[EPHY_OVERVIEW_STORE_SELECTED] = G_TYPE_BOOLEAN;
-   types[EPHY_OVERVIEW_STORE_SNAPSHOT_CANCELLABLE] = G_TYPE_CANCELLABLE;
--  types[EPHY_OVERVIEW_STORE_SNAPSHOT_MTIME] = G_TYPE_LONG;
-+  types[EPHY_OVERVIEW_STORE_SNAPSHOT_MTIME] = G_TYPE_INT;
-   types[EPHY_OVERVIEW_STORE_CLOSE_BUTTON_RENDER_POLICY] = EPHY_TYPE_REMOVABLE_PIXBUF_RENDER_POLICY;
- 
-   gtk_list_store_set_column_types (GTK_LIST_STORE (self),
--- 
-1.7.12
-


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: www-client/epiphany/files/, www-client/epiphany/
@ 2013-03-08 14:39 Priit Laes
  0 siblings, 0 replies; 9+ messages in thread
From: Priit Laes @ 2013-03-08 14:39 UTC (permalink / raw
  To: gentoo-commits

commit:     0174a45e5ec5cc4adfb9eb20ca4b0f3db88a5582
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Mar  8 14:39:20 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Mar  8 14:39:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0174a45e

www-client/epiphany: Add 3.7.91 to overlay

---
 ...epiphany-9999.ebuild => epiphany-3.7.91.ebuild} |   51 +++++--------------
 www-client/epiphany/epiphany-9999.ebuild           |   37 +++-----------
 .../epiphany-3.3.90-paxctl-introspection.patch     |   24 ---------
 www-client/epiphany/files/paxctl.sh                |   24 ---------
 4 files changed, 22 insertions(+), 114 deletions(-)

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-3.7.91.ebuild
similarity index 56%
copy from www-client/epiphany/epiphany-9999.ebuild
copy to www-client/epiphany/epiphany-3.7.91.ebuild
index fe0c26a..0d22fc4 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-3.7.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,75 +16,53 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 # TODO: coverage
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+introspection +jit +nss test"
+IUSE="+nss test"
 if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 RDEPEND="
+	>=app-crypt/libsecret-0.14
 	>=app-crypt/gcr-3.5.5
 	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.31.2:2
+	>=dev-libs/glib-2.35.6:2
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 	>=net-dns/avahi-0.6.22
-	>=net-libs/webkit-gtk-1.9.6:3[introspection?]
-	>=net-libs/libsoup-gnome-2.39.6:2.4
-	>=x11-libs/gtk+-3.5.2:3[introspection?]
+	>=net-libs/webkit-gtk-1.11.5:3
+	>=net-libs/libsoup-2.41.3:2.4
+	>=x11-libs/gtk+-3.7.10:3
 	>=x11-libs/libnotify-0.5.1:=
 	gnome-base/gnome-desktop:3=
 
 	dev-db/sqlite:3
+	x11-libs/libwnck
 	x11-libs/libX11
 
 	x11-themes/gnome-icon-theme
 	x11-themes/gnome-icon-theme-symbolic
 
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	!jit? ( net-libs/webkit-gtk[-jit] )
 	nss? ( dev-libs/nss )
 "
 # paxctl needed for bug #407085
 # eautoreconf requires gnome-common-3.5.5
 DEPEND="${RDEPEND}
-	introspection? ( jit? ( >=gnome-base/gnome-common-3.5.5 ) )
-	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1 )"
-fi
-
-src_prepare() {
-	# Build-time segfaults under PaX with USE=introspection when building
-	# against webkit-gtk[introspection,jit]
-	if use introspection && use jit; then
-		epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
-		cp "${FILESDIR}/paxctl.sh" "${S}/" || die
-		[[ ${PV} != 9999 ]] && eautoreconf
-	fi
-	gnome2_src_prepare
-}
 
 src_configure() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-static
-		--with-distributor-name=Gentoo
-		$(use_enable introspection)
+	gnome2_src_configure \
+		--enable-shared \
+		--disable-static \
+		--with-distributor-name=Gentoo \
 		$(use_enable nss)
-		$(use_enable test tests)"
-	gnome2_src_configure
+		$(use_enable test tests)
 }
 
 src_compile() {
@@ -97,11 +75,10 @@ src_test() {
 	# FIXME: this should be handled at eclass level
 	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
 
-	use jit && pax-mark m $(list-paxables tests/test*) #415801
 	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
 }
 
 src_install() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 	gnome2_src_install
-	use jit && pax-mark m "${ED}usr/bin/epiphany"
 }

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index fe0c26a..7e6cdeb 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,9 +16,8 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 # TODO: coverage
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+introspection +jit +nss test"
+IUSE="+nss test"
 if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -27,61 +26,41 @@ fi
 RDEPEND="
 	>=app-crypt/gcr-3.5.5
 	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.31.2:2
+	>=dev-libs/glib-2.35.6:2
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 	>=net-dns/avahi-0.6.22
-	>=net-libs/webkit-gtk-1.9.6:3[introspection?]
-	>=net-libs/libsoup-gnome-2.39.6:2.4
-	>=x11-libs/gtk+-3.5.2:3[introspection?]
+	>=net-libs/webkit-gtk-1.11.5:3
+	>=net-libs/libsoup-2.41.3:2.4
+	>=x11-libs/gtk+-3.5.4:3
 	>=x11-libs/libnotify-0.5.1:=
 	gnome-base/gnome-desktop:3=
 
 	dev-db/sqlite:3
+	x11-libs/libwnck
 	x11-libs/libX11
 
 	x11-themes/gnome-icon-theme
 	x11-themes/gnome-icon-theme-symbolic
 
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	!jit? ( net-libs/webkit-gtk[-jit] )
 	nss? ( dev-libs/nss )
 "
 # paxctl needed for bug #407085
 # eautoreconf requires gnome-common-3.5.5
 DEPEND="${RDEPEND}
-	introspection? ( jit? ( >=gnome-base/gnome-common-3.5.5 ) )
-	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1 )"
-fi
-
-src_prepare() {
-	# Build-time segfaults under PaX with USE=introspection when building
-	# against webkit-gtk[introspection,jit]
-	if use introspection && use jit; then
-		epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
-		cp "${FILESDIR}/paxctl.sh" "${S}/" || die
-		[[ ${PV} != 9999 ]] && eautoreconf
-	fi
-	gnome2_src_prepare
-}
 
 src_configure() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 	G2CONF="${G2CONF}
 		--enable-shared
 		--disable-static
 		--with-distributor-name=Gentoo
-		$(use_enable introspection)
 		$(use_enable nss)
 		$(use_enable test tests)"
 	gnome2_src_configure
@@ -97,11 +76,11 @@ src_test() {
 	# FIXME: this should be handled at eclass level
 	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
 
-	use jit && pax-mark m $(list-paxables tests/test*) #415801
 	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
 }
 
 src_install() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 	gnome2_src_install
 	use jit && pax-mark m "${ED}usr/bin/epiphany"
 }

diff --git a/www-client/epiphany/files/epiphany-3.3.90-paxctl-introspection.patch b/www-client/epiphany/files/epiphany-3.3.90-paxctl-introspection.patch
deleted file mode 100644
index f9e0616..0000000
--- a/www-client/epiphany/files/epiphany-3.3.90-paxctl-introspection.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 1eee9260eba23a7fc17df49c5a0e24a99f88482a Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 4 Mar 2012 21:55:20 -0500
-Subject: [PATCH] Add PaX marking to allow building introspection under PaX
-
----
- src/Makefile.am |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d6bf77f..ce52591 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -277,6 +277,7 @@ EPHY_GIR_C_FILES = \
- 
- Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \
-                                       $(EPHY_GIR_C_FILES) epiphany
-+	bash $(top_srcdir)/paxctl.sh -m ./epiphany
- 	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
- 	$(INTROSPECTION_SCANNER) -v --warn-all \
- 		--identifier-prefix=Ephy \
--- 
-1.7.8.5
-

diff --git a/www-client/epiphany/files/paxctl.sh b/www-client/epiphany/files/paxctl.sh
deleted file mode 100755
index bb1b6e0..0000000
--- a/www-client/epiphany/files/paxctl.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# PaX marking code stolen from pax-utils.eclass
-
-flags=${1//-}; shift
-
-if type -p paxctl > /dev/null; then
-	echo "PT PaX marking -${flags} $@"
-	for f in "$@"; do
-		# First, try modifying the existing PAX_FLAGS header
-		paxctl -q${flags} "${f}" && continue
-		# Second, try stealing the (unused under PaX) PT_GNU_STACK header
-		paxctl -qc${flags} "${f}" && continue
-		# Third, try pulling the base down a page, to create space and
-		# insert a PT_GNU_STACK header (works on ET_EXEC)
-		paxctl -qC${flags} "${f}" && continue
-	done
-elif type -p scanelf > /dev/null; then
-	# Try scanelf, the Gentoo swiss-army knife ELF utility
-	# Currently this sets PT if it can, no option to control what it does.
-	echo "Fallback PaX marking -${flags} $@"
-	scanelf -Xxz ${flags} "$@"
-fi
-
-exit 0


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: www-client/epiphany/files/, www-client/epiphany/
@ 2014-04-22 20:48 Gilles Dartiguelongue
  0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-22 20:48 UTC (permalink / raw
  To: gentoo-commits

commit:     7b51b96075702e441e06473dcf9571c867f7bd78
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 22 20:47:35 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 20:47:35 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7b51b960

www-client/epiphany: fix webextension underlinking

---
 www-client/epiphany/epiphany-3.12.0.ebuild         | 10 +++++-
 .../files/epiphany-3.12.0-missing-symbol.patch     | 39 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/www-client/epiphany/epiphany-3.12.0.ebuild b/www-client/epiphany/epiphany-3.12.0.ebuild
index a98962b..e5a1b60 100644
--- a/www-client/epiphany/epiphany-3.12.0.ebuild
+++ b/www-client/epiphany/epiphany-3.12.0.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 pax-utils versionator virtualx
+inherit autotools eutils gnome2 pax-utils versionator virtualx
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
@@ -57,6 +57,14 @@ DEPEND="${COMMON_DEPEND}
 # Tests refuse to run with the gsettings trick for some reason
 RESTRICT="test"
 
+src_prepare() {
+	# Fix missing symbol in webextensio.so
+	epatch "${FILESDIR}"/${P}-missing-symbol.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
 src_configure() {
 	gnome2_src_configure \
 		--enable-shared \

diff --git a/www-client/epiphany/files/epiphany-3.12.0-missing-symbol.patch b/www-client/epiphany/files/epiphany-3.12.0-missing-symbol.patch
new file mode 100644
index 0000000..6f2d835
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-3.12.0-missing-symbol.patch
@@ -0,0 +1,39 @@
+From 267ec3e2d7ca0f1881cb76d702ac673727f7507a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 22 Apr 2014 21:15:42 +0200
+Subject: [PATCH] Add missing files to webextension library
+
+Otherwise, results in:
+
+avril 22 21:09:36 kanae epiphany.desktop[32013]: Error loading module
+'/usr/lib64/epiphany/3.12/web-extensions/libephywebextension.so':
+/usr/lib64/epiphany/3.12/web-extensions/libephywebextension.so:
+undefined symbol: ephy_profile_utils_set_migration_version
+---
+ embed/web-extension/Makefile.am | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
+index 5bdb174..be4b08f 100644
+--- a/embed/web-extension/Makefile.am
++++ b/embed/web-extension/Makefile.am
+@@ -22,6 +22,8 @@ libephywebextension_la_SOURCES = \
+ 	$(top_srcdir)/lib/ephy-file-helpers.h \
+ 	$(top_srcdir)/lib/ephy-form-auth-data.c \
+ 	$(top_srcdir)/lib/ephy-form-auth-data.h \
++	$(top_srcdir)/lib/ephy-profile-utils.c \
++	$(top_srcdir)/lib/ephy-profile-utils.h \
+ 	$(top_srcdir)/lib/ephy-settings.c \
+ 	$(top_srcdir)/lib/ephy-settings.h \
+ 	$(top_srcdir)/lib/ephy-string.c \
+@@ -39,6 +41,7 @@ libephywebextension_la_CPPFLAGS = \
+ libephywebextension_la_CFLAGS = \
+ 	-DSHARE_DIR=\"$(pkgdatadir)\" \
+ 	-DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \
++	-DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
+ 	$(WEB_EXTENSION_CFLAGS)
+ 
+ libephywebextension_la_LIBADD = \
+-- 
+1.9.0
+


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: www-client/epiphany/files/, www-client/epiphany/
@ 2015-05-10 17:20 Gilles Dartiguelongue
  0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-10 17:20 UTC (permalink / raw
  To: gentoo-commits

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 <eva@gentoo.org>
-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
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2015-05-10 17:20 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-17 11:38 [gentoo-commits] proj/gnome:master commit in: www-client/epiphany/files/, www-client/epiphany/ Priit Laes
  -- strict thread matches above, loose matches on Subject: below --
2015-05-10 17:20 Gilles Dartiguelongue
2014-04-22 20:48 Gilles Dartiguelongue
2013-03-08 14:39 Priit Laes
2012-09-25 17:49 Priit Laes
2012-09-07  5:58 Priit Laes
2012-03-05  3:03 Alexandre Restovtsev
2012-01-17 11:30 Priit Laes
2011-10-19  8:24 Alexandre Restovtsev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox