From nobody Tue Dec 06 13:07:51 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NRLLb4z3Dz4jdYl; Tue, 6 Dec 2022 13:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NRLLb4LD5z3kvm; Tue, 6 Dec 2022 13:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670332071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5iQA/AGJazDQj7Clgqt4EHHNMnoDjzVmRANjn4PuUhw=; b=bEeeB5HyUGKB852DakkOwHTodsWNYyYimVgkIm72cYjGbRXjio6BlpR/9QJee41Z9tDvII +DKPyFBdk6kcIvVLJ/b3BwihQfG1fmNX6qpnvOFLw5cTze/++VEtda+y1pSi2rW3bPuCTy fsrmERe6xPyODts8xGS+YqIXSMXIiwFscSAaDb+2ITgreZVyNzRwLPUjvhn9Llq7i24EL2 +voWrxHfcQCsUjwZvTKkkkFmK6Smka0mipIaDjceH6l51FkMPtE5IYMfyqmCnoGjtWZIOX x2MeO6gPS9/PNkQwIEOAE2llZsQ6r6mn5NTKr+sjPM06VYgK4FJydT4Hi20ZWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670332071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5iQA/AGJazDQj7Clgqt4EHHNMnoDjzVmRANjn4PuUhw=; b=vX1EdtUnPGK14GSP1UfJrECN+kQAUlBt0mFIj14LvEtyJK5AzxS1j48yXpAjydrXRNF7CN 0HTGRH+6xFl09uuy7q1UvhnHOz5z8x/e8u/nJhd4ulSLrDO6BQAAp6sEo16kIDt5RZaNbR c8tvhGY78PhxGYXMlK1FsVjjcA0SpKp3Htvg9xYSJNv6zc5I87XVG/pe9YwZZakIlr1QCi dTzsqxg7Wg+Jl451ovECMWGUFE/cF19jLB++krVgKli0uLHCweJl3bstFEIoJYG6qk/9W4 n/W6zVgH9y4hjgkouNZ5wtc8UaVcWkcc3Q7g7FbTDKdGCeh1K3CyCptX2qKfMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670332071; a=rsa-sha256; cv=none; b=uRX3XDDOnXbdSdeS9gxS/Lr6l+1LzC5NWgrGB+5Gk6xMc0dUVZp2JArzByOmHgHMEUnkR/ MIyJGjrId7Avvp9RCx3KJQY66CbjYmCmFBqy6iQAtDDbcqhErzOBKggxEGm4fS3GaxWVfY z6p7kssECSy9f4nHCpISlpfOmeHFsaIbgRaDA2TjyCh2CoaeN+xpa5WLVgUMmD/7/UG5ad ZfMTNDWhHQMydS3VtqSHrPVkugVxqW+u22LJ+d1f7cZ39kbF5x24BV76tV7s8Qdb5H+zND A0CWrZmNR4NGygxAWOtEjj8DLI7HooeESlGea4s/mb6Pf12Fhonm3+h1WDuWLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NRLLb350bzf15; Tue, 6 Dec 2022 13:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B6D7p3H091906; Tue, 6 Dec 2022 13:07:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B6D7pTi091904; Tue, 6 Dec 2022 13:07:51 GMT (envelope-from git) Date: Tue, 6 Dec 2022 13:07:51 GMT Message-Id: <202212061307.2B6D7pTi091904@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: b0e97296ca3a - main - x11/libICE: Fix C++ interoperability error due to static_assert define (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0e97296ca3a3f4f2ee41f1fd5ff4e38039d5a73 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b0e97296ca3a3f4f2ee41f1fd5ff4e38039d5a73 commit b0e97296ca3a3f4f2ee41f1fd5ff4e38039d5a73 Author: Dima Panov AuthorDate: 2022-12-06 13:01:41 +0000 Commit: Dima Panov CommitDate: 2022-12-06 13:01:41 +0000 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: https://gitlab.freedesktop.org/xorg/lib/libice/-/commit/e176b676cff17948d68299c00dddefe41638c752 Pointy hat to: manu (for skipped exp-run) Approved by: portmgr blanket --- x11/libICE/Makefile | 4 +-- .../files/patch-libICE-1.1.0-static-assert-fix | 32 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile index 33eb8e040f62..f9eb9aecd771 100644 --- a/x11/libICE/Makefile +++ b/x11/libICE/Makefile @@ -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 diff --git a/x11/libICE/files/patch-libICE-1.1.0-static-assert-fix b/x11/libICE/files/patch-libICE-1.1.0-static-assert-fix new file mode 100644 index 000000000000..c08ae6107666 --- /dev/null +++ b/x11/libICE/files/patch-libICE-1.1.0-static-assert-fix @@ -0,0 +1,32 @@ +From e176b676cff17948d68299c00dddefe41638c752 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= +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 + + #include +-#ifndef static_assert ++#if !defined(__cplusplus) && !defined(static_assert) + #define static_assert(cond, msg) /* skip for non-C11 compilers */ + #endif + +-- +GitLab +