Hello community,
here is the log from the commit of package xosview for openSUSE:Factory checked
in at 2016-12-06 14:27:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xosview (Old)
and /work/SRC/openSUSE:Factory/.xosview.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xosview"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xosview/xosview.changes 2016-06-19
12:52:53.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xosview.new/xosview.changes 2016-12-06
14:27:37.000000000 +0100
@@ -1,0 +2,60 @@
+Mon Dec 5 11:16:41 UTC 2016 - wer...@suse.de
+
+- Update to version 1.19
+ * Strip empty fields from the nlist.
+ * arm64 doesn't have sys/io.h and sys/perm.h like many other Linux
architectures
+ * Fix typo that was blocking compilation on gcc 6
+ * Fix /sys/class/net traversal on recent Linux systems
+ * Use right variable in error message.
+ * Fix coretemp for AMD K10 CPUs on kernel >= 3.17.
+ * Support coretemp on linux 3.15
+ * Do not parse error when 64-bit kernel is used with 32-bit userland
+ * arm64 doesn't have sys/io.h and sys/perm.h like many other Linux
architectures
+ * Remove the Linux-specific 'MAP' field
+ * Replace the parsing of /proc/meminfo
+ * Fix spelling of "mandatory".
+ * Add a command-line flag for cpuFormat: single
+ * Change legend to match battery meter
+ The battery meter is the more concise one.
+ * Default IRQ meter to off
+ * Strip empty fields from the nlist.
+ * Fix name conflict.
+ Local and member variable had the same name.
+ * Initialize class member.
+ * Silence a warning from debug code.
+ * Use a helper to get the value of kstat_named_t.
+ * Save the needed kstats in a centralized way.
+ * Use sysconf instead of CPUMeter::countCpus().
+ * Show wireless meter when WLAN adapter is present.
+ * Use c++ iostreams for console messages.
+ * Remove two deprecated and unused functions.
+ * Coding style cleanup (linux/intmeter).
+ * Remove checks for kernel versions <= 2.0.
+ * Port interrupt rate meter from BSDs to Linux.
+ * Read net statistics from sysfs.
+ * Drop support for kernels < 2.4 in netmeter.
+ * Drop decimal from floats greater than 99.9 in used legends.
+ * Show negative values in sensor meters.
+ * Put value scaling code to base Meter class.
+ * Rework coretemp's CPU detection.
+ * Copy recent fieldmeter changes to bitfieldmeter.
+ * Calculate total correctly.
+ * Enable coretemp only on x86/x86_64.
+- Remove patches now upstream
+ 0001-Replace-the-parsing-of-proc-meminfo.patch
+ pull-request7.patch
+ xosview-1.16-coretemp.patch
+ xosview-1.16-coretemp2.patch
+ xosview-1.16-serial.patch
+- Modify patch xosview-1.16-diskstat.patch
+- Port patches
+ xosview-1.16-appdef.patch becomes xosview-1.19-appdef.patch
+ xosview-1.16.dif becomes xosview-1.19.dif
+
+-------------------------------------------------------------------
+Fri Jul 8 08:40:39 UTC 2016 - wer...@suse.de
+
+- Add upstream patch pull-request7.patch from pull request to avoid
+ compiler error
+
+-------------------------------------------------------------------
Old:
----
0001-Replace-the-parsing-of-proc-meminfo.patch
xosview-1.16-appdef.patch
xosview-1.16-coretemp.patch
xosview-1.16-coretemp2.patch
xosview-1.16-serial.patch
xosview-1.16.dif
xosview-1.16.tar.gz
New:
----
xosview-1.19-appdef.patch
xosview-1.19.dif
xosview-1.19.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xosview.spec ++++++
--- /var/tmp/diff_new_pack.stKqqu/_old 2016-12-06 14:27:38.000000000 +0100
+++ /var/tmp/diff_new_pack.stKqqu/_new 2016-12-06 14:27:38.000000000 +0100
@@ -27,7 +27,7 @@
#Requires: desktop-data-SuSE
# /usr/bin/xrdb
Requires: xrdb
-Version: 1.16
+Version: 1.19
Release: 0
Summary: System Load Information
License: GPL-2.0+
@@ -39,14 +39,9 @@
Source3: xosview.desktop
Source4: xosview.sh
Source5: xosview-rpmlintrc
-Patch0: xosview-%{version}.dif
-Patch1: xosview-%{version}-serial.patch
-Patch2: xosview-%{version}-coretemp.patch
-Patch3: xosview-%{version}-coretemp2.patch
-Patch10: xosview-%{version}-appdef.patch
-Patch11: xosview-%{version}-diskstat.patch
-# PATCH-FIX-UPSTREAM Replace the parsing of /proc/meminfo
-Patch12: 0001-Replace-the-parsing-of-proc-meminfo.patch
+Patch0: xosview-1.19.dif
+Patch10: xosview-1.19-appdef.patch
+Patch11: xosview-1.16-diskstat.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _appdefdir %{_datadir}/X11/app-defaults
@@ -57,12 +52,8 @@
%prep
%setup -q
-%patch1 -p0 -b .serial
-%patch2 -p0 -b .coretemp
-%patch3 -p0 -b .coretemp2
%patch10 -p0 -b .appdef
%patch11 -p0 -b .diskstat
-%patch12 -p0 -b .memmeter
%patch0 -p0 -b .p0
%build
++++++ xosview-1.16-diskstat.patch ++++++
--- /var/tmp/diff_new_pack.stKqqu/_old 2016-12-06 14:27:38.000000000 +0100
+++ /var/tmp/diff_new_pack.stKqqu/_new 2016-12-06 14:27:38.000000000 +0100
@@ -4,8 +4,8 @@
2 files changed, 50 insertions(+), 11 deletions(-)
--- linux/diskmeter.cc
-+++ linux/diskmeter.cc 2015-02-03 10:40:40.646018929 +0000
-@@ -209,7 +209,6 @@ void DiskMeter::update_info(const diskma
++++ linux/diskmeter.cc 2016-12-05 10:32:52.710294846 +0000
+@@ -211,7 +211,6 @@ void DiskMeter::update_info(const diskma
float itim = IntervalTimeInMicrosecs();
// the sum of all disks
unsigned long long all_bytes_read = 0, all_bytes_written = 0;
@@ -13,7 +13,7 @@
// avoid strange values at first call
// (by this - the first value displayed becomes zero)
-@@ -235,13 +234,11 @@ void DiskMeter::update_info(const diskma
+@@ -237,13 +236,11 @@ void DiskMeter::update_info(const diskma
all_bytes_written += it->second - sysfs_write_prev_[it->first];
}
@@ -29,7 +29,7 @@
// fix overflow (conversion bug?)
if (fields_[0] < 0.0)
-@@ -273,8 +270,6 @@ void DiskMeter::getsysfsdiskinfo( void )
+@@ -275,8 +272,6 @@ void DiskMeter::getsysfsdiskinfo( void )
// just sum up everything in /sys/block/*/stat
std::string sysfs_dir = _statFileName;
@@ -38,7 +38,7 @@
struct stat buf;
char line[128];
unsigned long vals[7];
-@@ -292,6 +287,10 @@ void DiskMeter::getsysfsdiskinfo( void )
+@@ -294,6 +289,10 @@ void DiskMeter::getsysfsdiskinfo( void )
// visit every /sys/block/*/stat and sum up the values:
for (struct dirent *dirent; (dirent = readdir(dir)) != NULL; ) {
@@ -49,7 +49,7 @@
if (strncmp(dirent->d_name, ".", 1) == 0 ||
strncmp(dirent->d_name, "..", 2) == 0 ||
strncmp(dirent->d_name, "loop", 4) == 0 ||
-@@ -300,11 +299,52 @@ void DiskMeter::getsysfsdiskinfo( void )
+@@ -302,11 +301,52 @@ void DiskMeter::getsysfsdiskinfo( void )
disk = sysfs_dir + dirent->d_name;
if (stat(disk.c_str(), &buf) == 0 && buf.st_mode & S_IFDIR) {
@@ -102,7 +102,7 @@
// is a dir, locate 'stat' file in it
disk += "/stat";
diskstat.open(disk.c_str());
-@@ -315,8 +355,8 @@ void DiskMeter::getsysfsdiskinfo( void )
+@@ -317,8 +357,8 @@ void DiskMeter::getsysfsdiskinfo( void )
vals[i] = strtoul(cur, &end, 10);
cur = end;
}
@@ -114,8 +114,8 @@
XOSDEBUG("disk stat: %s | read: %lu, written: %lu\n", disk.c_str(),
vals[2], vals[6]);
diskstat.close();
--- linux/diskmeter.h
-+++ linux/diskmeter.h 2013-04-09 10:52:05.000000000 +0000
-@@ -11,8 +11,7 @@
++++ linux/diskmeter.h 2016-12-05 10:32:52.710294846 +0000
+@@ -12,8 +12,7 @@
#include <map>
#include <string>
++++++ xosview-1.16-appdef.patch -> xosview-1.19-appdef.patch ++++++
--- /work/SRC/openSUSE:Factory/xosview/xosview-1.16-appdef.patch
2015-02-04 13:05:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xosview.new/xosview-1.19-appdef.patch
2016-12-06 14:27:37.000000000 +0100
@@ -3,16 +3,16 @@
1 file changed, 8 insertions(+), 6 deletions(-)
--- Xrm.cc
-+++ Xrm.cc 2015-02-03 10:01:53.129518512 +0000
++++ Xrm.cc 2016-12-05 10:31:19.076186648 +0000
@@ -9,6 +9,7 @@
+ #include <string.h>
+ #include <stdlib.h>
#include <stdio.h> // For snprintf().
++#include <sys/stat.h> // For stat().
#include <ctype.h>
- #include <iostream>
-+#include <sys/stat.h> // For stat().
#include <unistd.h> // for access(), etc. BCG
- #ifndef NULL
- #define NULL 0
-@@ -138,34 +139,35 @@ Listed from weakest to strongest:
+ #include <iostream>
+@@ -135,34 +136,35 @@ Listed from weakest to strongest:
// Merge in the system resource database.
char rfilename[2048];
++++++ xosview-1.16.dif -> xosview-1.19.dif ++++++
--- /work/SRC/openSUSE:Factory/xosview/xosview-1.16.dif 2015-09-24
06:14:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xosview.new/xosview-1.19.dif 2016-12-06
14:27:37.000000000 +0100
@@ -1,5 +1,19 @@
+---
+ README.linux | 2
+ README.security | 35 +++
+ Xdefaults | 461
++++++++++++++++++++++++++--------------------------
+ Xrmcommandline.h | 114 ++++++------
+ bitmeter.cc | 4
+ fieldmeter.cc | 4
+ linux/MeterMaker.cc | 2
+ linux/diskmeter.cc | 2
+ llist.cc | 16 +
+ xosview.1 | 2
+ xosview.cc | 5
+ 11 files changed, 347 insertions(+), 300 deletions(-)
+
--- README.linux
-+++ README.linux 2006-07-26 16:08:30.000000000 +0000
++++ README.linux 2016-12-05 10:35:24.639222793 +0000
@@ -26,7 +26,7 @@ To install xosview:
to /usr/bin/X11/xosview and will be suid root. If you do not want to
run xosview suid root (this will just disable the serial meters) you
@@ -10,7 +24,7 @@
To run xosview :
--- README.security
-+++ README.security 2006-07-26 16:08:30.000000000 +0000
++++ README.security 2016-12-05 10:35:24.639222793 +0000
@@ -0,0 +1,35 @@
+
+Xosview, serial meters, and suid bit
@@ -48,8 +62,8 @@
+ Your SuSE Team
+
--- Xdefaults
-+++ Xdefaults 2013-04-09 14:14:09.377941166 +0200
-@@ -2,131 +2,134 @@
++++ Xdefaults 2016-12-05 11:04:38.923089107 +0000
+@@ -2,129 +2,130 @@
! General Resources
@@ -69,12 +83,10 @@
-xosview*samplesPerSec: 10
-xosview*graphNumCols: 135 ! number of samples shown in a graph
+!*title:
-+!*geometry: +5+5
-+!*geometry: 184x158
++!*geometry: +5+5
+!*display:
+*captions: True
+*labels: True
-+*transparent: False
+*meterLabelColor: black
+*usedlabels: True
+*usedLabelColor: black
@@ -185,7 +197,6 @@
-xosview*memSharedColor: SkyBlue
-xosview*memBufferColor: red
-xosview*memSlabColor: blue
--xosview*memMapColor: SlateBlue1
-xosview*memCacheColor: orange
-xosview*memFreeColor: aquamarine
-xosview*memTextColor: blue
@@ -203,7 +214,6 @@
+*memSharedColor: yellow
+*memBufferColor: DarkOrange
+*memSlabColor: DarkBlue
-+*memMapColor: SkyBlue3
+*memCacheColor: red
+*memFreeColor: green2
+*memTextColor: white
@@ -221,7 +231,6 @@
-xosview*swap: True
-xosview*swapUsedColor: seagreen
-xosview*swapFreeColor: aquamarine
--xosview*swapReservedColor: yellow
-xosview*swapPriority: 10
-xosview*swapDecay: False
-xosview*swapGraph: False
@@ -229,11 +238,10 @@
+*swap: True
+*swapUsedColor: blue
+*swapFreeColor: green2
-+*swapReservedColor: yellow
+*swapPriority: 10
+*swapDecay: False
+*swapGraph: False
-+*swapUsedFormat: autoscale
++*swapUsedFormat: autoscale
! Page Meter Resources
@@ -272,7 +280,7 @@
-xosview*netIface: False
+*net: True
+*netBandwidth: 1000000 ! for 100Mbit/s
-+!*netBandwidth: 10000000 ! for 100Mbit/s
++!*netBandwidth: 10000000 ! for 100Mbit/s
+*netInColor: blue
+*netOutColor: red
+*netBackground: green2
@@ -284,7 +292,7 @@
! Linux-only resources:
-@@ -136,158 +139,158 @@ xosview*netIface: False
+@@ -134,159 +135,159 @@ xosview*netIface: False
! (autodetection may fail sometimes, if the port is
! locked by ppp/slip for example)
@@ -337,20 +345,20 @@
+*intPriority: 1
! Interrupt Rate Meter Resources
--xosview*irqrate: True
+-xosview*irqrate: False
-xosview*irqrateUsedColor: red
-xosview*irqrateIdleColor: aquamarine
-xosview*irqratePriority: 1
-xosview*irqrateUsedFormat: autoscale
-xosview*irqrateDecay: True
-xosview*irqrateGraph: False
-+*irqrate: True
-+*irqrateUsedColor: red
-+*irqrateIdleColor: blue
-+*irqratePriority: 1
++*irqrate: True
++*irqrateUsedColor: red
++*irqrateIdleColor: blue
++*irqratePriority: 1
+*irqrateUsedFormat: autoscale
-+*irqrateDecay: True
-+*irqrateGraph: False
++*irqrateDecay: True
++*irqrateGraph: False
! Battery Meter Resources
@@ -387,8 +395,8 @@
-xosview*wirelessDecay: True
+*wireless: True
+*PoorQualityColor: red
-+*FairQualityColor: orange
-+*GoodQualityColor: seagreen
++*FairQualityColor: yellow
++*GoodQualityColor: green2
+*wirelessUsedColor: blue
+*wirelessPriority: 1
+*wirelessUsedFormat: autoscale
@@ -421,16 +429,16 @@
-xosview*horizontalMargin: 5
-xosview*verticalMargin: 5
-xosview*verticalSpacing: 5
-+*disk: True
-+*diskUsedColor: red
-+*diskIdleColor: green2
++*disk: True
++*diskUsedColor: red
++*diskIdleColor: green2
+*diskWriteColor: orange
+*diskReadColor: blue
+*diskBandwidth: 100000000 ! 100MB/s
-+*diskPriority: 10
-+*diskDecay: True
++*diskPriority: 10
++*diskDecay: True
+*diskUsedFormat: autoscale
-+*diskGraph: True
++*diskGraph: True
+
+
+*RAID: False
@@ -451,19 +459,19 @@
-xosview*lmstemp: False
-xosview*lmstempActColor: blue
-xosview*lmstempHighColor: red
+-xosview*lmstempLowColor: orange
-xosview*lmstempIdleColor: aquamarine
-xosview*lmstempPriority: 20
-xosview*lmstempUsedFormat: autoscale
--xosview*lmstempHighest: 100
-! xosview*lmstemp1: temp
-! xosview*lmstemp2: remote_temp
-+*lmstemp: False
++*lmstemp: False
+*lmstempActColor: blue
+*lmstempHighColor: red
++*lmstempLowColor: orange
+*lmstempIdleColor: green2
-+*lmstempPriority: 20
-+*lmstempUsedFormat: autoscale
-+*lmstempHighest: 100
++*lmstempPriority: 20
++*lmstempUsedFormat: autoscale
+! *lmstemp1: temp
+! *lmstemp2: remote_temp
! for more sensors just add entries here
@@ -516,6 +524,7 @@
-xosview*bsdsensor: False
-xosview*bsdsensorActColor: blue
-xosview*bsdsensorHighColor: red
+-xosview*bsdsensorLowColor: orange
-xosview*bsdsensorIdleColor: aquamarine
-xosview*bsdsensorPriority: 20
-xosview*bsdsensorUsedFormat: float
@@ -560,6 +569,7 @@
+*bsdsensor: False
+*bsdsensorActColor: blue
+*bsdsensorHighColor: red
++*bsdsensorLowColor: orange
+*bsdsensorIdleColor: green2
+*bsdsensorPriority: 20
+*bsdsensorUsedFormat: float
@@ -575,8 +585,8 @@
+! *bsdsensorHigh1: 100
--- Xrmcommandline.h
-+++ Xrmcommandline.h 2015-02-03 10:25:59.377518292 +0000
-@@ -10,95 +10,95 @@ static XrmOptionDescRec options[] = {
++++ Xrmcommandline.h 2016-12-05 11:07:22.631706991 +0000
+@@ -10,96 +10,96 @@ static XrmOptionDescRec options[] = {
// it is self-consistent, and self-explanatory.
// General, X11 resources:
@@ -587,13 +597,13 @@
-{ "-hmargin", "*horizontalMargin", XrmoptionSepArg, (caddr_t) NULL },
-{ "-vmargin", "*verticalMargin", XrmoptionSepArg, (caddr_t) NULL },
-{ "-vspacing", "*verticalSpacing", XrmoptionSepArg, (caddr_t) NULL },
-+{ (char*)"-display", (char*)"*display", XrmoptionSepArg, (caddr_t) NULL },
-+{ (char*)"-font", (char*)"*font", XrmoptionSepArg, (caddr_t) NULL },
-+{ (char*)"-title", (char*)"*title", XrmoptionSepArg, (caddr_t) NULL },
-+{ (char*)"-geometry", (char*)"*geometry", XrmoptionSepArg, (caddr_t) NULL },
-+{ (char*)"-hmargin", (char*)"*horizontalMargin", XrmoptionSepArg, (caddr_t)
NULL },
-+{ (char*)"-vmargin", (char*)"*verticalMargin", XrmoptionSepArg, (caddr_t)
NULL },
-+{ (char*)"-vspacing", (char*)"*verticalSpacing", XrmoptionSepArg, (caddr_t)
NULL },
++{ (char*)"-display", "*display", XrmoptionSepArg, (caddr_t) NULL },
++{ (char*)"-font", "*font", XrmoptionSepArg, (caddr_t) NULL },
++{ (char*)"-title", "*title", XrmoptionSepArg, (caddr_t) NULL },
++{ (char*)"-geometry", "*geometry", XrmoptionSepArg, (caddr_t) NULL },
++{ (char*)"-hmargin", "*horizontalMargin", XrmoptionSepArg, (caddr_t) NULL },
++{ (char*)"-vmargin", "*verticalMargin", XrmoptionSepArg, (caddr_t) NULL },
++{ (char*)"-vspacing", "*verticalSpacing", XrmoptionSepArg, (caddr_t) NULL },
// XOSView-specific resources:
@@ -604,56 +614,58 @@
-{ "-usedlabels", "*usedlabels", XrmoptionNoArg, "False" },
-{ "+usedlabels", "*usedlabels", XrmoptionNoArg, "True" },
-{ "-samplesPerSec", "*samplesPerSec", XrmoptionSepArg, (caddr_t) NULL },
-+{ (char*)"-labels", (char*)"*labels", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+labels", (char*)"*labels", XrmoptionNoArg, (XPointer)"True" },
-+{ (char*)"-captions", (char*)"*captions", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+captions", (char*)"*captions", XrmoptionNoArg, (XPointer)"True" },
-+{ (char*)"-usedlabels", (char*)"*usedlabels", XrmoptionNoArg,
(XPointer)"False" },
-+{ (char*)"+usedlabels", (char*)"*usedlabels", XrmoptionNoArg,
(XPointer)"True" },
-+{ (char*)"-samplesPerSec", (char*)"*samplesPerSec", XrmoptionSepArg,
(caddr_t) NULL },
++{ (char*)"-labels", "*labels", XrmoptionNoArg, "False" },
++{ (char*)"+labels", "*labels", XrmoptionNoArg, "True" },
++{ (char*)"-captions", "*captions", XrmoptionNoArg, "False" },
++{ (char*)"+captions", "*captions", XrmoptionNoArg, "True" },
++{ (char*)"-usedlabels", "*usedlabels", XrmoptionNoArg, "False" },
++{ (char*)"+usedlabels", "*usedlabels", XrmoptionNoArg, "True" },
++{ (char*)"-samplesPerSec", "*samplesPerSec", XrmoptionSepArg, (caddr_t) NULL
},
// CPU resources
-{ "-cpu", "*cpu", XrmoptionNoArg, "False" },
-{ "+cpu", "*cpu", XrmoptionNoArg, "True" },
+-{ "-cpus", "*cpuFormat", XrmoptionNoArg, "single" },
-{ "+cpus", "*cpuFormat", XrmoptionNoArg, "all" },
-+{ (char*)"-cpu", (char*)"*cpu", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+cpu", (char*)"*cpu", XrmoptionNoArg, (XPointer)"True" },
-+{ (char*)"+cpus", (char*)"*cpuFormat", XrmoptionNoArg, (XPointer)"all" },
++{ (char*)"-cpu", "*cpu", XrmoptionNoArg, "False" },
++{ (char*)"+cpu", "*cpu", XrmoptionNoArg, "True" },
++{ (char*)"-cpus", "*cpuFormat", XrmoptionNoArg, "single" },
++{ (char*)"+cpus", "*cpuFormat", XrmoptionNoArg, "all" },
// Load resources
-{ "-load", "*load", XrmoptionNoArg, "False" },
-{ "+load", "*load", XrmoptionNoArg, "True" },
-+{ (char*)"-load", (char*)"*load", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+load", (char*)"*load", XrmoptionNoArg, (XPointer)"True" },
++{ (char*)"-load", "*load", XrmoptionNoArg, "False" },
++{ (char*)"+load", "*load", XrmoptionNoArg, "True" },
// Memmeter resources
-{ "-mem", "*mem", XrmoptionNoArg, "False" },
-{ "+mem", "*mem", XrmoptionNoArg, "True" },
-+{ (char*)"-mem", (char*)"*mem", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+mem", (char*)"*mem", XrmoptionNoArg, (XPointer)"True" },
++{ (char*)"-mem", "*mem", XrmoptionNoArg, "False" },
++{ (char*)"+mem", "*mem", XrmoptionNoArg, "True" },
// Swapmeter resources
-{ "-swap", "*swap", XrmoptionNoArg, "False" },
-{ "+swap", "*swap", XrmoptionNoArg, "True" },
-+{ (char*)"-swap", (char*)"*swap", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+swap", (char*)"*swap", XrmoptionNoArg, (XPointer)"True" },
++{ (char*)"-swap", "*swap", XrmoptionNoArg, "False" },
++{ (char*)"+swap", "*swap", XrmoptionNoArg, "True" },
// Batterymeter resources
-{ "-battery", "*battery", XrmoptionNoArg, "False" },
-{ "+battery", "*battery", XrmoptionNoArg, "True" },
-+{ (char*)"-battery", (char*)"*battery", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+battery", (char*)"*battery", XrmoptionNoArg, (XPointer)"True" },
++{ (char*)"-battery", "*battery", XrmoptionNoArg, "False" },
++{ (char*)"+battery", "*battery", XrmoptionNoArg, "True" },
// Wirelessmeter resources
-{ "-wireless", "*wireless", XrmoptionNoArg, "False" },
-{ "+wireless", "*wireless", XrmoptionNoArg, "True" },
-+{ (char*)"-wireless", (char*)"*wireless", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+wireless", (char*)"*wireless", XrmoptionNoArg, (XPointer)"True" },
++{ (char*)"-wireless", "*wireless", XrmoptionNoArg, "False" },
++{ (char*)"+wireless", "*wireless", XrmoptionNoArg, "True" },
// GFX resources
-{ "-gfx", "*gfx", XrmoptionNoArg, "False" },
-{ "+gfx", "*gfx", XrmoptionNoArg, "True" },
-+{ (char*)"-gfx", (char*)"*gfx", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+gfx", (char*)"*gfx", XrmoptionNoArg, (XPointer)"True" },
++{ (char*)"-gfx", "*gfx", XrmoptionNoArg, "False" },
++{ (char*)"+gfx", "*gfx", XrmoptionNoArg, "True" },
// Networkmeter resources
-{ "-net", "*net", XrmoptionNoArg, "False" },
-{ "+net", "*net", XrmoptionNoArg, "True" },
-+{ (char*)"-net", (char*)"*net", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+net", (char*)"*net", XrmoptionNoArg, (XPointer)"True" },
++{ (char*)"-net", "*net", XrmoptionNoArg, "False" },
++{ (char*)"+net", "*net", XrmoptionNoArg, "True" },
// Previously, network was overloaded to be the bandwidth and the
// on/off flag. Now, we have -net for on/off, and networkBandwidth
// for bandwidth, with the alias networkBW, and network for backwards
@@ -661,24 +673,24 @@
-{ "-network", "*netBandwidth", XrmoptionSepArg, (caddr_t) NULL },
-{ "-networkBW", "*netBandwidth", XrmoptionSepArg, (caddr_t) NULL },
-{ "-networkBandwidth", "*netBandwidth", XrmoptionSepArg, (caddr_t) NULL },
-+{ (char*)"-network", (char*)"*netBandwidth", XrmoptionSepArg, (caddr_t) NULL
},
-+{ (char*)"-networkBW", (char*)"*netBandwidth", XrmoptionSepArg, (caddr_t)
NULL },
-+{ (char*)"-networkBandwidth", (char*)"*netBandwidth", XrmoptionSepArg,
(caddr_t) NULL },
++{ (char*)"-network", "*netBandwidth", XrmoptionSepArg, (caddr_t) NULL },
++{ (char*)"-networkBW", "*netBandwidth", XrmoptionSepArg, (caddr_t) NULL },
++{ (char*)"-networkBandwidth", "*netBandwidth", XrmoptionSepArg, (caddr_t)
NULL },
// Page Meter
-{ "-page", "*page", XrmoptionNoArg, "False" },
-{ "+page", "*page", XrmoptionNoArg, "True" },
-{ "-pagespeed", "*pageBandWidth", XrmoptionSepArg, (caddr_t) NULL },
-+{ (char*)"-page", (char*)"*page", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+page", (char*)"*page", XrmoptionNoArg, (XPointer)"True" },
-+{ (char*)"-pagespeed", (char*)"*pageBandWidth", XrmoptionSepArg, (caddr_t)
NULL },
++{ (char*)"-page", "*page", XrmoptionNoArg, "False" },
++{ (char*)"+page", "*page", XrmoptionNoArg, "True" },
++{ (char*)"-pagespeed", "*pageBandWidth", XrmoptionSepArg, (caddr_t) NULL },
#if !defined(__hpux__) && !defined(__hpux)
// Disk Meter Options
-{ "-disk", "*disk", XrmoptionNoArg, "False" },
-{ "+disk", "*disk", XrmoptionNoArg, "True" },
-+{ (char*)"-disk", (char*)"*disk", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+disk", (char*)"*disk", XrmoptionNoArg, (XPointer)"True" },
++{ (char*)"-disk", "*disk", XrmoptionNoArg, "False" },
++{ (char*)"+disk", "*disk", XrmoptionNoArg, "True" },
#endif
// Interrupt meter resources -- all sorts of aliases.
@@ -688,86 +700,105 @@
-{ "+ints", "*interrupts", XrmoptionNoArg, "True" },
-{ "-interrupts", "*interrupts", XrmoptionNoArg, "False" },
-{ "+interrupts", "*interrupts", XrmoptionNoArg, "True" },
-+{ (char*)"-int", (char*)"*interrupts", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+int", (char*)"*interrupts", XrmoptionNoArg, (XPointer)"True" },
-+{ (char*)"-ints", (char*)"*interrupts", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+ints", (char*)"*interrupts", XrmoptionNoArg, (XPointer)"True" },
-+{ (char*)"-interrupts", (char*)"*interrupts", XrmoptionNoArg,
(XPointer)"False" },
-+{ (char*)"+interrupts", (char*)"*interrupts", XrmoptionNoArg,
(XPointer)"True" },
++{ (char*)"-int", "*interrupts", XrmoptionNoArg, "False" },
++{ (char*)"+int", "*interrupts", XrmoptionNoArg, "True" },
++{ (char*)"-ints", "*interrupts", XrmoptionNoArg, "False" },
++{ (char*)"+ints", "*interrupts", XrmoptionNoArg, "True" },
++{ (char*)"-interrupts", "*interrupts", XrmoptionNoArg, "False" },
++{ (char*)"+interrupts", "*interrupts", XrmoptionNoArg, "True" },
// Intrate meter resources, for platforms that support it.
-{ "-irqrate", "*irqrate", XrmoptionNoArg, "False" },
-{ "+irqrate", "*irqrate", XrmoptionNoArg, "True" },
-{ "-intrate", "*irqrate", XrmoptionNoArg, "False" },
-{ "+intrate", "*irqrate", XrmoptionNoArg, "True" },
-+{ (char*)"-irqrate", (char*)"*irqrate", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+irqrate", (char*)"*irqrate", XrmoptionNoArg, (XPointer)"True" },
-+{ (char*)"-intrate", (char*)"*irqrate", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+intrate", (char*)"*irqrate", XrmoptionNoArg, (XPointer)"True" },
++{ (char*)"-irqrate", "*irqrate", XrmoptionNoArg, "False" },
++{ (char*)"+irqrate", "*irqrate", XrmoptionNoArg, "True" },
++{ (char*)"-intrate", "*irqrate", XrmoptionNoArg, "False" },
++{ (char*)"+intrate", "*irqrate", XrmoptionNoArg, "True" },
// lmstemp resources
-{ "-lmstemp", "*lmstemp", XrmoptionNoArg, "False" },
-{ "+lmstemp", "*lmstemp", XrmoptionNoArg, "True" },
-+{ (char*)"-lmstemp", (char*)"*lmstemp", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+lmstemp", (char*)"*lmstemp", XrmoptionNoArg, (XPointer)"True" },
++{ (char*)"-lmstemp", "*lmstemp", XrmoptionNoArg, "False" },
++{ (char*)"+lmstemp", "*lmstemp", XrmoptionNoArg, "True" },
// coretemp resources
-{ "-coretemp", "*coretemp", XrmoptionNoArg, "False" },
-{ "+coretemp", "*coretemp", XrmoptionNoArg, "True" },
-+{ (char*)"-coretemp", (char*)"*coretemp", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+coretemp", (char*)"*coretemp", XrmoptionNoArg, (XPointer)"True" },
++{ (char*)"-coretemp", "*coretemp", XrmoptionNoArg, "False" },
++{ (char*)"+coretemp", "*coretemp", XrmoptionNoArg, "True" },
// acpitemp resources
-{ "-acpitemp", "*acpitemp", XrmoptionNoArg, "False" },
-{ "+acpitemp", "*acpitemp", XrmoptionNoArg, "True" },
-+{ (char*)"-acpitemp", (char*)"*acpitemp", XrmoptionNoArg, (XPointer)"False" },
-+{ (char*)"+acpitemp", (char*)"*acpitemp", XrmoptionNoArg, (XPointer)"True" },
++{ (char*)"-acpitemp", "*acpitemp", XrmoptionNoArg, "False" },
++{ (char*)"+acpitemp", "*acpitemp", XrmoptionNoArg, "True" },
// Special, catch-all option here --
--// xosview -xrm "*memFreeColor: purple" should work, for example.
+ // xosview -xrm "*memFreeColor: purple" should work, for example.
-{ "-xrm", "*xrm", XrmoptionResArg, (caddr_t) NULL },
-+// xosview -xrm (char*)"*memFreeColor: purple" should work, for example.
-+{ (char*)"-xrm", (char*)"*xrm", XrmoptionResArg, (caddr_t) NULL },
++{ (char*)"-xrm", "*xrm", XrmoptionResArg, (caddr_t) NULL },
};
// This auto-detects changes in the number of options.
static const int NUM_OPTIONS = sizeof(options) / sizeof(options[0]);
--- bitmeter.cc
-+++ bitmeter.cc 2006-07-26 16:10:55.000000000 +0000
++++ bitmeter.cc 2016-12-05 11:09:31.993036142 +0000
@@ -88,9 +88,9 @@ void BitMeter::draw( void ){
int offset;
if ( dousedlegends_ )
-- offset = parent_->textWidth( "XXXXXXXXX" );
+- offset = parent_->textWidth( "XXXXXXXXXX" );
+ offset = parent_->textWidth( "XXXXXXXXXXX" );
else
-- offset = parent_->textWidth( "XXXXX" );
+- offset = parent_->textWidth( "XXXXXX" );
+ offset = parent_->textWidth( "XXXXXM" );
parent_->drawString( x_ - offset + 1, y_ + height_, title_ );
parent_->setForeground( onColor_ );
--- fieldmeter.cc
-+++ fieldmeter.cc 2006-07-27 11:45:40.000000000 +0000
-@@ -120,9 +120,9 @@ void FieldMeter::draw( void ){
++++ fieldmeter.cc 2016-12-05 11:09:48.584693553 +0000
+@@ -122,9 +122,9 @@ void FieldMeter::draw( void ){
int offset;
if ( dousedlegends_ )
-- offset = parent_->textWidth( "XXXXXXXXX" );
+- offset = parent_->textWidth( "XXXXXXXXXX" );
+ offset = parent_->textWidth( "XXXXXXXXXXX" );
else
-- offset = parent_->textWidth( "XXXXX" );
+- offset = parent_->textWidth( "XXXXXX" );
+ offset = parent_->textWidth( "XXXXXM" );
parent_->drawString( x_ - offset + 1, y_ + height_, title_ );
}
-@@ -171,7 +171,7 @@ void FieldMeter::drawused( int manditory
+--- linux/MeterMaker.cc
++++ linux/MeterMaker.cc 2016-12-05 11:12:32.437309930 +0000
+@@ -137,6 +137,7 @@ void MeterMaker::makeMeters(void){
+ }
+ #endif
+
++#if !defined(__s390__) && !defined(__s390x__)
+ // check for the interrupt meter
+ if (_xos->isResourceTrue("interrupts")) {
+ int cpuCount = IntMeter::countCPUs();
+@@ -148,6 +149,7 @@ void MeterMaker::makeMeters(void){
+ else
+ push(new IntMeter(_xos, cpuCount-1));
+ }
++#endif
- parent_->setStippleN(0); /* Use all-bits stipple. */
- static const int onechar = parent_->textWidth( "X" );
-- static int xoffset = parent_->textWidth( "XXXXX" );
-+ static int xoffset = parent_->textWidth( "XXXXXM" );
+ // check for irqrate meter
+ if (_xos->isResourceTrue("irqrate"))
+--- linux/diskmeter.cc
++++ linux/diskmeter.cc 2016-12-05 10:35:24.643222711 +0000
+@@ -165,7 +165,7 @@ void DiskMeter::getvmdiskinfo(void)
+ // read second value
+ stats >> two;
- char buf[10];
+- updateinfo(one, two, 4);
++ updateinfo(one, two, 2); // The factor is 2 and NOT 4
+ }
+ void DiskMeter::getdiskinfo( void )
--- llist.cc
-+++ llist.cc 2007-03-16 14:56:22.000000000 +0000
++++ llist.cc 2016-12-05 10:35:24.643222711 +0000
@@ -232,24 +232,32 @@ void *LList::findc( int which ){
}
@@ -806,8 +837,8 @@
for ( ; i > 0 ; i-- ) {
if ( ( buf = new char[size] ) == NULL ) return ( 0 );
--- xosview.1
-+++ xosview.1 2006-07-26 16:08:30.000000000 +0000
-@@ -350,7 +350,7 @@ and \'purple\'):
++++ xosview.1 2016-12-05 10:35:24.643222711 +0000
+@@ -336,7 +336,7 @@ and \'purple\'):
The following is a list of X resources supported by \fIxosview\fP. Each has
a default value assigned to it. These values can be found in the file
Xdefaults which can be obtained in the source distribution of xosview.
@@ -817,74 +848,24 @@
It should be noted that it is OK to have a resource defined for a port of
--- xosview.cc
-+++ xosview.cc 2013-04-09 10:57:52.977440263 +0000
-@@ -7,6 +7,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <sys/time.h>
++++ xosview.cc 2016-12-05 11:11:28.234635818 +0000
+@@ -11,6 +11,7 @@
+ defined(XOSVIEW_OPENBSD) || defined(XOSVIEW_DFBSD) )
+ # include "kernel.h"
+ #endif
+#include <errno.h>
- #include "xosview.h"
- #include "meter.h"
- #include "MeterMaker.h"
-@@ -159,9 +160,9 @@ void XOSView::checkVersion(int argc, cha
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -160,9 +161,9 @@ void XOSView::checkVersion(int argc, cha
void XOSView::figureSize ( void ) {
if ( legend_ ){
if ( !usedlabels_ )
-- xoff_ = textWidth( "XXXXX" );
+- xoff_ = textWidth( "XXXXXX" );
+ xoff_ = textWidth( "XXXXXM" );
else
-- xoff_ = textWidth( "XXXXXXXXX" );
+- xoff_ = textWidth( "XXXXXXXXXX" );
+ xoff_ = textWidth( "XXXXXXXXXXX" );
yoff_ = caption_ ? textHeight() + textHeight() / 4 : 0;
}
---- linux/MeterMaker.cc
-+++ linux/MeterMaker.cc 2006-07-26 16:08:30.000000000 +0000
-@@ -133,6 +133,7 @@ void MeterMaker::makeMeters(void){
- }
- #endif
-
-+#if !defined(__s390__) && !defined(__s390x__)
- // check for the interrupt meter
- if (_xos->isResourceTrue("interrupts")) {
- int cpuCount = IntMeter::countCPUs();
-@@ -144,6 +145,7 @@ void MeterMaker::makeMeters(void){
- else
- push(new IntMeter(_xos, cpuCount-1));
- }
-+#endif
-
- // check for the battery meter
- if (_xos->isResourceTrue("battery") && BtryMeter::has_source())
---- linux/diskmeter.cc
-+++ linux/diskmeter.cc 2006-07-27 11:41:55.000000000 +0000
-@@ -163,7 +163,7 @@ void DiskMeter::getvmdiskinfo(void)
- // read second value
- stats >> two;
-
-- updateinfo(one, two, 4);
-+ updateinfo(one, two, 2); // The factor is 2 and NOT 4
- }
-
- void DiskMeter::getdiskinfo( void )
---- linux/netmeter.cc
-+++ linux/netmeter.cc 2006-07-26 16:08:30.000000000 +0000
-@@ -28,6 +28,7 @@
- #include "xosview.h"
-
- #include <unistd.h>
-+//#include <iomanip.h>
- #include <fstream>
- #include <string.h>
- #include <stdlib.h>
-|--- linux/memmeter.cc
-|+++ linux/memmeter.cc 2014-09-15 14:10:01.366235670 +0000
-|@@ -54,7 +54,7 @@ void MemMeter::checkevent( void ){
-|
-| void MemMeter::getmeminfo( void ){
-| getmemstat(MEMFILENAME, _MIlineInfos, _numMIlineInfos);
-|- fields_[4] -= fields_[3]; // mapped comes from cache
-|+ fields_[3] -= fields_[4]; // mapped comes from cache
-| fields_[0] = total_ - fields_[5] - fields_[4] - fields_[3] - fields_[2] -
fields_[1];
-|
-| if (total_)
++++++ xosview-1.16.tar.gz -> xosview-1.19.tar.gz ++++++
++++ 8707 lines of diff (skipped)
