From nobody Sun May 21 09:13:39 2023 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 4QPFHl4Dwzz4CGyM; Sun, 21 May 2023 09:13:39 +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 4QPFHl3kQyz3y2T; Sun, 21 May 2023 09:13:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684660419; 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=cReJBEfS4BZjTwOj3wAonGwg+Q7eYN9mFrQNogOWsO4=; b=H4HCWPAA4C3FFnDUBRgyizqDjI84wdoc34MgKQzcQiE80omCWrOUtDTUddxVlFrJsLUQhz jYGdfI3cwjTkhD5+NVydadD+4OKPcFxNDp6x3qbVMU0zUMOYKJb5uS9WCY6Mld9XJnjrCI QSf3p43fW3cwzLMZFQaJ/38CwCaj80dvdoCStoLcjmUXGYSQ4VFM1G837da70qvsK/epIp ge+iHIFRPLeDghTXayN8H0whe89rBDdXgMxRTTM962aHC3WD93D6ZvCG0t0mqVX+gaKLge EfB5droD20T29iEv07U/6+FuS7EBGuCKgvHKGjwT5M1LfKPgy2P+XtgjIGlolQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684660419; 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=cReJBEfS4BZjTwOj3wAonGwg+Q7eYN9mFrQNogOWsO4=; b=e2ZoGeDIRKBAdqM7o8BJIB9ia915e1g6xJ9g1SqborRU4rYHdhzUIKIByr16RzUfsAnonK MTXvrolyzfP8J9weX0bYTCbDlZaduiQzuMO+/Uc+VrSvQtbj8daCc667zWtWJk3BIgXnRm mhlZMaOPa+Iam3KgTXliJNWvudLytaOmQkRkBiIDDRfYsYpJEfyhy/klo5mW0RbVG3pb4C exghqkt8Yu2KZ8ZYRWTICsildkw3KBB6WoWeiAKLNzGI1dQQ60FWfyN323OR/ctraVJ3Af JHqKs5T3D4NF6khkuke69x/uDbqUFoHMvmjLm2QFcQdVmpgR6mIsvS0/wFC/3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684660419; a=rsa-sha256; cv=none; b=FwxBqaRW3kFLBd3UW/9Uos9vmcewaRIQAnGHnYfdxKPhegcizR1ECFeGSHIqNEEyWetldA cTzXbu8mVjkIhQlZw2sjhdbaXGziBBn9HHEW6jn+knfYZ1a2h0o8pV4L4dJRXXmqKPbBAE gTzAYpG3bTANtHJGu0nsrjP6Xb8+kxG6FugQeR4MGyBUaunJCrMoocJAuSHZ5/8X8QlvbQ EtX2kWyUbPYf8wxuRuyHDhFPaIlcy6fvM9HlOridijWEYyL+LRuY/iTx74fqMmif0T9NOG j/k8MGhq8BgiOIbivm0FyNevX0iFKM3MV33LFOqCbLjbdVfRauIWDh6+70Kxew== 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 4QPFHl2p09zlq5; Sun, 21 May 2023 09:13:39 +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 34L9DdZ3057914; Sun, 21 May 2023 09:13:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34L9DdkN057913; Sun, 21 May 2023 09:13:39 GMT (envelope-from git) Date: Sun, 21 May 2023 09:13:39 GMT Message-Id: <202305210913.34L9DdkN057913@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: e5a021541793 - main - x11/xorgproto: ensure Xos.h does not define index() as a macro 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5a0215417930a60ac8fbbc630fad6aa354446e5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=e5a0215417930a60ac8fbbc630fad6aa354446e5 commit e5a0215417930a60ac8fbbc630fad6aa354446e5 Author: Dimitry Andric AuthorDate: 2023-05-20 15:15:41 +0000 Commit: Dimitry Andric CommitDate: 2023-05-21 09:12:30 +0000 x11/xorgproto: ensure Xos.h does not define index() as a macro During the exp-run for clang 16, it turned out that Xos.h defines index() and rindex() as preprocessor macros, and this causes many problems with libc++ headers [1]: /usr/include/c++/v1/variant:532:39: error: too few arguments provided to function-like macro invocation return __at(__fmatrix, __vs.index()...)( ^ /usr/local/include/X11/Xos.h:67:12: note: macro 'index' defined here # define index(s,c) (strchr((s),(c))) ^ /usr/include/c++/v1/variant:813:18: error: too few arguments provided to function-like macro invocation return index() == variant_npos; ^ /usr/local/include/X11/Xos.h:67:12: note: macro 'index' defined here # define index(s,c) (strchr((s),(c))) ^ /usr/include/c++/v1/variant:817:25: error: expected ';' at end of declaration list constexpr size_t index() const noexcept { ^ /usr/include/c++/v1/variant:802:9: error: member initializer '__data' does not name a non-static data member or base class : __data(__tag), __index(__variant_npos<__index_t>) {} ^~~~~~~~~~~~~ /usr/include/c++/v1/variant:808:9: error: member initializer '__data' does not name a non-static data member or base class __data(in_place_index<_Ip>, _VSTD::forward<_Args>(__args)...), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/c++/v1/variant:920:23: error: too few arguments provided to function-like macro invocation __rhs.index(), ^ /usr/local/include/X11/Xos.h:67:12: note: macro 'index' defined here # define index(s,c) (strchr((s),(c))) ^ Add defined(__FreeBSD__) to Xos.h's #if block to include instead, so it will get our regular index() and rindex() declarations instead. This has also been sent upstream [2]. [1] [2] PR: 271533 Approved by: manu (maintainer) MFH: 2023Q2 --- x11/xorgproto/Makefile | 1 + x11/xorgproto/files/patch-include_X11_Xos.h | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile index f11ff7ab68a1..715d3fd010a0 100644 --- a/x11/xorgproto/Makefile +++ b/x11/xorgproto/Makefile @@ -1,5 +1,6 @@ PORTNAME= xorgproto DISTVERSION= 2022.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xorgproto/files/patch-include_X11_Xos.h b/x11/xorgproto/files/patch-include_X11_Xos.h new file mode 100644 index 000000000000..9c60de1c0b51 --- /dev/null +++ b/x11/xorgproto/files/patch-include_X11_Xos.h @@ -0,0 +1,11 @@ +--- include/X11/Xos.h.orig 2022-04-21 00:48:08 UTC ++++ include/X11/Xos.h +@@ -60,7 +60,7 @@ in this Software without prior written authorization f + */ + + # include +-# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__) ++# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__) || defined(__FreeBSD__) + # include + # else + # ifndef index