aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gmail.com>2011-10-19 04:14:43 -0400
committerAlexandre Rostovtsev <tetromino@gmail.com>2011-10-19 04:14:43 -0400
commit1f21111b5fe22a8d627f4428ce1ce5f746321c45 (patch)
tree61af7a4d5a2ae67bf52a4879a1b1a47c50eec546 /www-client
parentgnome-extra/gnome-contacts: 3.2.0.1 → 3.2.1 (diff)
downloadgnome-1f21111b5fe22a8d627f4428ce1ce5f746321c45.tar.gz
gnome-1f21111b5fe22a8d627f4428ce1ce5f746321c45.tar.bz2
gnome-1f21111b5fe22a8d627f4428ce1ce5f746321c45.zip
www-client/epiphany: 3.2.0 → 3.2.1
Bump, patch was applied upstream.
Diffstat (limited to 'www-client')
-rw-r--r--www-client/epiphany/Manifest5
-rw-r--r--www-client/epiphany/epiphany-3.2.1.ebuild (renamed from www-client/epiphany/epiphany-3.2.0.ebuild)3
-rw-r--r--www-client/epiphany/files/epiphany-3.2.0-networkmanager-crash.patch31
3 files changed, 2 insertions, 37 deletions
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 65416d5a..de0ac71c 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,5 +1,4 @@
-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
+DIST epiphany-3.2.1.tar.xz 5101156 RMD160 96831872603b51860e315c184285549d886ac93e SHA1 bb82f9890bc27374139305a41952974826a9dab8 SHA256 5ade10d9becce1ca43c30d755fda477c5595a1c0514047f07f7d4b817a2154fe
+EBUILD epiphany-3.2.1.ebuild 2417 RMD160 0cc62ba8404bb772774cf0f043c32324092ded87 SHA1 5020244b5aaa162c8702e338375e8f1015186bbe SHA256 407711d4eb6974af7b6e8b47ffb10f6797457ffcf68e6f6c326121c0d4c7382e
EBUILD epiphany-9999.ebuild 2417 RMD160 0cc62ba8404bb772774cf0f043c32324092ded87 SHA1 5020244b5aaa162c8702e338375e8f1015186bbe SHA256 407711d4eb6974af7b6e8b47ffb10f6797457ffcf68e6f6c326121c0d4c7382e
diff --git a/www-client/epiphany/epiphany-3.2.0.ebuild b/www-client/epiphany/epiphany-3.2.1.ebuild
index 08c4fc79..95b0ea4c 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 0742af3c..00000000
--- 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