aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPriit Laes <plaes@plaes.org>2012-01-17 13:27:30 +0200
committerPriit Laes <plaes@plaes.org>2012-01-17 13:27:30 +0200
commit61b4b3f2989f3a183e2eacefe564c25afc2479b9 (patch)
treec27c571d15917cd14a1c3c8b8c67ec46caeeda65 /www-client
parentx11-libs/gtk+: 3.3.6 -> 3.3.8 (diff)
downloadgnome-61b4b3f2989f3a183e2eacefe564c25afc2479b9.tar.gz
gnome-61b4b3f2989f3a183e2eacefe564c25afc2479b9.tar.bz2
gnome-61b4b3f2989f3a183e2eacefe564c25afc2479b9.zip
www-client/epiphany: Added 3.3.4 to overlay
Diffstat (limited to 'www-client')
-rw-r--r--www-client/epiphany/Manifest6
-rw-r--r--www-client/epiphany/epiphany-3.3.4.ebuild72
-rw-r--r--www-client/epiphany/epiphany-9999.ebuild15
-rw-r--r--www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch94
-rw-r--r--www-client/epiphany/files/epiphany-3.3-optional-networkmanager.patch96
5 files changed, 178 insertions, 105 deletions
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index f350a32c..b3939c78 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,2 +1,4 @@
-AUX epiphany-3.2.0-optional-networkmanager.patch 2729 RMD160 1f95db1db426d8be1ef85dc2c7c36178077b546b SHA1 0b1849ed500a46dbebf52fbe14959e650ef8d828 SHA256 a992b9d25b77f404d8af7435e7ac2b84da2e08a0a99eb6ae212a0302e935b661
-EBUILD epiphany-9999.ebuild 2389 RMD160 44612ab5fadcc09983f5a44503cf328d8836f764 SHA1 c0b42f640c6ec31803a325cab9ac5b3ace9b52a1 SHA256 02be87c6bab3706a05c3e8055070a2a8e501a30cff8ee34ee62c95876c7b5e21
+AUX epiphany-3.3-optional-networkmanager.patch 2924 RMD160 cbd298845e52748943f58d8eaaf5581d8260e8a3 SHA1 f372c478d720ccbe9cc4332f37f5ab98bcac8a23 SHA256 729783ac42dde6f8a9cbb15a02d4569ec82e562a0b5e4ba972bb20d1085f9603
+DIST epiphany-3.3.4.tar.xz 5149512 RMD160 aca40409e4b3ab5d1a9ec163fff649b09421b5fc SHA1 efdc047eceb08d00db03da63e31c94bc4c161b04 SHA256 a65c367ed6f1d375ba5380b7d84a4828e800321f6e56afc7cbf65db86b5f2325
+EBUILD epiphany-3.3.4.ebuild 2144 RMD160 a917312094c4916defaddb681ec3b1e58a5acecc SHA1 cb7335a4efbb7e21c475ee9e694cb29dba251ab9 SHA256 114ebea4dc9c19d6ddcf635f4b511731bd4ebd9f280acd31156c60bb62e3b7dc
+EBUILD epiphany-9999.ebuild 2232 RMD160 b274798ad6b97d6297a0b6e7153b089942cd11b2 SHA1 8c3c579eced8cd1bf50668adb22711418f15aadd SHA256 b8c3c685f344e45529afb45ba6234cef89d2b9da2206e1d42509dbd1019d0b46
diff --git a/www-client/epiphany/epiphany-3.3.4.ebuild b/www-client/epiphany/epiphany-3.3.4.ebuild
new file mode 100644
index 00000000..7e4d9c23
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.3.4.ebuild
@@ -0,0 +1,72 @@
+# 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-3.2.1.ebuild,v 1.1 2011/11/06 04:57:01 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="http://projects.gnome.org/epiphany/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="avahi doc +introspection +networkmanager +nss test"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# XXX: Should we add seed support? Seed seems to be unmaintained now.
+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.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
+
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+
+ app-misc/ca-certificates
+ x11-themes/gnome-icon-theme
+
+ 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}
+ app-text/gnome-doc-utils
+ >=dev-util/gdbus-codegen-2.30.0
+ >=dev-util/intltool-0.40
+ dev-util/pkgconfig
+ sys-devel/gettext
+ doc? ( >=dev-util/gtk-doc-1 )"
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+ G2CONF="${G2CONF}
+ --enable-shared
+ --disable-schemas-compile
+ --disable-scrollkeeper
+ --disable-static
+ --with-distributor-name=Gentoo
+ $(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_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 a06f542b..8e95b260 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 0ac61120..00000000
--- 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 00000000..cb8d5206
--- /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
+