Fix grid display issues, bug #479794.

(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 105 insertions, 1 deletions

diff --git a/gnome-extra/gnome-system-monitor/ChangeLog b/gnome-extra/gnome-system-monitor/ChangeLog
index bb8b582eac97..dca931bdf973 100644
--- a/gnome-extra/gnome-system-monitor/ChangeLog
+++ b/gnome-extra/gnome-system-monitor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-system-monitor
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.234 2013/05/14 21:37:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.235 2013/08/10 09:47:55 eva Exp $
+
+*gnome-system-monitor-3.8.2.1-r1 (10 Aug 2013)
+
+  10 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-system-monitor-3.8.2.1-r1.ebuild,
+  +files/gnome-system-monitor-3.8.2.1-fix-grid-display.patch:
+  Fix grid display issues, bug #479794.
 
 *gnome-system-monitor-3.8.2.1 (14 May 2013)
 
diff --git a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.8.2.1-fix-grid-display.patch b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.8.2.1-fix-grid-display.patch
new file mode 100644
index 000000000000..ab5571abd32b
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.8.2.1-fix-grid-display.patch
@@ -0,0 +1,46 @@
+From 22708897fcafa545d767309c0f15d8167848a63c Mon Sep 17 00:00:00 2001
+From: Robert Roth <robert.roth.off@gmail.com>
+Date: Wed, 10 Jul 2013 21:27:58 +0000
+Subject: Fixed graph grids not rendered issue (Bug 693677).
+
+Fixed graph grids not being rendered issue by
+redrawing the grids in case of state flags changes, so when the window
+gets focused, the grid is redrawn.
+http://bugzilla.gnome.org/show_bug.cgi?id=693677
+---
+diff --git a/src/load-graph.cpp b/src/load-graph.cpp
+index 4bbac9d..6ede62f 100644
+--- a/src/load-graph.cpp
++++ b/src/load-graph.cpp
+@@ -216,6 +216,20 @@ load_graph_configure (GtkWidget *widget,
+ }
+ 
+ static gboolean
++load_graph_state_changed (GtkWidget *widget,
++                      GtkStateFlags *flags,
++                      gpointer data_ptr)
++{
++    LoadGraph * const graph = static_cast<LoadGraph*>(data_ptr);
++
++    graph->clear_background();
++
++    load_graph_queue_draw (graph);
++
++    return TRUE;
++}
++
++static gboolean
+ load_graph_draw (GtkWidget *widget,
+                  cairo_t * context,
+                  gpointer data_ptr)
+@@ -782,6 +796,8 @@ LoadGraph::LoadGraph(guint type)
+                       G_CALLBACK (load_graph_configure), graph);
+     g_signal_connect (G_OBJECT(disp), "destroy",
+                       G_CALLBACK (load_graph_destroy), graph);
++    g_signal_connect (G_OBJECT(disp), "state-flags-changed",
++                      G_CALLBACK (load_graph_state_changed), graph);
+ 
+     gtk_widget_set_events (disp, GDK_EXPOSURE_MASK);
+ 
+--
+cgit v0.9.2
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.8.2.1-r1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.8.2.1-r1.ebuild
new file mode 100644
index 000000000000..b3738628c808
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.8.2.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.8.2.1-r1.ebuild,v 1.1 2013/08/10 09:47:55 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="The Gnome System Monitor"
+HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="systemd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/libwnck-2.91.0:3
+	>=gnome-base/libgtop-2.28.2:2
+	>=x11-libs/gtk+-3.5.12:3[X(+)]
+	>=x11-themes/gnome-icon-theme-2.31
+	>=dev-cpp/gtkmm-3.3.18:3.0
+	>=dev-cpp/glibmm-2.27:2
+	>=dev-libs/libxml2-2.0:2
+	>=gnome-base/librsvg-2.35:2
+
+	systemd? ( >=sys-apps/systemd-38 )
+"
+DEPEND="${RDEPEND}
+	>=app-text/gnome-doc-utils-0.20
+	>=dev-util/intltool-0.41.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	systemd? ( !=sys-apps/systemd-43* )
+"
+
+src_prepare() {
+	# Fix grid disappearing, bug#479794 bgo693677, from git master
+	epatch "${FILESDIR}"/${PN}-3.8.2.1-fix-grid-display.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable systemd) \
+		ITSTOOL=$(type -P true)
+}