Hello community, here is the log from the commit of package htop for openSUSE:Factory checked in at 2020-04-23 18:32:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/htop (Old) and /work/SRC/openSUSE:Factory/.htop.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "htop" Thu Apr 23 18:32:44 2020 rev:44 rq:796378 version:2.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/htop/htop.changes 2018-04-13 12:51:40.307418720 +0200 +++ /work/SRC/openSUSE:Factory/.htop.new.2738/htop.changes 2020-04-23 18:32:45.992355061 +0200 @@ -1,0 +2,7 @@ +Thu Apr 23 05:46:54 UTC 2020 - Martin Pluskal <[email protected]> + +- Add patches: + * htop-2.2.0-fix-linux-process-ordering.patch + * htop-2.2.0-fix-option-string.patch (fixes boo#1165352) + +------------------------------------------------------------------- New: ---- htop-2.2.0-fix-linux-process-ordering.patch htop-2.2.0-fix-option-string.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ htop.spec ++++++ --- /var/tmp/diff_new_pack.PHNSzH/_old 2020-04-23 18:32:47.364357685 +0200 +++ /var/tmp/diff_new_pack.PHNSzH/_new 2020-04-23 18:32:47.364357685 +0200 @@ -1,7 +1,7 @@ # # spec file for package htop # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -29,6 +29,10 @@ Patch0: htop-desktop-file-fix-thoenig-01.patch # PATCH-FIX-OPENSUSE htop-script-python3.patch Patch1: htop-script-python3.patch +# PATCH-FIX-UPSTREAM This broke with commit db05ba61065f64b59d0014518be0786b5439e54c -- allow args for specific options +Patch2: htop-2.2.0-fix-option-string.patch +# PATCH-FIX-UPSTREAM Make sure the auto-regenerated headers (after scripts/MakeHeader.py) actually compile +Patch3: htop-2.2.0-fix-linux-process-ordering.patch BuildRequires: pkgconfig >= 0.9.0 BuildRequires: python3-base BuildRequires: update-desktop-files ++++++ htop-2.2.0-fix-linux-process-ordering.patch ++++++ Index: htop-2.2.0/linux/LinuxProcess.c =================================================================== --- htop-2.2.0.orig/linux/LinuxProcess.c +++ htop-2.2.0/linux/LinuxProcess.c @@ -143,7 +143,7 @@ typedef struct LinuxProcess_ { } LinuxProcess; #ifndef Process_isKernelThread -#define Process_isKernelThread(_process) ((LinuxProcess*)(_process)->isKernelThread) +#define Process_isKernelThread(_process) (((LinuxProcess*)(_process))->isKernelThread) #endif #ifndef Process_isUserlandThread ++++++ htop-2.2.0-fix-option-string.patch ++++++ Index: htop-2.2.0/htop.c =================================================================== --- htop-2.2.0.orig/htop.c +++ htop-2.2.0/htop.c @@ -93,7 +93,7 @@ static CommandLineSettings parseArgument int opt, opti=0; /* Parse arguments */ - while ((opt = getopt_long(argc, argv, "hvCst::d:u:p:i", long_opts, &opti))) { + while ((opt = getopt_long(argc, argv, "hvCs:td:u:p:i", long_opts, &opti))) { if (opt == EOF) break; switch (opt) { case 'h':
