fix bug 142131

(Portage version: 2.1.2_pre2-r5)

6 files changed, 87 insertions, 1 deletions

diff --git a/x11-plugins/wmupmon/ChangeLog b/x11-plugins/wmupmon/ChangeLog
index 8b53eb974bf0..ab9189228e9e 100644
--- a/x11-plugins/wmupmon/ChangeLog
+++ b/x11-plugins/wmupmon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmupmon
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmupmon/ChangeLog,v 1.15 2006/03/27 12:19:06 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmupmon/ChangeLog,v 1.16 2006/10/12 11:17:04 blubb Exp $
+
+*wmupmon-0.1.3-r1 (12 Oct 2006)
+
+  12 Oct 2006; Simon Stelling <blubb@gentoo.org>
+  +files/wmupmon-0.1.3-arraysize.patch, +wmupmon-0.1.3-r1.ebuild:
+  fix bug 142131
 
   27 Mar 2006; Markus Rothe <corsair@gentoo.org> wmupmon-0.1.3.ebuild:
   Stable on ppc64
diff --git a/x11-plugins/wmupmon/files/digest-wmupmon-0.1.2 b/x11-plugins/wmupmon/files/digest-wmupmon-0.1.2
index 6a2c0a768d91..bac6aa10758a 100644
--- a/x11-plugins/wmupmon/files/digest-wmupmon-0.1.2
+++ b/x11-plugins/wmupmon/files/digest-wmupmon-0.1.2
@@ -1 +1,3 @@
 MD5 935fbabb77f0e0f7ca807a8e76fcda7d wmupmon-0.1.2.tar.bz2 144485
+RMD160 8f1633b3c9e1e3bf9bfd0622406bb8a388cf2a86 wmupmon-0.1.2.tar.bz2 144485
+SHA256 73a4c0646359ccc6eef5fe4af47b7d364bf091b51959bdca630971473662018a wmupmon-0.1.2.tar.bz2 144485
diff --git a/x11-plugins/wmupmon/files/digest-wmupmon-0.1.3 b/x11-plugins/wmupmon/files/digest-wmupmon-0.1.3
index e3d80ca7fecf..f21fd1444352 100644
--- a/x11-plugins/wmupmon/files/digest-wmupmon-0.1.3
+++ b/x11-plugins/wmupmon/files/digest-wmupmon-0.1.3
@@ -1 +1,3 @@
 MD5 5de5cf7c074f15bb5d8d7d6beb5f4268 wmupmon-0.1.3.tar.bz2 90108
+RMD160 4b91edf57697114132dbb1a441774d59801350cf wmupmon-0.1.3.tar.bz2 90108
+SHA256 7583f163fa472ec72a4f952c2ece8648a3ca709e4594b2b1591987671b0f38bc wmupmon-0.1.3.tar.bz2 90108
diff --git a/x11-plugins/wmupmon/files/digest-wmupmon-0.1.3-r1 b/x11-plugins/wmupmon/files/digest-wmupmon-0.1.3-r1
new file mode 100644
index 000000000000..f21fd1444352
--- /dev/null
+++ b/x11-plugins/wmupmon/files/digest-wmupmon-0.1.3-r1
@@ -0,0 +1,3 @@
+MD5 5de5cf7c074f15bb5d8d7d6beb5f4268 wmupmon-0.1.3.tar.bz2 90108
+RMD160 4b91edf57697114132dbb1a441774d59801350cf wmupmon-0.1.3.tar.bz2 90108
+SHA256 7583f163fa472ec72a4f952c2ece8648a3ca709e4594b2b1591987671b0f38bc wmupmon-0.1.3.tar.bz2 90108
diff --git a/x11-plugins/wmupmon/files/wmupmon-0.1.3-arraysize.patch b/x11-plugins/wmupmon/files/wmupmon-0.1.3-arraysize.patch
new file mode 100644
index 000000000000..4a974d169aba
--- /dev/null
+++ b/x11-plugins/wmupmon/files/wmupmon-0.1.3-arraysize.patch
@@ -0,0 +1,32 @@
+--- src/main.c.orig	2006-10-12 13:09:14.000000000 +0200
++++ src/main.c	2006-10-12 13:12:27.000000000 +0200
+@@ -66,10 +66,10 @@
+ int main(int argc, char **argv)
+ {
+    int i, a, aa, b, bb;
+-   char* real_off_xpm[(style == 2 ? sizeof(backlight2_off_xpm) :
+-                       sizeof(backlight_off_xpm))];
+-   char* real_on_xpm[(style == 2 ? sizeof(backlight2_on_xpm) :
+-                       sizeof(backlight_on_xpm))];
++   char* real_off_xpm[(style == 2 ? sizeof(backlight2_off_xpm)/sizeof(char*) :
++                       sizeof(backlight_off_xpm)/sizeof(char*))];
++   char* real_on_xpm[(style == 2 ? sizeof(backlight2_on_xpm)/sizeof(char*) :
++                       sizeof(backlight_on_xpm)/sizeof(char*))];
+    XEvent event;
+    XpmColorSymbol colors[2] = { {"Back0", NULL, 0}, {"Back1", NULL, 0} };
+    int ncolor = 0;
+@@ -79,10 +79,10 @@
+    
+    /* setup pixmap to use - this is ugly but it works */
+    
+-   a = sizeof(backlight2_off_xpm);
+-   aa = sizeof(backlight2_on_xpm);
+-   b = sizeof(backlight_off_xpm);
+-   bb = sizeof(backlight_on_xpm);
++   a = sizeof(backlight2_off_xpm)/sizeof(char*);
++   aa = sizeof(backlight2_on_xpm)/sizeof(char*);
++   b = sizeof(backlight_off_xpm)/sizeof(char*);
++   bb = sizeof(backlight_on_xpm)/sizeof(char*);
+    if(style == 2){
+       for(i=0; i<a; i++)
+          real_off_xpm[i] = backlight2_off_xpm[i];
diff --git a/x11-plugins/wmupmon/wmupmon-0.1.3-r1.ebuild b/x11-plugins/wmupmon/wmupmon-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..ddc577923a2f
--- /dev/null
+++ b/x11-plugins/wmupmon/wmupmon-0.1.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmupmon/wmupmon-0.1.3-r1.ebuild,v 1.1 2006/10/12 11:17:04 blubb Exp $
+
+inherit eutils
+
+DESCRIPTION="wmUpMon is a program to monitor your Uptime"
+HOMEPAGE="http://j-z-s.com/projects/index.php?project=wmupmon"
+SRC_URI="http://j-z-s.com/projects/downloads/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}"/${P}-arraysize.patch
+}
+
+src_compile()
+{
+	econf || die "configure failed"
+	emake || die "parallel make failed"
+}
+
+src_install()
+{
+	einstall || die "make install failed"
+	dodoc AUTHORS README THANKS ChangeLog
+}