aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gmail.com>2011-09-27 22:45:59 -0400
committerAlexandre Rostovtsev <tetromino@gmail.com>2011-09-27 22:45:59 -0400
commit2d2274e66743c0154459d32ac27eb666e5a9edba (patch)
tree8eaed0d65957bb89d4f93563b991bb721d6a9f29 /www-client
parentnet-libs/webkit-gtk: 1.6.0 → 1.6.1 (diff)
downloadgnome-2d2274e66743c0154459d32ac27eb666e5a9edba.tar.gz
gnome-2d2274e66743c0154459d32ac27eb666e5a9edba.tar.bz2
gnome-2d2274e66743c0154459d32ac27eb666e5a9edba.zip
www-client/epiphany: 3.1.92 → 3.2.0
Bump and update the networkmanager patch. Add an upstream patch to prevent a crash.
Diffstat (limited to 'www-client')
-rw-r--r--www-client/epiphany/Manifest9
-rw-r--r--www-client/epiphany/epiphany-3.2.0.ebuild (renamed from www-client/epiphany/epiphany-3.1.92.ebuild)7
-rw-r--r--www-client/epiphany/epiphany-9999.ebuild10
-rw-r--r--www-client/epiphany/files/epiphany-3.2.0-networkmanager-crash.patch31
-rw-r--r--www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch (renamed from www-client/epiphany/files/epiphany-3.1.91.1-optional-networkmanager.patch)29
5 files changed, 62 insertions, 24 deletions
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 2f55a82c..65416d5a 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,4 +1,5 @@
-AUX epiphany-3.1.91.1-optional-networkmanager.patch 2704 RMD160 f4f42da5c5f42f8266ff03c87e1a37711e7ab08d SHA1 d642e9f7772cba9a4f06b3d09c8f40148d84472e SHA256 a162617a90dd4ff4a729fef97984e2c20e5d00a6ea60f4a6f981f702bae73567
-DIST epiphany-3.1.92.tar.xz 5114044 RMD160 cb13b5645b854e03c3ceb52c40be86c7dd31e0f0 SHA1 1444ab7634b449ec6fbc77abe41554e05f65796f SHA256 b2bc72bbe7c431607538fc56532c8a8a05c8ab5b3f6412b489e79e2392e14331
-EBUILD epiphany-3.1.92.ebuild 2420 RMD160 86d87b9b17eb9eceb3da3960924bed6761448e40 SHA1 1c70a86594e6432f9493ed88420ff23cd4e4008d SHA256 f4f1977a0d417139e7414d72264715de2b35ff666a2684161278ca0c386f6668
-EBUILD epiphany-9999.ebuild 2320 RMD160 34df38e31b43116f7f4817b3d8d72361c879856b SHA1 0613f6ca1ad1b04e65a29752c1fc317d6412ea3e SHA256 6c374198ca45a7de710b3c44ffece3962a3c799fbf6b8830d21dbe8e4c07c162
+AUX epiphany-3.2.0-networkmanager-crash.patch 1118 RMD160 5a692f9339f239d32dacbc2165db64b036445f7d SHA1 dcd1265476b77767128578845f5bd8175f54e509 SHA256 ef1423bfaea72c44bd1bc1cc49d06e98dab89235fab2ad5dcd89d87b4d62cb4f
+AUX epiphany-3.2.0-optional-networkmanager.patch 2729 RMD160 1f95db1db426d8be1ef85dc2c7c36178077b546b SHA1 0b1849ed500a46dbebf52fbe14959e650ef8d828 SHA256 a992b9d25b77f404d8af7435e7ac2b84da2e08a0a99eb6ae212a0302e935b661
+DIST epiphany-3.2.0.tar.xz 5104056 RMD160 88441d9c028f5caa1109c3607efcdf2fe67bdd42 SHA1 229dc7f1e0d489113b3d273620754d171c3dcd63 SHA256 e5402cb8b52d3de5c09feb01bbf28a1bd3c20f260a2e0956c9d132f41040e5d2
+EBUILD epiphany-3.2.0.ebuild 2530 RMD160 5bec4f80a6f454c8ad7950a890adaeadbf2bd5f1 SHA1 77598ffb173834ca4ee394546fff417c4a1e39af SHA256 8901a0a5d9789ebc48de93b1797fb9120ca608f4ebfaef2c470f39a9865284c7
+EBUILD epiphany-9999.ebuild 2417 RMD160 0cc62ba8404bb772774cf0f043c32324092ded87 SHA1 5020244b5aaa162c8702e338375e8f1015186bbe SHA256 407711d4eb6974af7b6e8b47ffb10f6797457ffcf68e6f6c326121c0d4c7382e
diff --git a/www-client/epiphany/epiphany-3.1.92.ebuild b/www-client/epiphany/epiphany-3.2.0.ebuild
index 08ef4f6a..08c4fc79 100644
--- a/www-client/epiphany/epiphany-3.1.92.ebuild
+++ b/www-client/epiphany/epiphany-3.2.0.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
>=dev-libs/libxml2-2.6.12:2
>=dev-libs/libxslt-1.1.7
>=app-text/iso-codes-0.35
- >=net-libs/webkit-gtk-1.5.2:3[introspection?]
+ >=net-libs/webkit-gtk-1.6.1:3[introspection?]
>=net-libs/libsoup-gnome-2.33.1:2.4
>=gnome-base/gnome-keyring-2.26.0
>=gnome-base/gsettings-desktop-schemas-0.0.1
@@ -78,7 +78,10 @@ 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.1.91.1-optional-networkmanager.patch"
+ epatch "${FILESDIR}/${PN}-3.2.0-optional-networkmanager.patch"
gnome2_src_prepare
}
diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 26d9951c..95b0ea4c 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -23,12 +23,14 @@ else
fi
# XXX: Should we add seed support? Seed seems to be unmaintained now.
-COMMON_DEPEND=">=dev-libs/glib-2.29.10:2
+# 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?]
>=dev-libs/libxml2-2.6.12:2
>=dev-libs/libxslt-1.1.7
>=app-text/iso-codes-0.35
- >=net-libs/webkit-gtk-1.5.2:3[introspection?]
+ >=net-libs/webkit-gtk-1.6.1:3[introspection?]
>=net-libs/libsoup-gnome-2.33.1:2.4
>=gnome-base/gnome-keyring-2.26.0
>=gnome-base/gsettings-desktop-schemas-0.0.1
@@ -49,7 +51,7 @@ RDEPEND="${COMMON_DEPEND}
networkmanager? ( >=net-misc/networkmanager-0.8.997 )"
DEPEND="${COMMON_DEPEND}
app-text/gnome-doc-utils
- dev-util/gdbus-codegen
+ >=dev-util/gdbus-codegen-2.30.0
>=dev-util/intltool-0.40
dev-util/pkgconfig
sys-devel/gettext
@@ -77,6 +79,6 @@ pkg_setup() {
src_prepare() {
# Make networkmanager optional for prefix people
- epatch "${FILESDIR}/${PN}-3.1.91.1-optional-networkmanager.patch"
+ 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
new file mode 100644
index 00000000..0742af3c
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-3.2.0-networkmanager-crash.patch
@@ -0,0 +1,31 @@
+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
diff --git a/www-client/epiphany/files/epiphany-3.1.91.1-optional-networkmanager.patch b/www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch
index 4c3cd17e..0ac61120 100644
--- a/www-client/epiphany/files/epiphany-3.1.91.1-optional-networkmanager.patch
+++ b/www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch
@@ -1,4 +1,4 @@
-From 2b263c0fb24027b2b7877ffa4cb4de3709c43942 Mon Sep 17 00:00:00 2001
+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
@@ -9,10 +9,10 @@ Some people cannot use it for various reasons (e.g. prefix).
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
-index f5759d4..83a9e0e 100644
+index c436da1..29b79e6 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
-@@ -70,7 +70,9 @@ struct _EphyShellPrivate {
+@@ -63,7 +63,9 @@ struct _EphyShellPrivate {
EggToolbarsModel *toolbars_model;
EggToolbarsModel *fs_toolbars_model;
EphyExtensionsManager *extensions_manager;
@@ -22,7 +22,7 @@ index f5759d4..83a9e0e 100644
GtkWidget *bme;
GtkWidget *history_window;
GObject *pdm_dialog;
-@@ -439,6 +441,8 @@ ephy_shell_new_window_cb (EphyEmbedSingle *single,
+@@ -435,6 +437,8 @@ ephy_shell_new_window_cb (EphyEmbedSingle *single,
NULL, NULL, flags, chromemask, is_popup, 0);
}
@@ -31,7 +31,7 @@ index f5759d4..83a9e0e 100644
static void
ephy_shell_sync_network_status (EphyNetworkManager *nm_proxy,
NMState state,
-@@ -456,6 +460,8 @@ ephy_shell_sync_network_status (EphyNetworkManager *nm_proxy,
+@@ -452,6 +456,8 @@ ephy_shell_sync_network_status (EphyNetworkManager *nm_proxy,
ephy_embed_single_set_network_status (single, net_status);
}
@@ -40,21 +40,22 @@ index f5759d4..83a9e0e 100644
static GObject*
impl_get_embed_single (EphyEmbedShell *embed_shell)
{
-@@ -473,11 +479,13 @@ 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 */
- 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);
+ }
+#endif
}
return embed_single;
-@@ -566,6 +574,7 @@ ephy_shell_dispose (GObject *object)
+@@ -563,6 +571,7 @@ ephy_shell_dispose (GObject *object)
priv->bookmarks = NULL;
}
@@ -62,7 +63,7 @@ index f5759d4..83a9e0e 100644
if (priv->nm_proxy != NULL) {
LOG ("Unref net monitor ");
g_signal_handlers_disconnect_by_func
-@@ -573,6 +582,7 @@ ephy_shell_dispose (GObject *object)
+@@ -570,6 +579,7 @@ ephy_shell_dispose (GObject *object)
g_object_unref (priv->nm_proxy);
priv->nm_proxy = NULL;
}
@@ -70,7 +71,7 @@ index f5759d4..83a9e0e 100644
G_OBJECT_CLASS (ephy_shell_parent_class)->dispose (object);
}
-@@ -918,6 +928,7 @@ ephy_shell_get_extensions_manager (EphyShell *es)
+@@ -915,6 +925,7 @@ ephy_shell_get_extensions_manager (EphyShell *es)
GObject *
ephy_shell_get_net_monitor (EphyShell *shell)
{
@@ -78,7 +79,7 @@ index f5759d4..83a9e0e 100644
EphyShellPrivate *priv = shell->priv;
if (priv->nm_proxy == NULL) {
-@@ -932,6 +943,9 @@ ephy_shell_get_net_monitor (EphyShell *shell)
+@@ -929,6 +940,9 @@ ephy_shell_get_net_monitor (EphyShell *shell)
}
return G_OBJECT (priv->nm_proxy);