From c2433edb6e731d20adfa88e2d1080c5f41c8a709 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sat, 30 May 2026 13:47:26 +0000
Subject: [PATCH] Update to a recent checkout to help build with llvm 22. This
 is still not enough so temporarily use an axe until upstream fixes the
 remaining failures.

---
 x11/cde/Makefile | 9 +++++++--
 x11/cde/distinfo | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/x11/cde/Makefile b/x11/cde/Makefile
index 54b089adea0..730a1bf7a87 100644
--- a/x11/cde/Makefile
+++ b/x11/cde/Makefile
@@ -1,6 +1,7 @@
 COMMENT=		Common Desktop Environment
 
-DISTNAME=		cde-2.5.3
+# 2026-05-17
+DISTNAME=		cde-2.5.4pre0
 
 CATEGORIES=		x11
 
@@ -23,7 +24,8 @@ SHARED_LIBS +=  DtMmdb               0.0      # .2.1
 # LGPLv2.1
 PERMIT_PACKAGE=		Yes
 
-SITES=			${SITE_SOURCEFORGE:=cdesktopenv/}
+#SITES=			${SITE_SOURCEFORGE:=cdesktopenv/}
+SITES=			https://distfiles.bsdfrog.org/
 
 WANTLIB += ${COMPILER_LIBCXX} ICE Mrm SM Uil X11 Xau Xdmcp Xext
 WANTLIB += Xft Xinerama Xm Xmu Xpm Xrender Xss Xt c expat fontconfig
@@ -60,6 +62,9 @@ AUTOMAKE_VERSION=	1.18
 
 CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib"
 
+# Fix build with llvm 22
+CFLAGS +=		-Wno-error=incompatible-pointer-types
+
 # Our ksh(1) might be enough but considering the KSH found at configure time is
 # propagated to most installed scripts, let's not take any chances.
 BUILD_DEPENDS +=	shells/ksh93
diff --git a/x11/cde/distinfo b/x11/cde/distinfo
index d600d409592..226b3d9d042 100644
--- a/x11/cde/distinfo
+++ b/x11/cde/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cde-2.5.3.tar.gz) = K1jAjr8Ka7nUoyGRzSXiBPXYy6gbzKo2/HL1xKqXmFQ=
-SIZE (cde-2.5.3.tar.gz) = 57506322
+SHA256 (cde-2.5.4pre0.tar.gz) = 75dWIaOy4gJCXTPNdm5oNQAVoPqkV/QKydEcs6CrbeQ=
+SIZE (cde-2.5.4pre0.tar.gz) = 58211595