diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-06-15 11:35:08 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-15 11:35:08 +0000 |
| commit | 75b6fe2e1f9ea87b234afb72b8d4ceeca78bd215 (patch) | |
| tree | 08ff1c7555fa4f4ad4f9c0d58623bf2b201953fd /x11-misc | |
| parent | QA, imported prefix changes (diff) | |
| download | gentoo-2-75b6fe2e1f9ea87b234afb72b8d4ceeca78bd215.tar.gz gentoo-2-75b6fe2e1f9ea87b234afb72b8d4ceeca78bd215.tar.bz2 gentoo-2-75b6fe2e1f9ea87b234afb72b8d4ceeca78bd215.zip | |
Fix building with >= GTK+ 2.20 wrt #324101 by Helmut Jarausch.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xsensors/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xsensors/files/xsensors-0.70-gtk220.patch | 38 | ||||
| -rw-r--r-- | x11-misc/xsensors/xsensors-0.70.ebuild | 7 |
3 files changed, 49 insertions, 2 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/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 |