From nobody Sun Jul 16 13:43:11 2023 X-Original-To: dev-commits-ports-all@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 4R3mcw1t9yz4nDlY; Sun, 16 Jul 2023 13:43:12 +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 4R3mcw0zW5z3xKc; Sun, 16 Jul 2023 13:43:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689514992; 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=Rhxy7M0lYvScYrsp+ovvEqxEKDN/v3eXmZpeTTJoMN4=; b=tGU2DtTgeVQxfoKO80KBYbctZvu6ZyZVZyt8NcxQBGJvdIdSsr3m7sMEE1JdMrb5koEDbQ yuuAv6UyMlMO1kz08t/Z/YUkiCL2+dy+zk5A267KM4CDtcFI8Z1akZwrBanIu3S7DlL6ta 6gE5RAuP8EJUE0xlgDntdfphRlzStBKMEp2uBIVejQUSqoaJQPsI3Jt5SoHWFkmmq6PZ6O eH0A/mcMFlrJY5LrpwRZU/tC9LwSCUdEG1Q0+wCGQugCo9HQvWPywXdWTo9S1vTrcXpGjd wDB+JkbupoW89dCL1okmZzUoGbodIsrmNG6uY7pqphorIumGDz9N7baG/PxbVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689514992; 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=Rhxy7M0lYvScYrsp+ovvEqxEKDN/v3eXmZpeTTJoMN4=; b=CnBpNAk/iYL7Y8UHlzfCUCj++uuxc8gm7L49u2CoZYQVOM4Q/HIQUCVo2Ssnk0T7KjUVUd YV0S+/xCf84dOpx0Yk7RsL8mAmbtFIItLYvOuOX1Nh9v69vE6uP770ah4trfdBgAK6/lI2 4qgLn+d+8ovByBW7PTODOn2AUu3JtWPiHfZG/Wmavk0iGbM/mcAAGCzUZNYIYqMV8a4QD3 LhwjiPuIeFFObvXIgX+oRHX1H4oIiPUJmLlQDuuIqLciys2xxKPeDXWegJVcgocd7WTUJt gvzq+jVn48kVlF52KYzJntmCW/t74vYWRD9Ji38LV9rz0wnF/9ehu5NNYaOjhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689514992; a=rsa-sha256; cv=none; b=m9yJasgkC92j5lyDVSOXAvXCixZ7Uw9/ReMNubYiiY2S8D0kpg1gW3sZo2aClGQaiYGu0Y EasXqbI2jKHrVJeZfAUg/qBZvgzd0HGLeqQ8CYGldIp89hNfv/ovjeoEGUbP5Aut1CiptJ GhE4jEAHXbQry9IIYJDN5/uVmPUkjQM6SPlJP0nVn2HD/1nzUHar8RQwczU3nt8M1QmUH7 RqRag2RxJlCdXbedNGOv5VANY+aXGmUUKVh+5oQ6tw+fuwOOEKzQhu2CwO3B8OQNf0GFH6 QAeJ6CeNk9dTI6yJZ/kHM02EnRXWxjRrOpT9pFdrNljHJqYer8LnOYmTYmAiwQ== 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 4R3mcw02DGzkhC; Sun, 16 Jul 2023 13:43:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36GDhBxH098009; Sun, 16 Jul 2023 13:43:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36GDhB5e098008; Sun, 16 Jul 2023 13:43:11 GMT (envelope-from git) Date: Sun, 16 Jul 2023 13:43:11 GMT Message-Id: <202307161343.36GDhB5e098008@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Raphael Kubo da Costa Subject: git: 36ca9e336b92 - main - net-im/libquotient: Fix logic in patch-lib_qt__connection__util.h List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rakuco X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36ca9e336b9290d195cabb32a09bb6f5a41c767c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rakuco: URL: https://cgit.FreeBSD.org/ports/commit/?id=36ca9e336b9290d195cabb32a09bb6f5a41c767c commit 36ca9e336b9290d195cabb32a09bb6f5a41c767c Author: Raphael Kubo da Costa AuthorDate: 2023-07-16 13:17:35 +0000 Commit: Raphael Kubo da Costa CommitDate: 2023-07-16 13:42:55 +0000 net-im/libquotient: Fix logic in patch-lib_qt__connection__util.h Follow-up to commit e7f65a58f219 ("net-im/libquotient: Fix the build on FreeBSD releases with LLVM < 14"). The `#ifdef` logic added there was slightly wrong, and we were basically disabling that code path even when it was supposed to work. Add a missing set of parentheses to fix the issue. This has been tested on 12.4-i386, 13.2-amd64 and 14-amd64. MFH: 2023Q3 --- net-im/libquotient/Makefile | 2 +- net-im/libquotient/files/patch-lib_qt__connection__util.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-im/libquotient/Makefile b/net-im/libquotient/Makefile index a7baa9492b5b..391de8c11914 100644 --- a/net-im/libquotient/Makefile +++ b/net-im/libquotient/Makefile @@ -1,6 +1,6 @@ PORTNAME= libquotient DISTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org diff --git a/net-im/libquotient/files/patch-lib_qt__connection__util.h b/net-im/libquotient/files/patch-lib_qt__connection__util.h index e180df41eedd..a1ee6b2cbc57 100644 --- a/net-im/libquotient/files/patch-lib_qt__connection__util.h +++ b/net-im/libquotient/files/patch-lib_qt__connection__util.h @@ -44,7 +44,7 @@ In file included from /usr/include/c++/v1/__functional/bind_front.h:14: auto&& boundSlot = -# if __cpp_lib_bind_front // Needs Apple Clang 13 (other platforms are fine) +# if __cpp_lib_bind_front && \ -+ !defined(__FreeBSD_version) || __FreeBSD_version >= 1301504 ++ (!defined(__FreeBSD_version) || __FreeBSD_version >= 1301504) + // This requires LLVM >= 14, this only works with libc++ commit + // https://reviews.llvm.org/D107199. std::bind_front(slot, context);