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

[Alexandre Restovtsev]

commit:     2d2274e66743c0154459d32ac27eb666e5a9edba
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 02:45:59 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep 28 02:45:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2d2274e6

www-client/epiphany: 3.1.92 → 3.2.0

Bump and update the networkmanager patch. Add an upstream patch to
prevent a crash.

---
 ...piphany-3.1.92.ebuild => epiphany-3.2.0.ebuild} |    7 +++-
 www-client/epiphany/epiphany-9999.ebuild           |   10 ++++--
 .../epiphany-3.2.0-networkmanager-crash.patch      |   31 ++++++++++++++++++++
 ...> epiphany-3.2.0-optional-networkmanager.patch} |   29 +++++++++---------
 4 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.1.92.ebuild b/www-client/epiphany/epiphany-3.2.0.ebuild
similarity index 91%
rename from www-client/epiphany/epiphany-3.1.92.ebuild
rename to www-client/epiphany/epiphany-3.2.0.ebuild
index 08ef4f6..08c4fc7 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 26d9951..95b0ea4 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 0000000..0742af3
--- /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@×××××××××.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@×××××××××.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
similarity index 69%
rename from www-client/epiphany/files/epiphany-3.1.91.1-optional-networkmanager.patch
rename to www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch
index 4c3cd17..0ac6112 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@×××××.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);