From nobody Fri Oct 20 16:26:12 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 4SBqhh4Wwpz4xyLj; Fri, 20 Oct 2023 16:26:12 +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 4SBqhh2B2xz3N2m; Fri, 20 Oct 2023 16:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697819172; 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=SabvpYy9TYCB+dCB0nEhDLgw5NRX/Nw2pF4XaA9OFzI=; b=jCgk31ml3QnqvTxW3EUdhPZO44YAJwGb9M3x+eMaCmhmhBBerV88M/mXB0p19X+09Uc/iA R5GxJB+t/LW1eQwWsKGtQEmkBujjnERqJg0uyN0FOlro0CYMeCGlW2BpLYeium5ukAlf+h gXZVu0YOn08yvEUvHIYfQ9NIHD5dqEBYF6z4r3VUrey3kyZvK64GFvUOyWQNmz0MKVqymv MFucJ94mMBRYa4s2iENY+dVMwtmXs6jxSsalQbyglH4UCU539Vl0nqhAk2RyyqjlcD0BSh 1SLBWiT8xElIFgLMa99c5B/EtyhazPN297jbaC7DsTF+dZbIqb5s4rOrf4juyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697819172; a=rsa-sha256; cv=none; b=ZTtFGkUaeBUdX4QjDy/kSXf0GKiOaslZkRPZ1ccXIiy5+SG/24dYtZ2MQniYerae8xmHn0 RQmfq9v1MzKLByW8YUhWhrjfeMs+P5dY1lBo3iVvm4aRT/2Ub5922b+swfTBq1zHNCB4sk RZa6LThX8HPPVL26OuM9IuhU3qcdkFK8MNLTt6LspDdQwXzO++fSM8BMHmX+yqMs8iJbjG wnDsqCKfhCMMAw3WiWGJ+A9STD6OzWz6VrY1Aji6MMC5/EeOIdN3IJPs8gXt3RKAir7VWt 94sQbptaJzIQ1ov9k07wRi2Q6uuIVkg+EhOEiN1/9o9b+IOrQD9lw1Q6zYxIDQ== 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=1697819172; 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=SabvpYy9TYCB+dCB0nEhDLgw5NRX/Nw2pF4XaA9OFzI=; b=LlVCFO/ucsW5rOxh5MqjqTu4jZItCR1L4pTadiJJe0hN/JzVnwBHKMfo1FIlGB8Td8lf12 M1zOWnpJtfEPtQMhBx1Soguc2SilQFJ/AIDRBaD/+xRM6UKuxL5kQ1Qi49Kfch5BjQ4lZZ 962FM1NPztQMKp92R6Fi4Y1Q8RR38v2D4QpAzD5QqYtG3/E4jS1OYcOFXmtnbeENS0eOwX lFLfQqCNV+1wSLfLA73AuznUhxyAHungqcNppplMjC3iyhzd9mhB3xKvUduO2nSONjvSq8 9xZbvMYF+BeJnHgRIeprBhtpXwCRUsYsWmIKsjxFYhCZDP7u/yo0w08/lp2rKQ== 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 4SBqhh1CygzgVc; Fri, 20 Oct 2023 16:26:12 +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 39KGQCxs073103; Fri, 20 Oct 2023 16:26:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KGQCVL073100; Fri, 20 Oct 2023 16:26:12 GMT (envelope-from git) Date: Fri, 20 Oct 2023 16:26:12 GMT Message-Id: <202310201626.39KGQCVL073100@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: 36a866dfc827 - main - x11-toolkits/libwnck3: fix warnings, and 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: 36a866dfc827e21e5230a9c2aeb4e8275198a028 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=36a866dfc827e21e5230a9c2aeb4e8275198a028 commit 36a866dfc827e21e5230a9c2aeb4e8275198a028 Author: Dimitry Andric AuthorDate: 2023-10-07 13:57:20 +0000 Commit: Dimitry Andric CommitDate: 2023-10-20 16:25:47 +0000 x11-toolkits/libwnck3: fix warnings, and build with lld 17 Building x11-toolkits/libwnck3 with lld 17 results in the following link errors: cc -o libwnck/libwnck-3.so.0.3.0 libwnck/libwnck-3.so.0.3.0.p/meson-generated_.._wnck-enum-types.c.o libwnck/libwnck-3.so.0.3.0.p/meson-generated_.._libwnck-resources.c.o libwnck/libwnck-3.so.0.3.0.p/application.c.o libwnck/libwnck-3.so.0.3.0.p/class-group.c.o libwnck/libwnck-3.so.0.3.0.p/pager.c.o libwnck/libwnck-3.so.0.3.0.p/screen.c.o libwnck/libwnck-3.so.0.3.0.p/selector.c.o libwnck/libwnck-3.so.0.3.0.p/tasklist.c.o libwnck/libwnck-3.so.0.3.0.p/util.c.o libwnck/libwnck-3.so.0.3.0.p/window-action-menu.c.o libwnck/libwnck-3.so.0.3.0.p/window.c.o libwnck/libwnck-3.so.0.3.0.p/wnck-image-menu-item.c.o libwnck/libwnck-3.so.0.3.0.p/workspace.c.o libwnck/libwnck-3.so.0.3.0.p/xutils.c.o libwnck/libwnck-3.so.0.3.0.p/pager-accessible.c.o libwnck/libwnck-3.so.0.3.0.p/pager-accessible-factory.c.o libwnck/libwnck-3.so.0.3.0.p/workspace-accessible.c.o libwnck/libwnck-3.so.0.3.0.p/workspace-accessible-factory.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -shared -fPIC -Wl,--start-group - Wl,-soname,libwnck-3.so.0 -fstack-protector-strong -O2 -pipe -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing -isystem /usr/local/include -Wl,-rpath,/usr/local/lib -Wl,-rpath-link,/usr/local/lib -Wl,--version-script,/wrkdirs/share/dim/ports/x11-toolkits/libwnck3/work/libwnck-3.36.0/libwnck/libwnck-3.map -lm /usr/local/lib/libcairo.so /usr/local/lib/libXext.so /usr/local/lib/libXrender.so /usr/local/lib/libX11.so /usr/local/lib/libglib-2.0.so /usr/local/lib/libintl.so /usr/local/lib/libgobject-2.0.so /usr/local/lib/libgtk-3.so /usr/local/lib/libgdk-3.so /usr/local/lib/libharfbuzz.so /usr/local/lib/libpangocairo-1.0.so /usr/local/lib/libpango-1.0.so /usr/local/lib/libatk-1.0.so /usr/local/lib/libcairo-gobject.so /usr/local/lib/libgdk_pixbuf-2.0.so /usr/local/lib/libgio-2.0.so /usr/local/lib/libstartup-notification-1.so /usr/local/lib/libXRes.so -Wl,--end-group ld: error: version script assignment of 'global' to symbol '__progname' failed: symbol not defined ld: error: version script assignment of 'global' to symbol 'environ' failed: symbol not defined cc: error: linker command failed with exit code 1 (use -v to see invocation) Commit bf6718d6938e added patch-libwnck_libwnck-3.map a long time ago, but it is unclear why. Remove the patch so the undefined symbols are no longer referenced in the linker script. While here, fix two warnings about incorrectly defined header guards: In file included from ../libwnck/pager-accessible-factory.c:20: ../libwnck/pager-accessible-factory.h:19:9: warning: '__WNCK_PAGER_ACCESSIBLE_FACTORY_H__' is used as a header guard here, followed by #define of a different macro [-Wheader-guard] 19 | #ifndef __WNCK_PAGER_ACCESSIBLE_FACTORY_H__ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../libwnck/pager-accessible-factory.h:20:9: note: '__WBCK_PAGER_ACCESSIBLE_FACTORY_H__' is defined here; did you mean '__WNCK_PAGER_ACCESSIBLE_FACTORY_H__'? 20 | #define __WBCK_PAGER_ACCESSIBLE_FACTORY_H__ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | __WNCK_PAGER_ACCESSIBLE_FACTORY_H__ ../libwnck/workspace-accessible-factory.h:19:9: warning: '__WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__' is used as a header guard here, followed by #define of a different macro [-Wheader-guard] 19 | #ifndef __WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../libwnck/workspace-accessible-factory.h:20:9: note: '__WBCK_WORKSPACE_ACCESSIBLE_FACTORY_H__' is defined here; did you mean '__WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__'? 20 | #define __WBCK_WORKSPACE_ACCESSIBLE_FACTORY_H__ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | __WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__ PR: 274329 Approved by: maintainer timeout (2 weeks) MFH: 2023Q4 --- x11-toolkits/libwnck3/files/patch-libwnck_libwnck-3.map | 11 ----------- .../libwnck3/files/patch-libwnck_pager-accessible-factory.h | 11 +++++++++++ .../files/patch-libwnck_workspace-accessible-factory.h | 11 +++++++++++ 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/x11-toolkits/libwnck3/files/patch-libwnck_libwnck-3.map b/x11-toolkits/libwnck3/files/patch-libwnck_libwnck-3.map deleted file mode 100644 index f7dd49f6d908..000000000000 --- a/x11-toolkits/libwnck3/files/patch-libwnck_libwnck-3.map +++ /dev/null @@ -1,11 +0,0 @@ ---- libwnck/libwnck-3.map.orig 2020-03-25 21:18:55 UTC -+++ libwnck/libwnck-3.map -@@ -1,6 +1,8 @@ - { - global: - wnck_*; -+ __progname; -+ environ; - local: - *; - }; diff --git a/x11-toolkits/libwnck3/files/patch-libwnck_pager-accessible-factory.h b/x11-toolkits/libwnck3/files/patch-libwnck_pager-accessible-factory.h new file mode 100644 index 000000000000..cf5e7a27886a --- /dev/null +++ b/x11-toolkits/libwnck3/files/patch-libwnck_pager-accessible-factory.h @@ -0,0 +1,11 @@ +--- libwnck/pager-accessible-factory.h.orig 2020-03-25 21:18:55 UTC ++++ libwnck/pager-accessible-factory.h +@@ -17,7 +17,7 @@ + */ + + #ifndef __WNCK_PAGER_ACCESSIBLE_FACTORY_H__ +-#define __WBCK_PAGER_ACCESSIBLE_FACTORY_H__ ++#define __WNCK_PAGER_ACCESSIBLE_FACTORY_H__ + + #include + diff --git a/x11-toolkits/libwnck3/files/patch-libwnck_workspace-accessible-factory.h b/x11-toolkits/libwnck3/files/patch-libwnck_workspace-accessible-factory.h new file mode 100644 index 000000000000..151629a2f206 --- /dev/null +++ b/x11-toolkits/libwnck3/files/patch-libwnck_workspace-accessible-factory.h @@ -0,0 +1,11 @@ +--- libwnck/workspace-accessible-factory.h.orig 2020-03-25 21:18:55 UTC ++++ libwnck/workspace-accessible-factory.h +@@ -17,7 +17,7 @@ + */ + + #ifndef __WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__ +-#define __WBCK_WORKSPACE_ACCESSIBLE_FACTORY_H__ ++#define __WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__ + + #include +