Fix building with >= GTK+ 2.20 wrt #324101 by Helmut Jarausch.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 52 insertions, 14 deletions

diff --git a/x11-misc/xsensors/ChangeLog b/x11-misc/xsensors/ChangeLog
index ccdcdb18dae8..b5de02547aff 100644
--- a/x11-misc/xsensors/ChangeLog
+++ b/x11-misc/xsensors/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xsensors
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsensors/ChangeLog,v 1.30 2010/06/14 20:21:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsensors/ChangeLog,v 1.31 2010/06/15 11:35:08 ssuominen Exp $
+
+  15 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> xsensors-0.70.ebuild,
+  +files/xsensors-0.70-gtk220.patch:
+  Fix building with >= GTK+ 2.20 wrt #324101 by Helmut Jarausch.
 
   14 Jun 2010; <fauli@gentoo.org> xsensors-0.70.ebuild:
   stable x86, bug 323193
diff --git a/x11-misc/xsensors/Manifest b/x11-misc/xsensors/Manifest
index fbb39ad8819c..4958b6cdd505 100644
--- a/x11-misc/xsensors/Manifest
+++ b/x11-misc/xsensors/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xsensors-0.70-gtk220.patch 1562 RMD160 8583ab3c238aff46fddb5a5a705f4be888fd398f SHA1 ea6ad859e70fb6851cec8e0e05d87fb8d9c48045 SHA256 4ccdf6da4a2ae5dcd55f0cff84a23b304d120bfc0b01f13bc389c3b88e98f416
 DIST xsensors-0.60.tar.gz 221568 RMD160 f5972964d9a16c65cca80abfe4c4c17d65eb2a3b SHA1 0d8e399cd3b70846af116c8b44555fe624c896a1 SHA256 027c81f37e7075151bb7ff873bf4a8b298aae40399a1ff6dc1f0e5640208ae0a
 DIST xsensors-0.70.tar.gz 115430 RMD160 1e283d90c70798193a0c23897c40a1a902b89afc SHA1 ffcd47444d225140de23bea93fa45d12d7624c6d SHA256 907f21afd19fe88b70f000d6531ddcd53569ba0c0712e2b0afaab3fd9ca637ea
 EBUILD xsensors-0.60.ebuild 798 RMD160 4869d8e81e5d1f2fab76d427bdde950f8143b337 SHA1 a23af7724bac8365b2fc95e382ac9f986aba00a8 SHA256 67550af0b0c9acc0ec8b7134f4aae0396a8a83429fc4b444b19ae6b7c79872f4
-EBUILD xsensors-0.70.ebuild 660 RMD160 4213e08e3f6d8f8d97455cf57fa7bbf292847d14 SHA1 f8b35dd2373f3991b2e1ed52168192bc1464d649 SHA256 622d7973578ada041ca4717fa98ca8dee16a02081b273511d678df879af1d3f7
-MISC ChangeLog 3526 RMD160 b52d6bb465bb9bb7c6eb6f49da8b1502567d0318 SHA1 d596fede270cb90d4c73ab823ab64ba75c6194dc SHA256 42979e95de56128945465fccf28b6d6fab00e84144f50399314cbb34343f7011
+EBUILD xsensors-0.70.ebuild 738 RMD160 8770a604d2241f62877e06faff6e6d809bb547a0 SHA1 d0247945e7ef866f0af111a6249faf54f5622d5a SHA256 4db796482c6234f567e188d63122170ddeaf386cc15dcac27f8be34faf9f1fdf
+MISC ChangeLog 3709 RMD160 27bf8be65825e43f03eeef0c2373aebc107ad6e3 SHA1 8500a1fed553a43068fe9359045f6758d9622e96 SHA256 1cc1092b4b71722472d527a865534eee18cdfa39ce55624c6fba06efa1698b2c
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkwWj2IACgkQNQqtfCuFneNtVgCfR7OLMxVmSfiw62hPhDUL5tgh
-FAYAn2BNBW7C/72GBgl8Td95tR3Xd6Wt
-=m7bj
------END PGP SIGNATURE-----
diff --git a/x11-misc/xsensors/files/xsensors-0.70-gtk220.patch b/x11-misc/xsensors/files/xsensors-0.70-gtk220.patch
new file mode 100644
index 000000000000..0aaf2c8026bf
--- /dev/null
+++ b/x11-misc/xsensors/files/xsensors-0.70-gtk220.patch
@@ -0,0 +1,38 @@
+--- src/gui.c
++++ src/gui.c
+@@ -84,7 +84,7 @@
+     while ( *digit ) {
+         get_pm_location( *digit, &x, &y, &w );
+         gdk_draw_drawable( widget->window,
+-                           widget->style->fg_gc[ GTK_WIDGET_STATE
++                           widget->style->fg_gc[ gtk_widget_get_state
+                            (widget) ], theme, x, y + highLow,
+                            pos, 0, w, 30 );
+         pos += w;
+@@ -121,7 +121,7 @@
+ 
+             /* Display RPM */
+             gdk_draw_drawable( widget->window, 
+-                               widget->style->fg_gc[ GTK_WIDGET_STATE 
++                               widget->style->fg_gc[ gtk_widget_get_state 
+                                (widget) ], theme, 0, 120 + highLow, 
+                                90, 0, 57, 30 );
+             break;
+@@ -142,7 +142,7 @@
+             else
+                 x = 57;
+             gdk_draw_drawable( widget->window, 
+-                             widget->style->fg_gc[ GTK_WIDGET_STATE 
++                             widget->style->fg_gc[ gtk_widget_get_state 
+                              (widget) ], theme, x, 60 + highLow, 
+                              96, 0, 57, 30 );
+             
+@@ -158,7 +158,7 @@
+ 
+             /* Display V */
+             gdk_draw_drawable( widget->window, 
+-                             widget->style->fg_gc[ GTK_WIDGET_STATE 
++                             widget->style->fg_gc[ gtk_widget_get_state 
+                              (widget) ], theme, 114, 60 + highLow, 
+                              96, 0, 57, 30 );
+ 
diff --git a/x11-misc/xsensors/xsensors-0.70.ebuild b/x11-misc/xsensors/xsensors-0.70.ebuild
index 319196f5b4fb..67183565690d 100644
--- a/x11-misc/xsensors/xsensors-0.70.ebuild
+++ b/x11-misc/xsensors/xsensors-0.70.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsensors/xsensors-0.70.ebuild,v 1.3 2010/06/14 20:21:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsensors/xsensors-0.70.ebuild,v 1.4 2010/06/15 11:35:08 ssuominen Exp $
 
 EAPI=2
+inherit eutils
 
 DESCRIPTION="A hardware health information viewer, interface to lm-sensors."
 HOMEPAGE="http://www.linuxhardware.org/xsensors/"
@@ -18,6 +19,10 @@ RDEPEND="x11-libs/gtk+:2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gtk220.patch
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog README TODO