Hello community, here is the log from the commit of package xosview for openSUSE:Factory checked in at 2020-08-31 16:50:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xosview (Old) and /work/SRC/openSUSE:Factory/.xosview.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xosview" Mon Aug 31 16:50:18 2020 rev:48 rq:830689 version:1.22 Changes: -------- --- /work/SRC/openSUSE:Factory/xosview/xosview.changes 2020-04-09 23:17:19.822309554 +0200 +++ /work/SRC/openSUSE:Factory/.xosview.new.3399/xosview.changes 2020-08-31 16:50:51.144371938 +0200 @@ -1,0 +2,9 @@ +Wed Aug 26 08:40:53 UTC 2020 - Dirk Mueller <dmuel...@suse.com> + +- update to 1.22: + * Fix build on arm by not including sys/io.h + * Add conditional code for v_cache_count +- update xosview-1.19.dif: remove armv7l conditional as this + went upstream + +------------------------------------------------------------------- Old: ---- xosview-1.21.tar.gz New: ---- xosview-1.22.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xosview.spec ++++++ --- /var/tmp/diff_new_pack.jJDjSj/_old 2020-08-31 16:50:52.252372476 +0200 +++ /var/tmp/diff_new_pack.jJDjSj/_new 2020-08-31 16:50:52.252372476 +0200 @@ -18,17 +18,7 @@ %define _appdefdir %{_datadir}/X11/app-defaults Name: xosview -BuildRequires: autoconf -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xpm) -# NOTE: We don't want this dependency and desktop-data-SuSE is in all -# desktop selections. -#Requires: desktop-data-SuSE -# /usr/bin/xrdb -Requires: xrdb -Version: 1.21 +Version: 1.22 Release: 0 Summary: System Load Information License: GPL-2.0-or-later @@ -45,13 +35,21 @@ Patch11: xosview-1.16-diskstat.patch # PATCH-FIX-SUSE: allow more than one maybe not exsting lmstemp resource entry Patch12: xosview-1.21-lmstemp.patch +BuildRequires: autoconf +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xpm) +# NOTE: We don't want this dependency and desktop-data-SuSE is in all +# desktop selections. +#Requires: desktop-data-SuSE +# /usr/bin/xrdb # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires: desktop-data-SuSE # /usr/bin/xrdb Requires: xrdb Requires(post): sed -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A small program which is mostly configurable using resources via @@ -75,8 +73,8 @@ OPTFLAGS="$OPTFLAGS -fno-const-strings" fi esac -make %{?_smp_mflags} clean -make %{?_smp_mflags} PLATFORM=linux OPTFLAGS="$OPTFLAGS" PREFIX=%{_prefix} USE_SYSCALLS=1 +%make_build clean +%make_build PLATFORM=linux OPTFLAGS="$OPTFLAGS" PREFIX=%{_prefix} USE_SYSCALLS=1 %install mkdir -p %{buildroot}%{_bindir} @@ -112,7 +110,6 @@ done %files -%defattr(-,root,root) %{_datadir}/pixmaps/xosview.png %dir %{_datadir}/icons/hicolor/ %dir %{_datadir}/icons/hicolor/32x32/ @@ -123,7 +120,7 @@ %{_bindir}/xosview.bin %dir %{_appdefdir} %config %verify(not md5 size mtime) %{_appdefdir}/XOsview -%{_mandir}/man1/xosview.1%{ext_man} +%{_mandir}/man1/xosview.1%{?ext_man} %dir %{_docdir}/xosview/ %doc %{_docdir}/xosview/README %doc %{_docdir}/xosview/README.linux ++++++ xosview-1.19.dif ++++++ --- /var/tmp/diff_new_pack.jJDjSj/_old 2020-08-31 16:50:52.284372491 +0200 +++ /var/tmp/diff_new_pack.jJDjSj/_new 2020-08-31 16:50:52.284372491 +0200 @@ -798,21 +798,6 @@ } void DiskMeter::getdiskinfo( void ) ---- linux/serialmeter.cc -+++ linux/serialmeter.cc 2020-04-02 06:18:43.246446896 +0000 -@@ -30,10 +30,10 @@ 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__) -+#if !defined(__powerpc__) && !defined(__hppa__) && !defined(__mips__) && !defined(__sparc__) && !defined(__sh__) && !defined(__s390__) && !defined(__s390x__) && !defined(__m68k__) && !defined(__aarch64__) && !defined(__arm__) - #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__) -+#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__) && !defined(__arm__) - #include <sys/perm.h> - #define HAVE_IOPERM - #endif --- llist.cc +++ llist.cc 2020-04-02 06:19:40.181330816 +0000 @@ -232,24 +232,32 @@ void *LList::findc( int which ){ ++++++ xosview-1.21.tar.gz -> xosview-1.22.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xosview-1.21/bsd/kernel.cc new/xosview-1.22/bsd/kernel.cc --- old/xosview-1.21/bsd/kernel.cc 2018-09-12 15:52:23.000000000 +0200 +++ new/xosview-1.22/bsd/kernel.cc 2020-02-22 20:33:08.000000000 +0100 @@ -93,6 +93,9 @@ static int mib_uvm[2] = { CTL_VM, VM_UVMEXP }; #endif #else +#if defined(XOSVIEW_FREEBSD) +#define _WANT_VMMETER +#endif #include <sys/vmmeter.h> #endif @@ -339,7 +342,9 @@ GET_VM_STATS(v_active_count); GET_VM_STATS(v_inactive_count); GET_VM_STATS(v_wire_count); +#if __FreeBSD_version < 1200017 GET_VM_STATS(v_cache_count); +#endif GET_VM_STATS(v_free_count); GET_VM_STATS(v_page_size); GET_VM_STATS(v_vnodepgsin); @@ -361,7 +366,9 @@ meminfo[0] = (uint64_t)vm.v_active_count * vm.v_page_size; meminfo[1] = (uint64_t)vm.v_inactive_count * vm.v_page_size; meminfo[2] = (uint64_t)vm.v_wire_count * vm.v_page_size; +#if __FreeBSD_version < 1200017 meminfo[3] = (uint64_t)vm.v_cache_count * vm.v_page_size; +#endif meminfo[4] = (uint64_t)vm.v_free_count * vm.v_page_size; #else /* XOSVIEW_DFBSD */ meminfo[0] = (uint64_t)vms.v_active_count * vms.v_page_size; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xosview-1.21/linux/serialmeter.cc new/xosview-1.22/linux/serialmeter.cc --- old/xosview-1.21/linux/serialmeter.cc 2018-09-12 15:52:23.000000000 +0200 +++ new/xosview-1.22/linux/serialmeter.cc 2020-02-22 20:33:08.000000000 +0100 @@ -30,7 +30,7 @@ #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__) +#if !defined(__powerpc__) && !defined(__hppa__) && !defined(__mips__) && !defined(__sparc__) && !defined(__sh__) && !defined(__s390__) && !defined(__s390x__) && !defined(__m68k__) && !defined(__aarch64__) && !defined(__arm__) #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__)