Hello community,
here is the log from the commit of package xosview for openSUSE:Factory checked
in at 2012-02-08 17:21:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xosview (Old)
and /work/SRC/openSUSE:Factory/.xosview.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xosview", Maintainer is "wer...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xosview/xosview.changes 2012-02-02
18:01:18.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xosview.new/xosview.changes 2012-02-08
17:21:35.000000000 +0100
@@ -1,0 +2,13 @@
+Wed Feb 8 11:39:02 UTC 2012 - wer...@suse.de
+
+- Update to xosview version 1.9.2
+ * Fix a bug where battery meter was not redrawn
+ * Modify linux serialmeter startup to allow for a port number instead of
+ True/False. Patch provided by Horst Wente.
+ * netIface support for NetBSD. Patch from Bernd Ernesti.
+ * Move repository to Git
+ * Merged patches from Debian distribution
+ * Several bugfixes
+ * Improvements to defaults
+
+-------------------------------------------------------------------
@@ -25,0 +39,5 @@
+
+-------------------------------------------------------------------
+Wed Jun 3 02:08:28 CEST 2009 - crrodrig...@suse.de
+
+- fix build
Old:
----
xosview-1.8.0-irda.patch
xosview-1.8.1-procsys.patch
xosview-1.8.2-configure.patch
xosview-1.8.3-appdef.dif
xosview-1.8.3-diskstat.dif
xosview-1.8.3-double.patch
xosview-1.8.3-float-conv.patch
xosview-1.8.3-longint.patch
xosview-1.8.3-maxlimit.patch
xosview-1.8.3-serial.patch
xosview-1.8.3.dif
xosview-1.8.3.tar.bz2
New:
----
xosview-1.9.2-appdef.dif
xosview-1.9.2-diskstat.dif
xosview-1.9.2-double.patch
xosview-1.9.2-float-conv.patch
xosview-1.9.2-irda.patch
xosview-1.9.2-longint.patch
xosview-1.9.2-maxlimit.patch
xosview-1.9.2-procsys.patch
xosview-1.9.2-serial.patch
xosview-1.9.2.dif
xosview-1.9.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xosview.spec ++++++
--- /var/tmp/diff_new_pack.LheTH7/_old 2012-02-08 17:21:37.000000000 +0100
+++ /var/tmp/diff_new_pack.LheTH7/_new 2012-02-08 17:21:37.000000000 +0100
@@ -29,7 +29,7 @@
#Requires: desktop-data-SuSE
# This because /usr/bin/xrdb is part of xorg-x11
Requires: xorg-x11
-Version: 1.8.3
+Version: 1.9.2
Release: 0
Summary: System Load Information
License: BSD-3-Clause ; GPL-2.0+ ; MIT
@@ -41,16 +41,15 @@
Source3: xosview.desktop
Source4: xosview.sh
Patch: xosview-%{version}.dif
-Patch1: xosview-1.8.3-serial.patch
-Patch2: xosview-1.8.1-procsys.patch
-Patch3: xosview-1.8.3-maxlimit.patch
-Patch4: xosview-1.8.0-irda.patch
+Patch1: xosview-%{version}-serial.patch
+Patch2: xosview-%{version}-procsys.patch
+Patch3: xosview-%{version}-maxlimit.patch
+Patch4: xosview-%{version}-irda.patch
Patch6: xosview-%{version}-double.patch
Patch7: xosview-%{version}-longint.patch
-Patch8: xosview-1.8.3-float-conv.patch
-Patch9: xosview-1.8.2-configure.patch
-Patch10: xosview-1.8.3-appdef.dif
-Patch11: xosview-1.8.3-diskstat.dif
+Patch8: xosview-%{version}-float-conv.patch
+Patch10: xosview-%{version}-appdef.dif
+Patch11: xosview-%{version}-diskstat.dif
Patch12: xosview-config.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config
--variable prefix x11 || echo /usr/X11R6)}
@@ -82,7 +81,6 @@
%patch6 -p0 -b ".double"
%patch7 -p0 -b ".ulong"
%patch8 -p0 -b ".float-conv"
-%patch9 -p0 -b ".conf"
%patch10 -p0 -b ".appdef"
%patch11 -p0 -b ".diskstat"
%patch12
++++++ xosview-1.8.3-appdef.dif -> xosview-1.9.2-appdef.dif ++++++
--- /work/SRC/openSUSE:Factory/xosview/xosview-1.8.3-appdef.dif 2011-09-23
12:52:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xosview.new/xosview-1.9.2-appdef.dif
2012-02-08 17:21:35.000000000 +0100
@@ -1,40 +1,50 @@
--- Xrm.cc
-+++ Xrm.cc 2006-12-11 10:46:28.000000000 +0000
-@@ -11,6 +11,7 @@
- #include <stdlib.h>
++++ Xrm.cc 2012-02-07 16:45:31.561934420 +0000
+@@ -9,6 +9,7 @@
#include <stdio.h> // For snprintf().
#include <ctype.h>
-+#include <sys/stat.h> // For stat().
- #ifdef HAVE_IOSTREAM
#include <iostream>
- #else
-@@ -152,20 +153,26 @@ Listed from weakest to strongest:
++#include <sys/stat.h> // For stat().
+ #include <unistd.h> // for access(), etc. BCG
+ #include "snprintf.h"
+ #include "general.h"
+@@ -140,29 +141,34 @@ Listed from weakest to strongest:
// Merge in the system resource database.
char rfilename[2048];
+ struct stat st;
+ int result;
// Get the app-defaults
-+ snprintf(rfilename, 2048, "/usr/share/X11/app-defaults/%s",
-+ XrmQuarkToString(_class));
-+ if (rfilename != NULL && stat(rfilename, &st) == 0)
++ result = snprintf(rfilename, sizeof rfilename,
"/usr/share/X11/app-defaults/%s",
++ XrmQuarkToString(_class));
++ if (result >= 0 && (size_t)result < sizeof rfilename && stat(rfilename,
&st) == 0)
+ XrmCombineFileDatabase (rfilename, &_db, 1);
-+ // Old X11R6
- snprintf(rfilename, 2048, "/usr/X11R6/lib/X11/app-defaults/%s",
- XrmQuarkToString(_class));
+ result = snprintf(rfilename, sizeof rfilename, "/etc/X11/app-defaults/%s",
+ XrmQuarkToString(_class));
- if (rfilename != NULL)
-+ if (rfilename != NULL && stat(rfilename, &st) == 0)
++ if (result >= 0 && (size_t)result < sizeof rfilename && stat(rfilename,
&st) == 0)
+ XrmCombineFileDatabase (rfilename, &_db, 1);
+ result = snprintf(rfilename, sizeof rfilename,
"/usr/lib/X11/app-defaults/%s",
+ XrmQuarkToString(_class));
+- if (result >= 0 && result < sizeof rfilename)
++ if (result >= 0 && (size_t)result < sizeof rfilename && stat(rfilename,
&st) == 0)
+ XrmCombineFileDatabase (rfilename, &_db, 1);
+ result = snprintf(rfilename, sizeof rfilename,
"/usr/X11R6/lib/X11/app-defaults/%s",
+ XrmQuarkToString(_class));
+- if (result >= 0 && result < sizeof rfilename)
++ if (result >= 0 && (size_t)result < sizeof rfilename && stat(rfilename,
&st) == 0)
XrmCombineFileDatabase (rfilename, &_db, 1);
// Try a few more, for SunOS/Solaris folks.
- snprintf(rfilename, 2048, "/usr/openwin/lib/X11/app-defaults/%s",
- XrmQuarkToString(_class));
-- if (rfilename != NULL)
-+ if (rfilename != NULL && stat(rfilename, &st) == 0)
+ result = snprintf(rfilename, sizeof rfilename,
"/usr/openwin/lib/X11/app-defaults/%s",
+ XrmQuarkToString(_class));
+- if (result >= 0 && result < sizeof rfilename)
++ if (result >= 0 && (size_t)result < sizeof rfilename && stat(rfilename,
&st) == 0)
XrmCombineFileDatabase (rfilename, &_db, 1);
- snprintf(rfilename, 2048, "/usr/local/X11R6/lib/X11/app-defaults/%s",
+ result = snprintf(rfilename, sizeof rfilename,
"/usr/local/X11R6/lib/X11/app-defaults/%s",
XrmQuarkToString(_class));
-- if (rfilename != NULL)
-+ if (rfilename != NULL && stat(rfilename, &st) == 0)
+- if (result >= 0 && result < sizeof rfilename)
++ if (result >= 0 && (size_t)result < sizeof rfilename && stat(rfilename,
&st) == 0)
XrmCombineFileDatabase (rfilename, &_db, 1);
// Now, check for an XOSView file in the XAPPLRESDIR directory...
++++++ xosview-1.8.3-diskstat.dif -> xosview-1.9.2-diskstat.dif ++++++
--- /work/SRC/openSUSE:Factory/xosview/xosview-1.8.3-diskstat.dif
2011-09-23 12:52:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xosview.new/xosview-1.9.2-diskstat.dif
2012-02-08 17:21:35.000000000 +0100
@@ -1,7 +1,7 @@
--- linux/diskmeter.cc
-+++ linux/diskmeter.cc 2008-05-15 17:52:18.589147973 +0200
-@@ -217,8 +217,8 @@ void DiskMeter::update_info(unsigned lon
- if(sysfs_write_prev_ == 0L) sysfs_write_prev_ = wsum;
++++ linux/diskmeter.cc 2008-05-15 15:52:19.000000000 +0000
+@@ -219,8 +219,8 @@ void DiskMeter::update_info(unsigned lon
+ }
// convert rate from bytes/microsec into bytes/second
- fields_[0] = ((rsum - sysfs_read_prev_ ) * 1e6 ) / itim;
@@ -11,7 +11,7 @@
// fix overflow (conversion bug?)
if (fields_[0] < 0.0)
-@@ -255,19 +255,14 @@ void DiskMeter::getsysfsdiskinfo( void )
+@@ -257,19 +257,14 @@ void DiskMeter::getsysfsdiskinfo( void )
// just sum up everything in /sys/block/*/stat
std::string sysfs_dir = _statFileName;
@@ -31,7 +31,7 @@
IntervalTimerStop();
total_ = maxspeed_;
-@@ -279,29 +274,83 @@ void DiskMeter::getsysfsdiskinfo( void )
+@@ -281,29 +276,83 @@ void DiskMeter::getsysfsdiskinfo( void )
// reset all sums
all_bytes_read=all_bytes_written=0L;
++++++ xosview-1.8.3-double.patch -> xosview-1.9.2-double.patch ++++++
++++ 1379 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/xosview/xosview-1.8.3-double.patch
++++ and /work/SRC/openSUSE:Factory/.xosview.new/xosview-1.9.2-double.patch
++++++ xosview-1.8.3-float-conv.patch -> xosview-1.9.2-float-conv.patch ++++++
--- /work/SRC/openSUSE:Factory/xosview/xosview-1.8.3-float-conv.patch
2011-09-23 12:52:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xosview.new/xosview-1.9.2-float-conv.patch
2012-02-08 17:21:35.000000000 +0100
@@ -1,24 +1,15 @@
- linux/swapmeter.cc | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-Index: linux/swapmeter.cc
-===================================================================
---- linux/swapmeter.cc.orig
-+++ linux/swapmeter.cc
-@@ -62,13 +62,13 @@ void SwapMeter::getswapinfo( void ){
- syscall( SYS_sysinfo, &sinfo );
- #endif
+--- linux/swapmeter.cc
++++ linux/swapmeter.cc 2012-02-01 14:14:46.777933756 +0000
+@@ -61,9 +61,9 @@ void SwapMeter::getswapinfo( void ){
unit = (sinfo.mem_unit ? sinfo.mem_unit : 1);
-- total_ = sinfo.totalswap * unit;
-- fields_[0] = (sinfo.totalswap - sinfo.freeswap) * unit;
-- fields_[1] = sinfo.freeswap * unit;
-+ total_ = 1.0 * sinfo.totalswap * unit;
-+ fields_[0] = 1.0 * (sinfo.totalswap - sinfo.freeswap) * unit;
-+ fields_[1] = 1.0 * sinfo.freeswap * unit;
+- total_ = (double)sinfo.totalswap * unit;
+- fields_[0] = (double)(sinfo.totalswap - sinfo.freeswap) * unit;
+- fields_[1] = (double)sinfo.freeswap * unit;
++ total_ = (float)sinfo.totalswap * unit;
++ fields_[0] = (float)(sinfo.totalswap - sinfo.freeswap) * unit;
++ fields_[1] = (float)sinfo.freeswap * unit;
if ( total_ == 0 ){
total_ = 1;
- fields_[0] = 0;
- fields_[1] = 1;
++++++ xosview-1.8.0-irda.patch -> xosview-1.9.2-irda.patch ++++++
--- /work/SRC/openSUSE:Factory/xosview/xosview-1.8.0-irda.patch 2011-09-23
12:52:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xosview.new/xosview-1.9.2-irda.patch
2012-02-08 17:21:35.000000000 +0100
@@ -1,30 +1,29 @@
-Index: linux/netmeter.cc
-===================================================================
---- linux/netmeter.cc.orig
-+++ linux/netmeter.cc
-@@ -201,12 +201,22 @@ void NetMeter::checkeventNew(void)
+--- linux/netmeter.cc
++++ linux/netmeter.cc 2012-02-01 09:21:43.878434351 +0000
+@@ -213,11 +213,21 @@ void NetMeter::checkeventNew(void)
ifs >> ig >> ig >> ig >> ig >> ig >> ig >> ig >> out;
}
- if (!ifs.eof())
-+ if (ifs.eof())
- {
+- {
- totin += in;
- totout += out;
+- }
++ if (ifs.eof())
++ {
+ ifs.ignore(1024, '\n');
+ break;
- }
-
++ }
++
+ if (ifs.fail())
-+ {
++ {
+ ifs.clear();
+ ifs.ignore(1024, '\n');
+ continue;
-+ }
++ }
+
+ totin += in;
+ totout += out;
-+
+
ifs.ignore(1024, '\n');
}
- }
++++++ xosview-1.8.3-longint.patch -> xosview-1.9.2-longint.patch ++++++
--- /work/SRC/openSUSE:Factory/xosview/xosview-1.8.3-longint.patch
2011-09-23 12:52:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xosview.new/xosview-1.9.2-longint.patch
2012-02-08 17:21:35.000000000 +0100
@@ -1,26 +1,20 @@
--- linux/intmeter.cc
-+++ linux/intmeter.cc 2008-04-25 12:17:52.908244127 +0200
-@@ -24,7 +24,7 @@ static int realintnum[1024];
++++ linux/intmeter.cc 2012-02-08 10:38:29.000000000 +0100
+@@ -17,11 +17,11 @@
+ static const char *INTFILE = "/proc/interrupts";
+ static const char *VERSIONFILE = "/proc/version";
+
+-std::map<int,int> realintnum;
++std::map<const int,int> realintnum;
IntMeter::IntMeter( XOSView *parent, int cpu)
: BitMeter( parent, "INTS", "", 1,
- 0, 0 ), _cpu(cpu), _old(true) {
-+ 0, 0 ), _cpu(cpu), _old(true),
max(sizeof(realintnum)/sizeof(realintnum[0])) {
++ 0, 0 ), _cpu(cpu), _old(true), max(1024) {
if (getLinuxVersion() <= 2.0)
_old = true;
else
-@@ -81,8 +81,8 @@ int IntMeter::countCPUs(void) {
-
- void IntMeter::getirqs( void ){
- std::ifstream intfile( INTFILE );
-- int intno, count;
-- int idx;
-+ unsigned long idx, count;
-+ int intno = 0;
-
- if ( !intfile ){
- std::cerr <<"Can not open file : " <<INTFILE << std::endl;
-@@ -90,19 +90,20 @@ void IntMeter::getirqs( void ){
+@@ -91,10 +91,12 @@ void IntMeter::getirqs( void ){
}
if (!_old)
@@ -29,75 +23,41 @@
while ( !intfile.eof() ){
intfile >> idx;
-- intno = realintnum[idx];
-+ if (idx < (unsigned long)max)
-+ intno = realintnum[idx];
++ if (idx >= max)
++ break;
+ intno = realintnum[idx];
if(intno>=numBits())
updateirqcount(intno,false);
- if (!intfile) break;
- intfile.ignore(1);
+@@ -103,7 +105,7 @@ void IntMeter::getirqs( void ){
if ( !intfile.eof() ){
for (int i = 0 ; i <= _cpu ; i++)
-- intfile >>count;
+ intfile >>count;
- intfile.ignore(1024, '\n');
-+ intfile >> count;
+ intfile.ignore(max, '\n');
irqs_[intno] = count;
}
-@@ -120,7 +121,7 @@ void IntMeter::updateirqcount( int n, bo
- std::ostringstream os;
-
- os << "INTs (0-16" ;
-- for (int i=16; i<1024; i++) {
-+ for (int i=16; i<max; i++) {
- if (realintnum[i])
- os << ", " << (i) ;
- }
-@@ -157,21 +158,22 @@ void IntMeter::updateirqcount( int n, bo
- */
- void IntMeter::initirqcount( void ){
- std::ifstream intfile( INTFILE );
-+ unsigned long idx;
- int intno = 0;
-- int i, idx;
-+ int i;
-
- if ( !intfile ){
- std::cerr <<"Can not open file : " <<INTFILE << std::endl;
- exit( 1 );
- }
-
-- if (!_old) {
-- for (i=0; i<1024; i++) // init index into int array
-+ if (!_old) { // init index into int array
-+ for (i=0; i<max; i++)
- if (i < 16) // first 16 map directly
- realintnum[i] = i;
- else
- realintnum[i] = 0;
-- intfile.ignore(1024, '\n');
-+ intfile.ignore(max, '\n');
+@@ -170,7 +172,7 @@ void IntMeter::initirqcount( void ){
+ if (!_old) {
+ for (i=0; i<16; i++)
+ realintnum[i] = i;
+- intfile.ignore(1024, '\n');
++ intfile.ignore(max, '\n');
}
/* just looking for the highest number interrupt that
-@@ -184,10 +186,11 @@ void IntMeter::initirqcount( void ){
- intno = i;
- else {
+@@ -187,7 +189,7 @@ void IntMeter::initirqcount( void ){
intno = idx;
-- realintnum[i] = idx++;
-+ if (i < max)
-+ realintnum[i] = idx++;
+ realintnum[i] = idx++;
}
- if (!intfile) break;
- intfile.ignore(1024, '\n');
+ intfile.ignore(max, '\n');
}
updateirqcount(intno, true);
}
--- linux/intmeter.h
-+++ linux/intmeter.h 2008-04-25 12:15:41.363406730 +0200
-@@ -28,6 +28,7 @@ protected:
++++ linux/intmeter.h 2012-02-08 09:37:34.843758155 +0000
+@@ -26,6 +26,7 @@ protected:
int _cpu;
bool _old;
++++++ xosview-1.8.3-maxlimit.patch -> xosview-1.9.2-maxlimit.patch ++++++
--- /work/SRC/openSUSE:Factory/xosview/xosview-1.8.3-maxlimit.patch
2011-09-23 12:52:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xosview.new/xosview-1.9.2-maxlimit.patch
2012-02-08 17:21:35.000000000 +0100
@@ -1,67 +1,43 @@
-Index: xosview.h
-===================================================================
---- xosview.h.orig
-+++ xosview.h
-@@ -9,10 +9,11 @@
+--- xosview.h
++++ xosview.h 2012-02-01 09:14:06.914433620 +0000
+@@ -7,6 +7,7 @@
#ifndef _XOSVIEW_H_
#define _XOSVIEW_H_
- #define XOSVIEW_H_CVSID "$Id$"
-
+#define BUFFER_SIZE 4096
#include "xwin.h"
#include "Xrm.h" // For Xrm resource manager class.
-
- /* Take at most n samples per second (default of 10) */
-Index: linux/cpumeter.cc
-===================================================================
---- linux/cpumeter.cc.orig
-+++ linux/cpumeter.cc
-@@ -14,11 +14,11 @@
- #include <string>
- #include <sstream>
+--- linux/cpumeter.cc
++++ linux/cpumeter.cc 2012-02-01 09:15:16.521934032 +0000
+@@ -15,7 +15,7 @@
#include <ctype.h>
static const char STATFILENAME[] = "/proc/stat";
-#define MAX_PROCSTAT_LENGTH 4096
-+#define MAX_PROCSTAT_LENGTH BUFFER_SIZE
++#define MAX_PROCSTAT_LENGTH BUFFER_SIZE
CPUMeter::CPUMeter(XOSView *parent, const char *cpuID)
- : FieldMeterGraph( parent, 7, toUpper(cpuID), "US/NI/SY/ID/WA/HI/SI" ) {
- _lineNum = findLine(cpuID);
- for ( int i = 0 ; i < 2 ; i++ )
-Index: linux/diskmeter.cc
-===================================================================
---- linux/diskmeter.cc.orig
-+++ linux/diskmeter.cc
-@@ -15,11 +15,11 @@
- #include <unistd.h>
- #include <dirent.h>
+ : FieldMeterGraph( parent, 9, toUpper(cpuID),
"USR/NICE/SYS/SI/HI/WIO/GST/ST/IDLE" ) {
+--- linux/diskmeter.cc
++++ linux/diskmeter.cc 2012-02-01 09:14:59.081934045 +0000
+@@ -15,7 +15,7 @@
#include <errno.h>
-#define MAX_PROCSTAT_LENGTH 2048
-+#define MAX_PROCSTAT_LENGTH BUFFER_SIZE
++#define MAX_PROCSTAT_LENGTH BUFFER_SIZE
DiskMeter::DiskMeter( XOSView *parent, float max ) : FieldMeterGraph(
parent, 3, "DISK", "READ/WRITE/IDLE"), _vmstat(false),
- _statFileName("/proc/stat")
- {
-Index: linux/pagemeter.cc
-===================================================================
---- linux/pagemeter.cc.orig
-+++ linux/pagemeter.cc
-@@ -12,11 +12,11 @@
- #include <stdlib.h>
- #include <sys/types.h>
+--- linux/pagemeter.cc
++++ linux/pagemeter.cc 2012-02-01 09:14:42.149964689 +0000
+@@ -12,7 +12,7 @@
#include <sys/stat.h>
#include <unistd.h>
-#define MAX_PROCSTAT_LENGTH 2048
-+#define MAX_PROCSTAT_LENGTH BUFFER_SIZE
++#define MAX_PROCSTAT_LENGTH BUFFER_SIZE
PageMeter::PageMeter( XOSView *parent, float max )
- : FieldMeterGraph( parent, 3, "PAGE", "IN/OUT/IDLE" ),
- _vmstat(false), _statFileName("/proc/stat"){
++++++ xosview-1.8.1-procsys.patch -> xosview-1.9.2-procsys.patch ++++++
--- /work/SRC/openSUSE:Factory/xosview/xosview-1.8.1-procsys.patch
2011-09-23 12:52:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xosview.new/xosview-1.9.2-procsys.patch
2012-02-08 17:21:35.000000000 +0100
@@ -1,39 +1,98 @@
+--- linux/intmeter.cc
++++ linux/intmeter.cc 2012-02-08 11:59:17.001933755 +0100
+@@ -3,7 +3,7 @@
+ //
+ // This file may be distributed under terms of the GPL
+ //
+-
++#define USE_UNAME 1 // Use fast uname API
+ #include "intmeter.h"
+ #include "xosview.h"
+ #include "cpumeter.h"
+@@ -11,8 +11,9 @@
+ #include <sstream>
+ #include <map>
+ #include <stdlib.h>
+-
+-
++#ifdef USE_UNAME
++# include <sys/utsname.h>
++#endif
+ static const char *INTFILE = "/proc/interrupts";
+ static const char *VERSIONFILE = "/proc/version";
+
+@@ -55,6 +56,7 @@ void IntMeter::checkResources( void ){
+ }
+
+ float IntMeter::getLinuxVersion(void) {
++#ifndef USE_UNAME
+ std::ifstream vfile(VERSIONFILE);
+ if (!vfile) {
+ std::cerr << "Can not open file : " << VERSIONFILE << std::endl;
+@@ -65,7 +67,12 @@ float IntMeter::getLinuxVersion(void) {
+ float rval;
+ vfile >> dump >> dump; // Drop the first two words
+ vfile >> rval; // Drops everything but #.# (float regex)
+-
++#else
++ struct utsname myosrelease;
++ char *myendptr;
++ uname(&myosrelease);
++ float rval = strtof(myosrelease.release, &myendptr);
++#endif
+ return rval;
+ }
+
--- linux/netmeter.cc
-+++ linux/netmeter.cc Tue Jan 20 16:54:13 2004
-@@ -34,6 +34,7 @@
++++ linux/netmeter.cc 2012-02-01 09:11:43.109934021 +0000
+@@ -22,6 +22,7 @@
+ // its display.
+ //-----------------------------------------------------------------------
+
++#define USE_UNAME 1 // Use fast uname API
+
+ #include "netmeter.h"
+ #include "xosview.h"
+@@ -32,6 +33,9 @@
#include <stdlib.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
-+#include <sys/utsname.h>
++#ifdef USE_UNAME
++# include <sys/utsname.h>
++#endif
#if defined(GNULIBC) || defined(__GLIBC__)
#include <net/if.h>
#else
-@@ -60,20 +61,16 @@
+@@ -59,6 +63,7 @@ NetMeter::~NetMeter( void ){
void NetMeter::checkOSVersion(void)
{
-- std::ifstream ifs("/proc/sys/kernel/osrelease");
-- if (!ifs)
-- {
-- std::cerr <<"Can not open file : " << "/proc/sys/kernel/osrelease"
-- << std::endl;
-- exit(1);
-- }
++#ifndef USE_UNAME
+ std::ifstream ifs("/proc/sys/kernel/osrelease");
+ if (!ifs)
+ {
+@@ -66,14 +71,22 @@ void NetMeter::checkOSVersion(void)
+ << std::endl;
+ exit(1);
+ }
-
++#else
+ struct utsname myosrelease;
+ char *myendptr;
++#endif
int major, minor;
-+
-+ uname(&myosrelease);
-+
_bytesInDev = 0;
-- ifs >> major;
-- ifs.ignore(1);
-- ifs >> minor;
-- ifs.ignore(1);
-+
++#ifndef USE_UNAME
+ ifs >> major;
+ ifs.ignore(1);
+ ifs >> minor;
+ ifs.ignore(1);
+-
++#else
++ uname(&myosrelease);
+ major=strtol(myosrelease.release, &myendptr, 10);
+ minor=strtol(myendptr+1, (char **)NULL, 10);
-
++#endif
if (major > 2 || (major == 2 && minor >= 1))
{
+ // check presence of iacct and oacct chains
++++++ xosview-1.8.3-serial.patch -> xosview-1.9.2-serial.patch ++++++
--- /work/SRC/openSUSE:Factory/xosview/xosview-1.8.3-serial.patch
2011-09-23 12:52:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xosview.new/xosview-1.9.2-serial.patch
2012-02-08 17:21:35.000000000 +0100
@@ -1,10 +1,6 @@
-Index: linux/MeterMaker.cc
-===================================================================
---- linux/MeterMaker.cc.orig
-+++ linux/MeterMaker.cc
-@@ -71,11 +71,11 @@ void MeterMaker::makeMeters(void){
- push(new NFSStats(_xos));
- }
+--- linux/MeterMaker.cc
++++ linux/MeterMaker.cc 2012-02-01 09:05:20.009933175 +0000
+@@ -108,7 +108,7 @@ if ( stats ) {
// check for the serial meters.
@@ -13,5 +9,3 @@
/* these architectures have no ioperm() */
#else
for (int i = 0 ; i < SerialMeter::numDevices() ; i++)
- if (_xos->isResourceTrue(SerialMeter::getResourceName(
- (SerialMeter::Device)i)))
++++++ xosview-1.8.3-appdef.dif -> xosview-1.9.2.dif ++++++
++++ 858 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/xosview/xosview-1.8.3-appdef.dif
++++ and /work/SRC/openSUSE:Factory/.xosview.new/xosview-1.9.2.dif
++++++ xosview-1.8.3.tar.bz2 -> xosview-1.9.2.tar.bz2 ++++++
++++ 31983 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
