I confirmed that uwm still launches and managed to exercise the Exit item in the menu.
Happy to either apply the patch or remove the port as it looks pretty dead upstream. OK to either option? Subject: [PATCH] Fix x11/uwm to compile with -fno-common --- x11/uwm/Makefile | 2 +- x11/uwm/patches/patch-uwm_workspaces_h | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 x11/uwm/patches/patch-uwm_workspaces_h diff --git a/x11/uwm/Makefile b/x11/uwm/Makefile index 0ea71eb2935..ab230d1ac96 100644 --- a/x11/uwm/Makefile +++ b/x11/uwm/Makefile @@ -3,7 +3,7 @@ COMMENT = lightweight WM with an original look and feel DISTNAME = uwm-0.2.11 CATEGORIES = x11 -REVISION = 2 +REVISION = 3 HOMEPAGE = http://udeproject.sourceforge.net/ diff --git a/x11/uwm/patches/patch-uwm_workspaces_h b/x11/uwm/patches/patch-uwm_workspaces_h new file mode 100644 index 00000000000..e2241a4ba25 --- /dev/null +++ b/x11/uwm/patches/patch-uwm_workspaces_h @@ -0,0 +1,24 @@ +Avoids duplicate symbol complaints surfaced by -fno-common. + +The defined values are never used in the code. + +$OpenBSD$ + +Index: uwm/workspaces.h +--- uwm/workspaces.h.orig ++++ uwm/workspaces.h +@@ -92,14 +92,6 @@ typedef struct { + long int flags; + } UDE_LWS_Layer; + +-// These three lists will be declared in workspaces.c, and declared static +-// so that no other module has direct access to them +-NodeList Workspaces; +-NodeList Layers; +-NodeList WS_Layer_Defaults; // This will be the list which handles setting up +- // defaults for where windows will be mapped to. +-// End three listings +- + void UDE_LWS_InitializeWSL(void); + void UDE_LWS_FinalizeWSL(void); + UDE_LWS_Workspace *UDE_LWS_AllocWorkspace(void); -- 2.30.1
