Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xosview for openSUSE:Factory checked in at 2022-09-20 19:24:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xosview (Old) and /work/SRC/openSUSE:Factory/.xosview.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xosview" Tue Sep 20 19:24:14 2022 rev:49 rq:1004977 version:1.23 Changes: -------- --- /work/SRC/openSUSE:Factory/xosview/xosview.changes 2020-08-31 16:50:51.144371938 +0200 +++ /work/SRC/openSUSE:Factory/.xosview.new.2083/xosview.changes 2022-09-20 19:24:15.734590818 +0200 @@ -1,0 +2,6 @@ +Tue Sep 20 13:20:25 UTC 2022 - Dr. Werner Fink <[email protected]> + +- Update to version 1.23 + * Many fixes for serialmeter on linux platforms + +------------------------------------------------------------------- Old: ---- xosview-1.22.tar.gz New: ---- xosview-1.23.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xosview.spec ++++++ --- /var/tmp/diff_new_pack.7u0dus/_old 2022-09-20 19:24:16.346592573 +0200 +++ /var/tmp/diff_new_pack.7u0dus/_new 2022-09-20 19:24:16.350592584 +0200 @@ -1,7 +1,7 @@ # # spec file for package xosview # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define _appdefdir %{_datadir}/X11/app-defaults Name: xosview -Version: 1.22 +Version: 1.23 Release: 0 Summary: System Load Information License: GPL-2.0-or-later @@ -81,12 +81,10 @@ mkdir -p %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}%{_appdefdir} mkdir -p %{buildroot}%{_docdir}/xosview -make PREFIX=%{_prefix} \ +%make_install PREFIX=%{_prefix} \ MANDIR=%{_mandir} \ XAPPLOADDIR=%{_appdefdir} \ - USE_SYSCALLS=1 \ - DESTDIR=%{buildroot} \ - install + USE_SYSCALLS=1 install -m 0444 Xdefaults %{buildroot}%{_appdefdir}/XOsview install -m 0444 README %{buildroot}%{_docdir}/xosview/ install -m 0444 README.linux %{buildroot}%{_docdir}/xosview/ ++++++ xosview-1.22.tar.gz -> xosview-1.23.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xosview-1.22/bsd/kernel.cc new/xosview-1.23/bsd/kernel.cc --- old/xosview-1.22/bsd/kernel.cc 2020-02-22 20:33:08.000000000 +0100 +++ new/xosview-1.23/bsd/kernel.cc 2020-07-11 14:10:34.000000000 +0200 @@ -219,8 +219,10 @@ * that kernel file. Otherwise, use the default kernel, by * specifying NULL. */ if ((kd = kvm_openfiles((kernelFileName[0] ? kernelFileName : NULL), - NULL, NULL, O_RDONLY, errstring)) == NULL) - err(EX_OSFILE, "OpenKDIfNeeded(): %s", errstring); + NULL, NULL, O_RDONLY, errstring)) == NULL) { + warn("OpenKDIfNeeded(): %s", errstring); + return; + } // Parenthetical note: FreeBSD kvm_openfiles() uses getbootfile() to get // the correct kernel file if the 1st arg is NULL. As far as I can see, @@ -276,7 +278,7 @@ size = sizeof(speed); #if defined(XOSVIEW_NETBSD) if ( sysctlbyname("machdep.tsc_freq", &speed, &size, NULL, 0) < 0 ) - err(EX_OSERR, "sysctl machdep.tsc_freq failed"); + warn("sysctl machdep.tsc_freq failed"); #else /* XOSVIEW_DFBSD */ if ( sysctlbyname("hw.tsc_frequency", &speed, &size, NULL, 0) < 0 ) err(EX_OSERR, "sysctl hw.tsc_frequency failed"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xosview-1.22/linux/serialmeter.cc new/xosview-1.23/linux/serialmeter.cc --- old/xosview-1.22/linux/serialmeter.cc 2020-02-22 20:33:08.000000000 +0100 +++ new/xosview-1.23/linux/serialmeter.cc 2020-07-11 14:10:34.000000000 +0200 @@ -8,6 +8,7 @@ // In order to use this new serial meter, xosview needs to be suid root. // #include "serialmeter.h" +#include <linux/serial.h> #include <sys/ioctl.h> #include <sys/types.h> #include <fcntl.h> @@ -18,32 +19,15 @@ #include <sstream> #include <iomanip> -// This should go away after types.h gets fixed in the kernel. -#ifdef __alpha__ -typedef unsigned char u8; -typedef signed short s16; -typedef unsigned short u16; -typedef signed int s32; -typedef unsigned int u32; -typedef signed long long s64; -typedef unsigned long long u64; -#endif - -#if defined(GNULIBC) || defined(__GLIBC__) -#if !defined(__powerpc__) && !defined(__hppa__) && !defined(__mips__) && !defined(__sparc__) && !defined(__sh__) && !defined(__s390__) && !defined(__s390x__) && !defined(__m68k__) && !defined(__aarch64__) && !defined(__arm__) +/* + * To fetch status information requires ioperm() and inb() + * otherwise these meter is largely a no-op. + */ +#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) #include <sys/io.h> -#endif -#if !defined(__alpha__) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__arm__) && !defined(__mips__) && !defined(__sh__) && !defined(__s390__) && !defined (__s390x__) && !defined(__m68k__) && !defined(__aarch64__) #include <sys/perm.h> #define HAVE_IOPERM #endif -#else -#if !defined(__alpha__) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__ia64__) && !defined(__m68k__) -#include <asm/io.h> -#endif -#endif -#include <linux/serial.h> - SerialMeter::SerialMeter( XOSView *parent, Device device ) : BitMeter( parent, getTitle(device), "LSR bits(0-7), MSR bits(0-7)", 16){ @@ -77,7 +61,7 @@ #ifdef HAVE_IOPERM return ioperm(port, 1, 1) != -1; #else - return -1 != -1; + return false; #endif } ++++++ xosview.sh ++++++ --- /var/tmp/diff_new_pack.7u0dus/_old 2022-09-20 19:24:16.530593101 +0200 +++ /var/tmp/diff_new_pack.7u0dus/_new 2022-09-20 19:24:16.534593112 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash net="-net" if test -e /proc/net/ip_acct ; then
