Mailinglist Archive: opensuse-commit (926 mails)

< Previous

Next >

Hello community,

here is the log from the commit of package xosview for openSUSE:Factory
checked in at Mon Dec 7 16:08:56 CET 2009.

--------
--- xosview/xosview.changes 2009-06-05 15:27:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/xosview/xosview.changes 2009-12-04
15:23:37.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Dec 4 15:23:02 CET 2009 - seife@xxxxxxxxxxxx
+
+- de-fuzz patches
+
+-------------------------------------------------------------------

calling whatdependson for head-i586

Old:
----
xosview-1.8.2-float-conv.patch
xosview-1.8.2-maxlimit.patch
xosview-1.8.2-serial.patch

New:
----
xosview-1.8.3-float-conv.patch
xosview-1.8.3-maxlimit.patch
xosview-1.8.3-serial.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xosview.spec ++++++
--- /var/tmp/diff_new_pack.iG6DI2/_old 2009-12-07 16:08:41.000000000 +0100
+++ /var/tmp/diff_new_pack.iG6DI2/_new 2009-12-07 16:08:41.000000000 +0100
@@ -20,7 +20,7 @@

Name: xosview
BuildRequires: gcc-c++ linux-kernel-headers pkgconfig update-desktop-files
xorg-x11-devel
-License: BSD 3-Clause; GPL v2 or later; X11/MIT
+License: BSD3c ; GPLv2+ ; MIT
Group: System/Monitoring
AutoReqProv: on
# NOTE: We don't want this dependency and desktop-data-SuSE is in all
@@ -29,7 +29,7 @@
# This because /usr/bin/xrdb is part of xorg-x11
Requires: xorg-x11
Version: 1.8.3
-Release: 199
+Release: 200
Summary: System Load Information
Url: http://sourceforge.net/projects/xosview/
Source: xosview-%{version}.tar.bz2
@@ -38,13 +38,13 @@
Source3: xosview.desktop
Source4: xosview.sh
Patch: xosview-%{version}.dif
-Patch1: xosview-1.8.2-serial.patch
+Patch1: xosview-1.8.3-serial.patch
Patch2: xosview-1.8.1-procsys.patch
-Patch3: xosview-1.8.2-maxlimit.patch
+Patch3: xosview-1.8.3-maxlimit.patch
Patch4: xosview-1.8.0-irda.patch
Patch6: xosview-%{version}-double.patch
Patch7: xosview-%{version}-longint.patch
-Patch8: xosview-1.8.2-float-conv.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

++++++ xosview-1.8.2-float-conv.patch -> xosview-1.8.3-float-conv.patch ++++++
--- xosview/xosview-1.8.2-float-conv.patch 2007-01-16 00:43:34.000000000
+0100
+++ /mounts/work_src_done/STABLE/xosview/xosview-1.8.3-float-conv.patch
2009-12-04 15:23:36.000000000 +0100
@@ -3,11 +3,13 @@

