x11/libICE: Fix C++ interoperability error due to static_assert define (+)

Backport critical fix from upstream.

Upstream commit 0269c687 added a static_assert helper
that gets defined to blank if left undefined by assert.h.
As this is not a macro in other languages that use this header,
this can lead to a compile-time error.

See also:	e176b676cf

Pointy hat to:	manu (for skipped exp-run)
Approved by:	portmgr blanket
This commit is contained in:
Dima Panov 2022-12-06 16:01:41 +03:00
parent 9acb9e113e
commit b0e97296ca
2 changed files with 34 additions and 2 deletions

View file

@ -1,5 +1,6 @@
PORTNAME= libICE
PORTVERSION= 1.1.0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
@ -10,8 +11,7 @@ WWW= https://www.freedesktop.org/wiki/Software/xlibs/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
EXTRACT_SUFX= .tar.xz
USES= cpe xorg xorg-cat:lib tar:xz
USES= cpe tar:xz xorg xorg-cat:lib
USE_XORG= xorgproto xtrans
INSTALL_TARGET= install-strip
CPE_VENDOR= freedesktop

View file

@ -0,0 +1,32 @@
From e176b676cff17948d68299c00dddefe41638c752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Sun, 4 Dec 2022 22:19:20 +0100
Subject: [PATCH] ICEmsg: Fix C++ interoperability error due to static_assert
define
Commit 0269c687e954db7aca2a4344e32cb203315a00b6 added a static_assert helper
that gets defined to blank if left undefined by assert.h. As this is not a
macro in other languages that use this header, this can lead to a compile-time
error.
Bug: https://bugs.gentoo.org/884369
---
include/X11/ICE/ICEmsg.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git include/X11/ICE/ICEmsg.h include/X11/ICE/ICEmsg.h
index b6bad13..13e1509 100644
--- include/X11/ICE/ICEmsg.h
+++ include/X11/ICE/ICEmsg.h
@@ -34,7 +34,7 @@ Author: Ralph Mor, X Consortium
#include <X11/ICE/ICEconn.h>
#include <assert.h>
-#ifndef static_assert
+#if !defined(__cplusplus) && !defined(static_assert)
#define static_assert(cond, msg) /* skip for non-C11 compilers */
#endif
--
GitLab