From owner-svn-ports-all@freebsd.org Thu Nov 29 10:33:30 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52831115B6A9; Thu, 29 Nov 2018 10:33:30 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EA2168287B; Thu, 29 Nov 2018 10:33:29 +0000 (UTC) (envelope-from madpilot@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 C9B0D18596; Thu, 29 Nov 2018 10:33:29 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wATAXTAl044010; Thu, 29 Nov 2018 10:33:29 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wATAXT3j044009; Thu, 29 Nov 2018 10:33:29 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201811291033.wATAXT3j044009@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Thu, 29 Nov 2018 10:33:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486162 - head/sysutils/conky/files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: head/sysutils/conky/files X-SVN-Commit-Revision: 486162 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EA2168287B X-Spamd-Result: default: False [0.84 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.31)[0.307,0]; NEURAL_SPAM_SHORT(0.28)[0.284,0]; NEURAL_SPAM_MEDIUM(0.25)[0.247,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Thu, 29 Nov 2018 10:33:30 -0000 Author: madpilot Date: Thu Nov 29 10:33:29 2018 New Revision: 486162 URL: https://svnweb.freebsd.org/changeset/ports/486162 Log: Fix build with GCC-based architectures. Fix changes the name of a variable to avoid clash with a function name defined in an include file used by GCC. PR: 233616 Submitted by: Piotr Kubaj Added: head/sysutils/conky/files/patch-src_freebsd.cc (contents, props changed) Added: head/sysutils/conky/files/patch-src_freebsd.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/conky/files/patch-src_freebsd.cc Thu Nov 29 10:33:29 2018 (r486162) @@ -0,0 +1,23 @@ +--- src/freebsd.cc.orig 2018-11-28 18:50:47 UTC ++++ src/freebsd.cc +@@ -78,7 +78,7 @@ std::mutex kvm_proc_mutex; + __attribute__((gnu_inline)) inline void + proc_find_top(struct process **cpu, struct process **mem, struct process **time); + +-static short cpu_setup = 0; ++static short conky_cpu_setup = 0; + + static int getsysctl(const char *name, void *ptr, size_t len) + { +@@ -338,9 +338,9 @@ int update_cpu_usage(void) + extern void* global_cpu; + + /* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */ +- if ((cpu_setup == 0) || (!info.cpu_usage)) { ++ if ((conky_cpu_setup == 0) || (!info.cpu_usage)) { + get_cpu_count(); +- cpu_setup = 1; ++ conky_cpu_setup = 1; + } + + if (!global_cpu) {