aboutsummaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorTobias Kortkamp <tobik@FreeBSD.org>2020-06-21 16:41:58 +0000
committerTobias Kortkamp <tobik@FreeBSD.org>2020-06-21 16:41:58 +0000
commit18b509f21504e89a45929f7cc18a70f62b6ebc5e (patch)
treea4c1f9d592a7d58455b0149ceb20cb4185a3cdd3 /deskutils
parent16d15dc28ae437fb8538c7b962f6226932edb8f9 (diff)
downloadports-18b509f21504e89a45929f7cc18a70f62b6ebc5e.tar.gz
ports-18b509f21504e89a45929f7cc18a70f62b6ebc5e.zip
deskutils/xneur: Unbreak build with GCC 10
/usr/local/bin/ld: ../main/.libs/libxnmain.a(libxnmain_la-bind_table.o):(.bss+0x0): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here /usr/local/bin/ld: ../main/.libs/libxnmain.a(libxnmain_la-buffer.o):(.bss+0x10): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here /usr/local/bin/ld: ../main/.libs/libxnmain.a(libxnmain_la-event.o):(.bss+0x0): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here /usr/local/bin/ld: ../main/.libs/libxnmain.a(libxnmain_la-focus.o):(.bss+0x0): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here /usr/local/bin/ld: ../main/.libs/libxnmain.a(libxnmain_la-keymap.o):(.bss+0x0): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here /usr/local/bin/ld: ../main/.libs/libxnmain.a(libxnmain_la-plugin.o):(.bss+0x0): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here /usr/local/bin/ld: ../main/.libs/libxnmain.a(libxnmain_la-program.o):(.bss+0x8): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here /usr/local/bin/ld: ../main/.libs/libxnmain.a(libxnmain_la-selection.o):(.bss+0x0): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here /usr/local/bin/ld: ../main/.libs/libxnmain.a(libxnmain_la-switchlang.o):(.bss+0x0): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here /usr/local/bin/ld: ../main/.libs/libxnmain.a(libxnmain_la-utils.o):(.bss+0x0): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here /usr/local/bin/ld: ../main/.libs/libxnmain.a(libxnmain_la-window.o):(.bss+0x0): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here /usr/local/bin/ld: ../ai/.libs/libxnai.a(libxnai_la-detection.o):(.bss+0x0): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here /usr/local/bin/ld: ../notify/.libs/libxnnotify.a(libxnnotify_la-notify.o):(.bss+0x0): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here /usr/local/bin/ld: ../notify/.libs/libxnnotify.a(libxnnotify_la-popup.o):(.bss+0x8): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here /usr/local/bin/ld: ../notify/.libs/libxnnotify.a(libxnnotify_la-sound.o):(.bss+0x0): multiple definition of `main_window'; .libs/libxneur_la-xneurlib.o:(.bss+0x8): first defined here http://package18.nyi.freebsd.org/data/121amd64-default-PR244494/2020-06-10_18h04m44s/logs/errors/xneur-0.20.0.log PR: 246700
Notes
Notes: svn path=/head/; revision=539774
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/xneur/files/patch-lib_lib_xneur.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/deskutils/xneur/files/patch-lib_lib_xneur.h b/deskutils/xneur/files/patch-lib_lib_xneur.h
new file mode 100644
index 000000000000..1631ab997458
--- /dev/null
+++ b/deskutils/xneur/files/patch-lib_lib_xneur.h
@@ -0,0 +1,11 @@
+--- lib/lib/xneur.h.orig 2020-06-21 16:29:31 UTC
++++ lib/lib/xneur.h
+@@ -32,7 +32,7 @@
+ # include <enchant/enchant.h>
+ #endif
+
+-struct _window *main_window;
++extern struct _window *main_window;
+
+ struct _xneur_language
+ {