Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 438152 - x11-misc/xosview-1.11 version bump
Summary: x11-misc/xosview-1.11 version bump
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal enhancement (vote)
Assignee: Desktop Misc. Team
URL: http://www.pogo.org.uk/~mark/xosview/
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-10-12 17:20 UTC by Lars Wendler (Polynomial-C) (RETIRED)
Modified: 2012-10-15 06:39 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Lars Wendler (Polynomial-C) (RETIRED) gentoo-dev 2012-10-12 17:20:27 UTC 
As usual there's no ChangeLog available...
Comment 1 Michael Weber (RETIRED) gentoo-dev 2012-10-15 06:39:08 UTC 
+*xosview-1.11 (15 Oct 2012)
+
+  15 Oct 2012; Michael Weber <xmw@gentoo.org> +xosview-1.11.ebuild:
+  Version bump (by polynomial-c, bug 438152)
+

(In reply to comment #0)
> As usual there's no ChangeLog available...

diff -ru /var/tmp/portage/x11-misc/xosview-1.10/work/xosview-1.10/linux/cpumeter.cc /var/tmp/portage/x11-misc/xosview-1.11/work/xosview-1.11/linux/cpumeter.cc
--- /var/tmp/portage/x11-misc/xosview-1.10/work/xosview-1.10/linux/cpumeter.cc  2012-09-16 12:20:42.000000000 +0200
+++ /var/tmp/portage/x11-misc/xosview-1.11/work/xosview-1.11/linux/cpumeter.cc  2012-09-26 11:18:03.000000000 +0200
@@ -15,7 +15,7 @@
 #include <ctype.h>
 
 static const char STATFILENAME[] = "/proc/stat";
-static const char VERSIONFILENAME[] = "/proc/version";
+static const char VERSIONFILENAME[] = "/proc/sys/kernel/osrelease";
 static int cputime_to_field[10] = { 0, 1, 2, 9, 5, 4, 3, 8, 6, 7 };
 
 #define MAX_PROCSTAT_LENGTH 4096
@@ -343,10 +343,10 @@
     exit(1);
   }
 
-  std::string tmp, version;
+  std::string version;
   int major = 0, minor = 0, micro = 0;
 
-  f >> tmp >> tmp >> version;
+  f >> version;
   sscanf(version.c_str(), "%d.%d.%d", &major, &minor, &micro);
 
   return ( major*1000000 + minor*1000 + micro);
diff -ru /var/tmp/portage/x11-misc/xosview-1.10/work/xosview-1.10/linux/netmeter.cc /var/tmp/portage/x11-misc/xosview-1.11/work/xosview-1.11/linux/netmeter.cc
--- /var/tmp/portage/x11-misc/xosview-1.10/work/xosview-1.10/linux/netmeter.cc  2012-09-16 12:20:42.000000000 +0200
+++ /var/tmp/portage/x11-misc/xosview-1.11/work/xosview-1.11/linux/netmeter.cc  2012-09-26 11:18:03.000000000 +0200
@@ -61,7 +61,7 @@
 
 void NetMeter::checkOSVersion(void)
     {
-    if (CPUMeter::getkernelversion() >= 2100000)
+    if (CPUMeter::getkernelversion() >= 2001000)
         {
        // check presence of iacct and oacct chains
         std::ifstream chains("/proc/net/ip_fwchains");