From owner-svn-ports-all@freebsd.org Tue Aug 25 21:28:40 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 116CA3BC9F5; Tue, 25 Aug 2020 21:28:40 +0000 (UTC) (envelope-from amdmi3@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 4Bbhtv6kP5z4BKF; Tue, 25 Aug 2020 21:28:39 +0000 (UTC) (envelope-from amdmi3@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 CA07986A6; Tue, 25 Aug 2020 21:28:39 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07PLSddH055346; Tue, 25 Aug 2020 21:28:39 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07PLSd7D055344; Tue, 25 Aug 2020 21:28:39 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <202008252128.07PLSd7D055344@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 25 Aug 2020 21:28:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546233 - head/graphics/geeqie/files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/graphics/geeqie/files X-SVN-Commit-Revision: 546233 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: Tue, 25 Aug 2020 21:28:40 -0000 Author: amdmi3 Date: Tue Aug 25 21:28:39 2020 New Revision: 546233 URL: https://svnweb.freebsd.org/changeset/ports/546233 Log: Fix duplicate symbols This should fix the build on latest CURRENT and is mostly equal to upstream commit 3ea5fa3 Reported by: soralx at cydem dot org Added: head/graphics/geeqie/files/patch-options.c (contents, props changed) head/graphics/geeqie/files/patch-options.h (contents, props changed) Added: head/graphics/geeqie/files/patch-options.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/geeqie/files/patch-options.c Tue Aug 25 21:28:39 2020 (r546233) @@ -0,0 +1,12 @@ +--- src/options.c.orig 2019-08-20 19:01:23 UTC ++++ src/options.c +@@ -32,6 +32,9 @@ + #include "ui_fileops.h" + #include "window.h" + ++ConfOptions *options; ++CommandLine *command_line; ++ + ConfOptions *init_options(ConfOptions *options) + { + gint i; Added: head/graphics/geeqie/files/patch-options.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/geeqie/files/patch-options.h Tue Aug 25 21:28:39 2020 (r546233) @@ -0,0 +1,13 @@ +--- src/options.h.orig 2019-08-20 19:01:23 UTC ++++ src/options.h +@@ -321,8 +321,8 @@ struct _ConfOptions + GList *disabled_plugins; + }; + +-ConfOptions *options; +-CommandLine *command_line; ++extern ConfOptions *options; ++extern CommandLine *command_line; + + ConfOptions *init_options(ConfOptions *options); + void setup_default_options(ConfOptions *options);