From nobody Fri Oct 20 16:26:15 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBqhl5vTfz4xxkK; Fri, 20 Oct 2023 16:26:15 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBqhl4brqz3N0w; Fri, 20 Oct 2023 16:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697819175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8jD4uw8ZFoLVbKE2wtzxAzPUntt7lskzCjJFQGlxxBY=; b=qxJ/EDdQGO2y5G6WGdQl644JnldY9jyvyx8bHVFHUqFyDpDXPt8HlcXDCz5G2hnhpyJLhu AGTsz75HfiiTbL2z32qwp94la5eASTBcl30pW8bMLTRuQmijpomokgUu7cIPl/wj8iaxWR 18QrpMD+mFzGsSp9CxVa3FZDsrXhiFVQYFfMnaj6dNo5h/v+QSxpX7uxxBhRQA5l3q1d1/ OEqIj5EM8PItpt+j+Hzve1CXzKmXr+YjpdTIOXqUa0HNSYnXsPg657jKPREysOYy2mF0wd Cu26bx/WJY27WQbjYe9vb/N0PkyATcDWzkVs6OkpmF3DcieB4umWcV+lTmkCLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697819175; a=rsa-sha256; cv=none; b=aoqtF8S9GQrF6YHPoiVwG5L7kd61H/15mTTP5Ikfrq2hoDiuDlhLWuGG7bYpU11nmHDVNR BBFC2BCQyvvh5VkXlUUEFolG+gKmmx/1xTPwcBqeEU1bG2exXZxxViJAIPFvmUdrEGR0PT 6qE9Ib+kB4xgrA18gI82rnQgrDerii+2DzsC7mBZQVIUYiP1IOOcBb/ezcdcxL2Is5nHuv roChKh9fxhHQknC+NR/kP12N5iOHevoN3ON42XUGoHpDz225/0EunvAlAPXAlyamktmRL0 w7+a6VTJvqAbVtF41HTe+/xkHC4g58zEfq2gFuOqVW1ZDxgJkeWJL5cCNC8IFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697819175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8jD4uw8ZFoLVbKE2wtzxAzPUntt7lskzCjJFQGlxxBY=; b=osKCz5nv67kaZ+Hcqly1ppHViGc9V+6YAsRq9/uvwFsR4TMOwHlqvgPNjDBB1R7iPPhx8Z jLP1aMMuZyiQwlnJJWIP9kQcFdhF/HCUuNO8Psp1XcEEE1ph/JRb2Pc7+OWaYSi+CVotg9 wV+s4lXv0WV1sw/wYz5XY4zAThCHBZWLWYqFpu/51V64REpiHC5JDNPMlxLz2JxGDLXr/n dHurdm7MM6eb3iGaYzKC48QSNnjEuSWdkTsKW8KGWEEkULgAOH7p/qF2mOzqvFiM6Wdl40 G9V9GTJuhglZ4adiuagMjEef+m/dS8o8PbmXh6mr6fDuauNV2BA+BCOSdumm+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBqhl3Zb3zgDx; Fri, 20 Oct 2023 16:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KGQFGd073249; Fri, 20 Oct 2023 16:26:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KGQFYe073246; Fri, 20 Oct 2023 16:26:15 GMT (envelope-from git) Date: Fri, 20 Oct 2023 16:26:15 GMT Message-Id: <202310201626.39KGQFYe073246@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 3b15b1f98845 - main - x11/libxklavier: fix build with lld 17 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b15b1f988458485b3d7b9e0f4a483e53b6b509d Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b15b1f988458485b3d7b9e0f4a483e53b6b509d commit 3b15b1f988458485b3d7b9e0f4a483e53b6b509d Author: Dimitry Andric AuthorDate: 2023-10-08 15:23:44 +0000 Commit: Dimitry Andric 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