Hello community,
here is the log from the commit of package htop for openSUSE:Factory checked in
at 2016-02-16 09:18:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/htop (Old)
and /work/SRC/openSUSE:Factory/.htop.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "htop"
Changes:
--------
--- /work/SRC/openSUSE:Factory/htop/htop.changes 2015-08-07
00:24:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.htop.new/htop.changes 2016-02-16
09:18:41.000000000 +0100
@@ -1,0 +2,23 @@
+Thu Feb 11 18:29:47 UTC 2016 - ji...@boombatower.com
+
+- Update to version 2.0.0.
+ * Platform abstraction layer
+ * Initial FreeBSD support
+ * Initial Mac OS X support (thanks to David Hunt)
+ * Swap meter for Mac OSX (thanks to Ștefan Rusu)
+ * OpenBSD port (thanks to Michael McConville)
+ * FreeBSD support improvements (thanks to Martin Misuth)
+ * Support for NCurses 6 ABI, including mouse wheel support
+ * Much improved mouse responsiveness
+ * Process environment variables screen (thanks to Michael Klein)
+ * Higher-resolution UTF-8 based Graph mode (Thanks to James Hall from vtop
for the idea!)
+ * Show program path settings (thanks to Tobias Geerinckx-Rice)
+ * BUGFIX: Fix crash when scrolling an empty filtered list.
+ * Use dynamic units for text display, and several fixes (thanks to Christian
Hesse)
+ * BUGFIX: fix error caused by overflow in usertime calculation. (thanks to
Patrick Marlier)
+ * Catch all memory allocation errors (thanks to Michael McConville for the
push)
+ * Several tweaks and bugfixes (See the Git log for details and contributors!)
+- Rerolled both patches for compatibility with 2.0.0.
+- Fix ncurses 6 incompatibility during compile.
+
+-------------------------------------------------------------------
Old:
----
htop-1.0.3.tar.gz
New:
----
htop-2.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ htop.spec ++++++
--- /var/tmp/diff_new_pack.rPEPQb/_old 2016-02-16 09:18:42.000000000 +0100
+++ /var/tmp/diff_new_pack.rPEPQb/_new 2016-02-16 09:18:42.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package htop
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: htop
-Version: 1.0.3
+Version: 2.0.0
Release: 0
Summary: An Interactive text-mode Process Viewer for Linux
License: GPL-2.0+
@@ -45,7 +45,7 @@
%prep
%setup -q
-%patch0
+%patch0 -p1
%patch1 -p1
%build
@@ -56,7 +56,13 @@
--enable-native-affinity \
--enable-cgroup \
--enable-oom
-make %{?_smp_mflags}
+# forcefully exclude -L/usr/lib(64)/ncurses5 from being added on systems with
+# version 6 of ncurses. probably a cleaner way to fix this.
+%if 0%{?suse_version} > 1320
+LIBS="-lncursesw -ltinfo -lm " make -e %{?_smp_mflags}
+%else
+make -e %{?_smp_mflags}
+%endif
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
++++++ htop-1.0.3.tar.gz -> htop-2.0.0.tar.gz ++++++
++++ 34998 lines of diff (skipped)
++++++ htop-desktop-file-fix-thoenig-01.patch ++++++
--- /var/tmp/diff_new_pack.rPEPQb/_old 2016-02-16 09:18:42.000000000 +0100
+++ /var/tmp/diff_new_pack.rPEPQb/_new 2016-02-16 09:18:42.000000000 +0100
@@ -1,11 +1,25 @@
-Index: htop.desktop
-===================================================================
---- htop.desktop.orig 2009-04-18 22:44:09.000000000 +0200
-+++ htop.desktop 2009-06-02 11:39:01.000000000 +0200
-@@ -6,5 +6,5 @@ Comment=Show System Processes
+From 7471273005031559c5fa05ffa11a7bca4ff647b0 Mon Sep 17 00:00:00 2001
+From: boombatower <ji...@boombatower.com>
+Date: Thu, 11 Feb 2016 12:36:06 -0600
+Subject: [PATCH] Improve desktop file category.
+
+---
+ htop.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/htop.desktop b/htop.desktop
+index 2f7a7ee..96d2946 100644
+--- a/htop.desktop
++++ b/htop.desktop
+@@ -32,7 +32,7 @@ Comment[zh_TW]=顯示系統行程
Terminal=true
Exec=htop
Icon=htop
-Categories=ConsoleOnly;System;
+Categories=System;Monitor;
GenericName=Process Viewer
+ GenericName[ca]=Visor de processos
+ GenericName[de]=Prozessanzeige
+--
+2.7.0
+
++++++ htop-stdgnu.patch ++++++
--- /var/tmp/diff_new_pack.rPEPQb/_old 2016-02-16 09:18:42.000000000 +0100
+++ /var/tmp/diff_new_pack.rPEPQb/_new 2016-02-16 09:18:42.000000000 +0100
@@ -1,29 +1,42 @@
-Index: htop-1.0.3/Makefile.am
-===================================================================
---- htop-1.0.3.orig/Makefile.am
-+++ htop-1.0.3/Makefile.am
-@@ -10,8 +10,8 @@ applications_DATA = htop.desktop
+From 9b5a3912ca328885dee99f3a8aa786738a37a8c8 Mon Sep 17 00:00:00 2001
+From: boombatower <ji...@boombatower.com>
+Date: Thu, 11 Feb 2016 12:48:39 -0600
+Subject: [PATCH] Makefile/Configure cleanups.
+
+---
+ Makefile.am | 4 ++--
+ configure.ac | 24 ++++++------------------
+ 2 files changed, 8 insertions(+), 20 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8b31627..33711ea 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -12,9 +12,9 @@ applications_DATA = htop.desktop
pixmapdir = $(datadir)/pixmaps
pixmap_DATA = htop.png
--htop_CFLAGS = -pedantic -Wall -Wextra -std=c99 -rdynamic
-D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\"
+-htop_CFLAGS = -pedantic -Wall $(wextra_flag) -std=c99
-D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\"
-I"$(top_srcdir)/$(my_htop_platform)"
++htop_CFLAGS = -Wall -Wextra -DSYSCONFDIR=\"$(sysconfdir)\"
-I"$(top_srcdir)/$(my_htop_platform)"
+ htop_LDFLAGS =
-AM_CPPFLAGS = -DNDEBUG
-+htop_CFLAGS = -Wall -Wextra -DSYSCONFDIR=\"$(sysconfdir)\"
+AM_CPPFLAGS = -include config.h -DNDEBUG
myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \
- ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c \
-Index: htop-1.0.3/configure.ac
-===================================================================
---- htop-1.0.3.orig/configure.ac
-+++ htop-1.0.3/configure.ac
-@@ -1,11 +1,12 @@
+ ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c MainPanel.c \
+diff --git a/configure.ac b/configure.ac
+index 3bd58bc..0a54968 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,13 +1,14 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.65)
+AC_PREREQ([2.65])
- AC_INIT([htop],[1.0.3],[his...@gobolinux.org])
+ AC_INIT([htop],[2.0.0],[his...@gobolinux.org])
+
+ year=$(date +%Y)
# The following two lines are required by hwloc scripts
AC_USE_SYSTEM_EXTENSIONS
@@ -31,10 +44,10 @@
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([1.11])
-@@ -14,15 +15,14 @@ AC_CONFIG_HEADER([config.h])
- AC_CONFIG_MACRO_DIR([m4])
+@@ -17,13 +18,9 @@ AC_CONFIG_MACRO_DIR([m4])
# Checks for programs.
+ # ----------------------------------------------------------------------
-AC_PROG_CC
+AC_PROG_CC_STDC
AM_PROG_CC_C_O
@@ -42,17 +55,20 @@
-AC_DISABLE_SHARED
-AC_ENABLE_STATIC
-AC_PROG_LIBTOOL
-+#AC_DISABLE_SHARED
-+#AC_ENABLE_STATIC
-+#AC_PROG_LIBTOOL
+-
+ # Checks for platform.
+ # ----------------------------------------------------------------------
+ case "$target" in
+@@ -46,7 +43,7 @@ esac
--# Checks for libraries.
+ # Checks for libraries.
+ # ----------------------------------------------------------------------
-AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"])
+AC_SEARCH_LIBS([ceil], [m])
# Checks for header files.
- AC_HEADER_DIRENT
-@@ -30,7 +30,7 @@ AC_HEADER_STDC
+ # ----------------------------------------------------------------------
+@@ -55,7 +52,7 @@ AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h
unistd.h],[:],[
missing_headers="$missing_headers $ac_header"
])
@@ -60,10 +76,10 @@
+AC_CHECK_HEADERS_ONCE([execinfo.h])
# Checks for typedefs, structures, and compiler characteristics.
- AC_HEADER_STDBOOL
-@@ -40,17 +40,8 @@ AC_TYPE_UID_T
-
- # Checks for library functions.
+ # ----------------------------------------------------------------------
+@@ -67,17 +64,8 @@ AC_TYPE_UID_T
+ # Checks for library functions and compiler features.
+ # ----------------------------------------------------------------------
AC_FUNC_CLOSEDIR_VOID
-AC_TYPE_SIGNAL
AC_FUNC_STAT
@@ -78,71 +94,8 @@
-CFLAGS="$save_cflags"
+AC_CHECK_FUNCS_ONCE([memmove strncasecmp strstr strdup])
- PROCDIR=/proc
- AC_ARG_WITH(proc, [ --with-proc=DIR Location of a Linux-compatible proc
filesystem (default=/proc).],
-@@ -61,33 +52,33 @@ AC_ARG_WITH(proc, [ --with-proc=DIR
- fi,
- AC_DEFINE(PROCDIR, "/proc", [Path of proc filesystem]))
-
--AC_ARG_ENABLE(openvz, [AC_HELP_STRING([--enable-openvz], [enable OpenVZ
support])], ,enable_openvz="no")
-+AC_ARG_ENABLE(openvz, [AS_HELP_STRING([--enable-openvz],[enable OpenVZ
support])], ,enable_openvz="no")
- if test "x$enable_openvz" = xyes; then
- AC_DEFINE(HAVE_OPENVZ, 1, [Define if openvz support enabled.])
- fi
-
--AC_ARG_ENABLE(cgroup, [AC_HELP_STRING([--enable-cgroup], [enable cgroups
support])], ,enable_cgroup="no")
-+AC_ARG_ENABLE(cgroup, [AS_HELP_STRING([--enable-cgroup],[enable cgroups
support])], ,enable_cgroup="no")
- if test "x$enable_cgroup" = xyes; then
- AC_DEFINE(HAVE_CGROUP, 1, [Define if cgroup support enabled.])
- fi
-
--AC_ARG_ENABLE(vserver, [AC_HELP_STRING([--enable-vserver], [enable VServer
support])], ,enable_vserver="no")
-+AC_ARG_ENABLE(vserver, [AS_HELP_STRING([--enable-vserver],[enable VServer
support])], ,enable_vserver="no")
- if test "x$enable_vserver" = xyes; then
- AC_DEFINE(HAVE_VSERVER, 1, [Define if vserver support enabled.])
- fi
-
--AC_ARG_ENABLE(ancient_vserver, [AC_HELP_STRING([--enable-ancient-vserver],
[enable ancient VServer support (implies --enable-vserver)])],
,enable_ancient_vserver="no")
-+AC_ARG_ENABLE(ancient_vserver,
[AS_HELP_STRING([--enable-ancient-vserver],[enable ancient VServer support
(implies --enable-vserver)])], ,enable_ancient_vserver="no")
- if test "x$enable_ancient_vserver" = xyes; then
- AC_DEFINE(HAVE_VSERVER, 1, [Define if vserver support enabled.])
- AC_DEFINE(HAVE_ANCIENT_VSERVER, 1, [Define if ancient vserver support
enabled.])
- fi
-
--AC_ARG_ENABLE(taskstats, [AC_HELP_STRING([--enable-taskstats], [enable
per-task IO Stats (taskstats kernel sup required)])], ,enable_taskstats="yes")
-+AC_ARG_ENABLE(taskstats, [AS_HELP_STRING([--enable-taskstats],[enable
per-task IO Stats (taskstats kernel sup required)])], ,enable_taskstats="yes")
- if test "x$enable_taskstats" = xyes; then
- AC_DEFINE(HAVE_TASKSTATS, 1, [Define if taskstats support enabled.])
- fi
-
--AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode
support])], ,enable_unicode="yes")
-+AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode],[enable Unicode
support])], ,enable_unicode="yes")
- if test "x$enable_unicode" = xyes; then
- AC_CHECK_LIB([ncursesw], [refresh], [], [
- missing_libraries="$missing_libraries libncursesw"
-@@ -117,7 +108,7 @@ AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERRO
- AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make
sure you have a Linux-compatible /proc filesystem mounted. See the file README
for help.))
- fi
-
--AC_ARG_ENABLE(native_affinity, [AC_HELP_STRING([--enable-native-affinity],
[enable native sched_setaffinity and sched_getaffinity for affinity support,
disables hwloc])], ,enable_native_affinity="yes")
-+AC_ARG_ENABLE(native_affinity,
[AS_HELP_STRING([--enable-native-affinity],[enable native sched_setaffinity and
sched_getaffinity for affinity support, disables hwloc])],
,enable_native_affinity="yes")
- if test "x$enable_native_affinity" = xyes -a "x$cross_compiling" = xno; then
- AC_MSG_CHECKING([for usable sched_setaffinity])
- AC_RUN_IFELSE([
-@@ -138,14 +129,14 @@ if test "x$enable_native_affinity" = xye
- AC_DEFINE(HAVE_NATIVE_AFFINITY, 1, [Define if native sched_setaffinity and
sched_getaffinity are to be used.])
- fi
-
--AC_ARG_ENABLE(hwloc, [AC_HELP_STRING([--enable-hwloc], [enable hwloc support
for CPU affinity])],, enable_hwloc="no")
-+AC_ARG_ENABLE(hwloc, [AS_HELP_STRING([--enable-hwloc],[enable hwloc support
for CPU affinity])],, enable_hwloc="no")
- if test "x$enable_hwloc" = xyes
- then
- AC_CHECK_LIB([hwloc], [hwloc_linux_get_tid_cpubind], [],
[missing_libraries="$missing_libraries libhwloc"])
- AC_CHECK_HEADERS([hwloc.h],[:], [missing_headers="$missing_headers
$ac_header"])
- fi
-
--AC_ARG_ENABLE(oom, [AC_HELP_STRING([--enable-oom], [enable OOM score
reporting])], ,enable_oom="no")
-+AC_ARG_ENABLE(oom, [AS_HELP_STRING([--enable-oom],[enable OOM score
reporting])], ,enable_oom="no")
- if test "x$enable_oom" = xyes; then
- AC_DEFINE(HAVE_OOM, 1, [Define if OOM score support enabled.])
- fi
+ save_cflags="${CFLAGS}"
+ CFLAGS="$CFLAGS -Wextra"
+--
+2.7.0
+
