Fix bug #156304, removed SerialMeter.

(Portage version: 2.1.2-r4)

4 files changed, 81 insertions, 2 deletions

diff --git a/x11-misc/xosview/ChangeLog b/x11-misc/xosview/ChangeLog
index e3e2ea946bee..6d57cef53aee 100644
--- a/x11-misc/xosview/ChangeLog
+++ b/x11-misc/xosview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xosview
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.31 2007/01/05 09:20:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.32 2007/01/28 19:26:17 nelchael Exp $
+
+  28 Jan 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xosview-1.8.3-remove-serialmeter.patch, xosview-1.8.3.ebuild:
+  Fix bug #156304, removed SerialMeter.
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   xosview-1.8.2-r1.ebuild, xosview-1.8.3.ebuild:
diff --git a/x11-misc/xosview/files/digest-xosview-1.8.2-r1 b/x11-misc/xosview/files/digest-xosview-1.8.2-r1
index 1627abd4cc5e..6e12839a9428 100644
--- a/x11-misc/xosview/files/digest-xosview-1.8.2-r1
+++ b/x11-misc/xosview/files/digest-xosview-1.8.2-r1
@@ -1 +1,3 @@
 MD5 cc8b261b1f8d82da29239f1cc2ee55e9 xosview-1.8.2.tar.gz 248859
+RMD160 eb2a513629350795b85c41fc61cbd23da4de140e xosview-1.8.2.tar.gz 248859
+SHA256 bf9cbfc2a7dd2824aad4be94211ec92741ef6e21eb7f634772592186a9ff478c xosview-1.8.2.tar.gz 248859
diff --git a/x11-misc/xosview/files/xosview-1.8.3-remove-serialmeter.patch b/x11-misc/xosview/files/xosview-1.8.3-remove-serialmeter.patch
new file mode 100644
index 000000000000..21af07120fee
--- /dev/null
+++ b/x11-misc/xosview/files/xosview-1.8.3-remove-serialmeter.patch
@@ -0,0 +1,72 @@
+diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/linux/MeterMaker.cc xosview-1.8.3/linux/MeterMaker.cc
+--- xosview-1.8.3.vanilla/linux/MeterMaker.cc	2007-01-28 20:09:28.000000000 +0100
++++ xosview-1.8.3/linux/MeterMaker.cc	2007-01-28 20:19:04.000000000 +0100
+@@ -76,10 +76,12 @@
+ #if defined (__arm__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__s390__) || defined(__s390x__)
+   /* these architectures have no ioperm() */
+ #else
++  /*
+   for (int i = 0 ; i < SerialMeter::numDevices() ; i++)
+     if (_xos->isResourceTrue(SerialMeter::getResourceName(
+       (SerialMeter::Device)i)))
+         push(new SerialMeter(_xos, (SerialMeter::Device)i));
++  */
+ #endif
+ 
+   // check for the interrupt meter
+diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/linux/serialmeter.cc xosview-1.8.3/linux/serialmeter.cc
+--- xosview-1.8.3.vanilla/linux/serialmeter.cc	2007-01-28 20:09:28.000000000 +0100
++++ xosview-1.8.3/linux/serialmeter.cc	2007-01-28 20:18:08.000000000 +0100
+@@ -10,6 +10,7 @@
+ //
+ //  In order to use this new serial meter, xosview needs to be suid root.
+ //
++/*
+ #include "serialmeter.h"
+ #include "xosview.h"
+ #include <fcntl.h>
+@@ -154,4 +155,4 @@
+   }
+ 
+   return 0;
+-}
++}*/
+diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/snprintf.cc xosview-1.8.3/snprintf.cc
+--- xosview-1.8.3.vanilla/snprintf.cc	2007-01-28 20:09:28.000000000 +0100
++++ xosview-1.8.3/snprintf.cc	2007-01-28 20:18:47.000000000 +0100
+@@ -1,11 +1,11 @@
+ #ifndef HAVE_SNPRINTF
+ 
++/*
+ #include <stdarg.h>
+ #include <stdio.h>
+ 
+ extern "C" int snprintf ( char *str, int n, const char *format, ...)
+     {
+-    /* punt the warning */
+     n++;
+     va_list ap;
+     va_start(ap, format);
+@@ -13,5 +13,6 @@
+     va_end(ap);
+     return rval;
+     }
++*/
+ 
+ #endif
+diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/snprintf.h xosview-1.8.3/snprintf.h
+--- xosview-1.8.3.vanilla/snprintf.h	2007-01-28 20:09:28.000000000 +0100
++++ xosview-1.8.3/snprintf.h	2007-01-28 20:18:20.000000000 +0100
+@@ -1,10 +1,12 @@
+ #ifndef snprintf_h
+ #define snprintf_h
+ 
++/*
+ #ifndef HAVE_SNPRINTF
+ extern "C" int snprintf ( char *str, int n, const char *format, ...);
+ #else
+ #include <stdio.h>
+ #endif
++*/
+ 
+ #endif
diff --git a/x11-misc/xosview/xosview-1.8.3.ebuild b/x11-misc/xosview/xosview-1.8.3.ebuild
index 3adfe6e2f38e..b2b78611d33a 100644
--- a/x11-misc/xosview/xosview-1.8.3.ebuild
+++ b/x11-misc/xosview/xosview-1.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.3.ebuild,v 1.3 2007/01/05 09:20:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.3.ebuild,v 1.4 2007/01/28 19:26:17 nelchael Exp $
 
 inherit eutils
 
@@ -24,6 +24,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/xosview-emptyxpaths.patch"
 	epatch "${FILESDIR}/xosview-resdir.patch"
+	epatch "${FILESDIR}/${P}-remove-serialmeter.patch"
 }
 
 src_install() {