Index: linux/swapmeter.cc
===================================================================
---- linux/swapmeter.cc.orig 2005-11-11 12:45:56.000000000 +0100
-+++ linux/swapmeter.cc 2005-11-27 02:10:35.000000000 +0100
-@@ -64,9 +64,9 @@ void SwapMeter::getswapinfo( void ){
+--- linux/swapmeter.cc.orig
++++ linux/swapmeter.cc
+@@ -62,13 +62,13 @@ void SwapMeter::getswapinfo( void ){
+ syscall( SYS_sysinfo, &sinfo );
+ #endif

- unit = (sinfo.mem_unit ? sinfo.mem_unit : 1);
+ unit = (sinfo.mem_unit ? sinfo.mem_unit : 1);

- total_ = sinfo.totalswap * unit;
- fields_[0] = (sinfo.totalswap - sinfo.freeswap) * unit;
@@ -18,3 +20,5 @@

if ( total_ == 0 ){
total_ = 1;
+ fields_[0] = 0;
+ fields_[1] = 1;

++++++ xosview-1.8.2-maxlimit.patch -> xosview-1.8.3-maxlimit.patch ++++++
--- xosview/xosview-1.8.2-maxlimit.patch 2007-01-16 00:43:34.000000000
+0100
+++ /mounts/work_src_done/STABLE/xosview/xosview-1.8.3-maxlimit.patch
2009-12-04 15:23:36.000000000 +0100
@@ -1,6 +1,10 @@
---- xosview.h
-+++ xosview.h Fri Jan 28 16:34:26 2005
-@@ -11,6 +11,7 @@
+Index: xosview.h
+===================================================================
+--- xosview.h.orig
++++ xosview.h
+@@ -9,10 +9,11 @@
+ #ifndef _XOSVIEW_H_
+ #define _XOSVIEW_H_

#define XOSVIEW_H_CVSID "$Id$"

@@ -8,9 +12,15 @@
#include "xwin.h"
#include "Xrm.h" // For Xrm resource manager class.

---- linux/cpumeter.cc
-+++ linux/cpumeter.cc Fri Jan 28 16:34:26 2005
-@@ -16,7 +16,7 @@
+
+ /* 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>
#include <ctype.h>

static const char STATFILENAME[] = "/proc/stat";
@@ -18,21 +28,33 @@
+#define MAX_PROCSTAT_LENGTH BUFFER_SIZE

CPUMeter::CPUMeter(XOSView *parent, const char *cpuID)
- : FieldMeterGraph( parent, 4, toUpper(cpuID), "USR/NICE/SYS/FREE" ) {
---- linux/diskmeter.cc
-+++ linux/diskmeter.cc Fri Jan 28 16:35:09 2005
-@@ -14,7 +14,7 @@
- #include <sys/stat.h>
+ : 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>
+ #include <errno.h>
+

-#define MAX_PROCSTAT_LENGTH 2048
+#define MAX_PROCSTAT_LENGTH BUFFER_SIZE

DiskMeter::DiskMeter( XOSView *parent, float max ) : FieldMeterGraph(
parent, 3, "DISK", "READ/WRITE/IDLE"), _vmstat(false),
---- linux/pagemeter.cc
-+++ linux/pagemeter.cc Fri Jan 28 16:35:30 2005
-@@ -14,7 +14,7 @@
+ _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>
#include <sys/stat.h>
#include <unistd.h>

@@ -41,3 +63,5 @@

PageMeter::PageMeter( XOSView *parent, float max )
+ : FieldMeterGraph( parent, 3, "PAGE", "IN/OUT/IDLE" ),
+ _vmstat(false), _statFileName("/proc/stat"){

++++++ xosview-1.8.2-serial.patch -> xosview-1.8.3-serial.patch ++++++
--- xosview/xosview-1.8.2-serial.patch 2007-01-16 00:43:34.000000000 +0100
+++ /mounts/work_src_done/STABLE/xosview/xosview-1.8.3-serial.patch
2009-12-04 15:23:36.000000000 +0100
@@ -1,7 +1,11 @@
---- linux/MeterMaker.cc
-+++ linux/MeterMaker.cc Fri Jan 28 16:30:26 2005
-@@ -58,7 +58,7 @@
- push(new DiskMeter(_xos, atof(_xos->getResource("diskBandwidth"))));
+Index: linux/MeterMaker.cc
+===================================================================
+--- linux/MeterMaker.cc.orig
++++ linux/MeterMaker.cc
+@@ -71,11 +71,11 @@ void MeterMaker::makeMeters(void){
+ push(new NFSStats(_xos));
+ }
+

// check for the serial meters.
-#if defined (__arm__) || defined(__mc68000__) || defined(__powerpc__) ||
defined(__sparc__) || defined(__s390__) || defined(__s390x__)
@@ -9,3 +13,5 @@
/* these architectures have no ioperm() */
#else
for (int i = 0 ; i < SerialMeter::numDevices() ; i++)
+ if (_xos->isResourceTrue(SerialMeter::getResourceName(
+ (SerialMeter::Device)i)))

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous

Next >

Mailinglist Archive: opensuse-commit (926 mails)

commit xosview for openSUSE:Factory

Search this list

List Navigation

This Thread