From owner-svn-ports-head@freebsd.org  Wed Jan 13 10:29:17 2021
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 15DB34D78A3;
 Wed, 13 Jan 2021 10:29:17 +0000 (UTC)
 (envelope-from danfe@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 4DG3b106G6z4SR0;
 Wed, 13 Jan 2021 10:29:17 +0000 (UTC)
 (envelope-from danfe@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 EA9B91567C;
 Wed, 13 Jan 2021 10:29:16 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10DATG2Q081795;
 Wed, 13 Jan 2021 10:29:16 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10DATGnu081794;
 Wed, 13 Jan 2021 10:29:16 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <202101131029.10DATGnu081794@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Wed, 13 Jan 2021 10:29:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r561452 - head/deskutils/gworkspace
X-SVN-Group: ports-head
X-SVN-Commit-Author: danfe
X-SVN-Commit-Paths: head/deskutils/gworkspace
X-SVN-Commit-Revision: 561452
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jan 2021 10:29:17 -0000

Author: danfe
Date: Wed Jan 13 10:29:16 2021
New Revision: 561452
URL: https://svnweb.freebsd.org/changeset/ports/561452

Log:
  Ensure that there is only one variable definition per each object, as
  the C (and C++) standards mandated for years and compilers started to
  enforce as of recently (Clang 11, GCC 10).
  
  PR:	252122

Modified:
  head/deskutils/gworkspace/Makefile

Modified: head/deskutils/gworkspace/Makefile
==============================================================================
--- head/deskutils/gworkspace/Makefile	Wed Jan 13 10:28:38 2021	(r561451)
+++ head/deskutils/gworkspace/Makefile	Wed Jan 13 10:29:16 2021	(r561452)
@@ -26,6 +26,11 @@ PLIST_SUB+=	PDFVIEW=""
 USES+=		ghostscript
 .endif
 
+post-patch:
+# Fix the build with -fno-common (for Clang 11 and GCC 10)
+	@${REINPLACE_CMD} -e '/serverConnection/s,^,extern ,' \
+		${WRKSRC}/Inspector/ContentViewers/ImageViewer/Resizer.h
+
 pre-configure:
 	${RM} -r ${WRKSRC}/GWMetadata