From owner-svn-ports-all@freebsd.org Sat Aug 22 08:34:22 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 28D4D3B26B0; Sat, 22 Aug 2020 08:34:22 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BYWrt0J5wz4LC9; Sat, 22 Aug 2020 08:34:22 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E1E0A13C5E; Sat, 22 Aug 2020 08:34:21 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07M8YLYS078766; Sat, 22 Aug 2020 08:34:21 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07M8YLRh078764; Sat, 22 Aug 2020 08:34:21 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202008220834.07M8YLRh078764@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Sat, 22 Aug 2020 08:34:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r545749 - branches/2020Q3/sysutils/htop/files X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: branches/2020Q3/sysutils/htop/files X-SVN-Commit-Revision: 545749 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Aug 2020 08:34:22 -0000 Author: zeising Date: Sat Aug 22 08:34:21 2020 New Revision: 545749 URL: https://svnweb.freebsd.org/changeset/ports/545749 Log: MFH: r545744 sysutils/htop: Fix build with -fno-common Fix the build of sysutils/htop with -fno-common, which is the default in llvm 11 (and gcc 10) PR: 248823 Submitted by: Yasuhiro KIMURA Approved by: ports-secteam (joenum, implicit, -fno-common fixes) Added: branches/2020Q3/sysutils/htop/files/patch-CRT.h - copied unchanged from r545744, head/sysutils/htop/files/patch-CRT.h branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h - copied unchanged from r545744, head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h Modified: branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c Directory Properties: branches/2020Q3/ (props changed) Copied: branches/2020Q3/sysutils/htop/files/patch-CRT.h (from r545744, head/sysutils/htop/files/patch-CRT.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/sysutils/htop/files/patch-CRT.h Sat Aug 22 08:34:21 2020 (r545749, copy of r545744, head/sysutils/htop/files/patch-CRT.h) @@ -0,0 +1,27 @@ +--- CRT.h.orig 2018-04-10 13:42:59 UTC ++++ CRT.h +@@ -140,7 +140,7 @@ extern const char **CRT_treeStr; + + extern int CRT_delay; + +-int* CRT_colors; ++extern int* CRT_colors; + + extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT]; + +@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount; + + extern int CRT_scrollWheelVAmount; + +-char* CRT_termType; ++extern char* CRT_termType; + + // TODO move color scheme to Settings, perhaps? + + extern int CRT_colorScheme; + +-void *backtraceArray[128]; ++extern void *backtraceArray[128]; + + #if HAVE_SETUID_ENABLED + Modified: branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c ============================================================================== --- branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c Sat Aug 22 08:33:34 2020 (r545748) +++ branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c Sat Aug 22 08:34:21 2020 (r545749) @@ -4,7 +4,18 @@ https://github.com/hishamhm/htop/pull/871 --- freebsd/FreeBSDProcessList.c.orig 2018-04-10 13:42:59 UTC +++ freebsd/FreeBSDProcessList.c -@@ -296,31 +296,46 @@ static inline void FreeBSDProcessList_scanMemoryInfo(P +@@ -28,8 +28,9 @@ in the source distribution for its full text. + #include + + #define JAIL_ERRMSGLEN 1024 ++*/ + char jail_errmsg[JAIL_ERRMSGLEN]; +- ++/* + typedef struct CPUData_ { + + double userPercent; +@@ -296,31 +297,46 @@ static inline void FreeBSDProcessList_scanMemoryInfo(P // // htop_used = active + (wired - arc) // htop_cache = buffers + cache + arc Copied: branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h (from r545744, head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h Sat Aug 22 08:34:21 2020 (r545749, copy of r545744, head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h) @@ -0,0 +1,11 @@ +--- freebsd/FreeBSDProcessList.h.orig 2018-04-10 13:42:59 UTC ++++ freebsd/FreeBSDProcessList.h +@@ -17,7 +17,7 @@ in the source distribution for its full text. + #include + + #define JAIL_ERRMSGLEN 1024 +-char jail_errmsg[JAIL_ERRMSGLEN]; ++extern char jail_errmsg[JAIL_ERRMSGLEN]; + + typedef struct CPUData_ { +