git: 3b15b1f98845 - main - x11/libxklavier: fix build with lld 17
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 20 Oct 2023 16:26:15 UTC
The branch main has been updated by dim:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3b15b1f988458485b3d7b9e0f4a483e53b6b509d
commit 3b15b1f988458485b3d7b9e0f4a483e53b6b509d
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2023-10-08 15:23:44 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2023-10-20 16:25:48 +0000
x11/libxklavier: fix build with lld 17
Building x11/libxklavier with lld 17 results in the following link
error:
libtool: link: cc -shared -fPIC -DPIC .libs/xkl-enum-types.o .libs/xklavier.o .libs/xklavier_evt.o .libs/xklavier_config.o .libs/xklavier_config_iso.o .libs/xklavier_xkb.o .libs/xklavier_evt_xkb.o .libs/xklavier_config_xkb.o .libs/xklavier_toplevel.o .libs/xklavier_xmm.o .libs/xklavier_xmm_opts.o .libs/xklavier_evt_xmm.o .libs/xklavier_config_xmm.o .libs/xklavier_util.o .libs/xklavier_props.o .libs/xklavier_dump.o .libs/xkl_engine_marshal.o -L/usr/local/lib -lxml2 -lgobject-2.0 -lglib-2.0 -lintl -lXi -lxkbfile -lX11 -O2 -fstack-protector-strong -fstack-protector-strong -Wl,-rpath -Wl,/usr/local/lib -Wl,-soname -Wl,libxklavier.so.16 -Wl,-version-script -Wl,.libs/libxklavier.so.16.3.0-ver -o .libs/libxklavier.so.16.3.0
ld: error: version script assignment of 'global' to symbol 'xkl_engine_VOID__FLAGS_INT_BOOLEAN' failed: symbol not defined
cc: error: linker command failed with exit code 1 (use -v to see invocation)
The mentioned symbol has been removed from libxklavier at some point,
and can be deleted from the linker version script.
PR: 274356
Approved by: maintainer timeout (2 weeks)
MFH: 2023Q4
---
x11/libxklavier/files/patch-libxklavier_libxklavier.public | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/x11/libxklavier/files/patch-libxklavier_libxklavier.public b/x11/libxklavier/files/patch-libxklavier_libxklavier.public
new file mode 100644
index 000000000000..0c6f87227867
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_libxklavier.public
@@ -0,0 +1,10 @@
+--- libxklavier/libxklavier.public.orig 2012-08-23 22:23:02 UTC
++++ libxklavier/libxklavier.public
+@@ -80,7 +80,6 @@ xkl_engine_ungrab_key
+ xkl_engine_state_change_get_type
+ xkl_engine_stop_listen
+ xkl_engine_ungrab_key
+-xkl_engine_VOID__FLAGS_INT_BOOLEAN
+ xkl_get_country_name
+ xkl_get_language_name
+ xkl_get_last_error