Skip to content

Commit

Permalink
x11-toolkits/libwnck3: fix warnings, and build with lld 17
Browse files Browse the repository at this point in the history
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 bf6718d 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
  • Loading branch information
DimitryAndric committed Oct 20, 2023
1 parent a4ef2ba commit 36a866d
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 11 deletions.
11 changes: 0 additions & 11 deletions x11-toolkits/libwnck3/files/patch-libwnck_libwnck-3.map

This file was deleted.

@@ -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 <atk/atk.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 <atk/atk.h>

0 comments on commit 36a866d

Please sign in to comment.