Date: Sun, 16 Jul 2023 13:43:11 GMT From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 36ca9e336b92 - main - net-im/libquotient: Fix logic in patch-lib_qt__connection__util.h Message-ID: <202307161343.36GDhB5e098008@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rakuco: URL: https://cgit.FreeBSD.org/ports/commit/?id=36ca9e336b9290d195cabb32a09bb6f5a41c767c commit 36ca9e336b9290d195cabb32a09bb6f5a41c767c Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> AuthorDate: 2023-07-16 13:17:35 +0000 Commit: Raphael Kubo da Costa <rakuco@FreeBSD.org> 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307161343.36GDhB5e098008>