Index | Thread | Search

From:
Matthieu Herrb <matthieu@openbsd.org>
Subject:
[llvm22]: update x11/uwm to 0.2.11b and fix
To:
ports@openbsd.org
Date:
Sat, 23 May 2026 16:59:47 +0200

Download raw body.

Thread
trivial update and fix for llvm22.

ok ?

Index: Makefile
===================================================================
RCS file: /local/cvs/ports/x11/uwm/Makefile,v
diff -u -p -u -r1.10 Makefile
--- Makefile	21 Jul 2025 15:55:57 -0000	1.10
+++ Makefile	23 May 2026 14:54:12 -0000
@@ -1,14 +1,13 @@
 COMMENT =	lightweight WM with an original look and feel
-DISTNAME =	uwm-0.2.11a
+DISTNAME =	uwm-0.2.11b
 CATEGORIES =	x11
-REVISION =	1
 
 HOMEPAGE =	https://udeproject.sourceforge.net/
 
 # GPLv2+
 PERMIT_PACKAGE =		Yes
 
-WANTLIB =  ICE SM X11 Xext Xmu Xpm c iconv intl jpeg pthread
+WANTLIB =  ICE SM X11 Xext Xmu Xpm c iconv intl jpeg
 
 SITES =		${SITE_SOURCEFORGE:=udeproject/}
 
Index: distinfo
===================================================================
RCS file: /local/cvs/ports/x11/uwm/distinfo,v
diff -u -p -u -r1.2 distinfo
--- distinfo	22 Feb 2021 22:07:54 -0000	1.2
+++ distinfo	23 May 2026 14:54:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (uwm-0.2.11a.tar.gz) = 3QVoV8mLdckgOGGRfbM7yvh7oHS90gTPcyzky3d8tAg=
-SIZE (uwm-0.2.11a.tar.gz) = 633259
+SHA256 (uwm-0.2.11b.tar.gz) = Zh8p8sFxjlwbBGsr0W4zW85yO31n8iCbki4OxH7NmO4=
+SIZE (uwm-0.2.11b.tar.gz) = 705000
Index: patches/patch-uwm_init_c
===================================================================
RCS file: patches/patch-uwm_init_c
diff -N patches/patch-uwm_init_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-uwm_init_c	23 May 2026 14:54:12 -0000
@@ -0,0 +1,20 @@
+Fix build with llvm22 - actual bug.
+
+Index: uwm/init.c
+--- uwm/init.c.orig
++++ uwm/init.c
+@@ -984,11 +984,11 @@ void ReadConfigFile(FILE *uwmrc)
+                                   ActiveWorkSpace][UDE_Shadow].pixel);
+                         AllocColors(r,g,b,\
+                                     &TheScreen.Colors[TheScreen.desktop.\
+-                                    ActiveWorkSpace][UDE_Back],\
++                                    ActiveWorkSpace][UDE_Back].pixel,\
+                                     &TheScreen.Colors[TheScreen.desktop.\
+-                                    ActiveWorkSpace][UDE_Light],\
++                                    ActiveWorkSpace][UDE_Light].pixel,\
+                                     &TheScreen.Colors[TheScreen.desktop.\
+-                                    ActiveWorkSpace][UDE_Shadow]);
++                                    ActiveWorkSpace][UDE_Shadow].pixel);
+                         break;
+                       case FontColor:
+                         if(ParseColor(p,&r,&g,&b)) {
Index: patches/patch-uwm_workspaces_h
===================================================================
RCS file: /local/cvs/ports/x11/uwm/patches/patch-uwm_workspaces_h,v
diff -u -p -u -r1.2 patch-uwm_workspaces_h
--- patches/patch-uwm_workspaces_h	11 Mar 2022 20:17:30 -0000	1.2
+++ patches/patch-uwm_workspaces_h	23 May 2026 14:54:12 -0000
@@ -7,12 +7,12 @@ Index: uwm/workspaces.h
  
  // 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
-+//NodeList Workspaces;
-+//NodeList Layers;
-+//NodeList WS_Layer_Defaults; // This will be the list which handles setting up
+-extern NodeList Workspaces;
+-extern NodeList Layers;
+-extern NodeList WS_Layer_Defaults; // This will be the list which handles setting up
++//extern NodeList Workspaces;
++//extern NodeList Layers;
++//extern NodeList WS_Layer_Defaults; // This will be the list which handles setting up
  							// defaults for where windows will be mapped to.
  // End three listings
  

-- 
Matthieu Herrb