Date: Tue, 25 Aug 2020 21:28:39 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546233 - head/graphics/geeqie/files Message-ID: <202008252128.07PLSd7D055344@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008252128.07PLSd7D055344>