From nobody Tue Dec 17 06:09:03 2024 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 4YC5ww222dz5hBkF; Tue, 17 Dec 2024 06:09:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YC5wv65Rkz4sgk; Tue, 17 Dec 2024 06:09:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734415743; 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=xxPbsqgFpIRBQba3EFTgmF06x/pAIgr6pWbszH4AH5A=; b=c/Nvkrl5nFX88Vix5P33aCrwgDss22SvOtpMcRCFvCdSzpHIwCzz4XDI1jGBxgWFx5Qzz7 V+hCf/2MumytzqmUVjYY6fvO8AaRG6gx8pijhT6tev4h8U2IOQyjuiEPkFoN/bOU7nZeX7 WblXiWDur5HGtX3gw3QbAhV2eRp0z9el8yyVbIoUDQ7YPd1h77dkuyZ1ilZ48pjbDisWzT 0gKBzzW3rhyilFpJiQTWDBk6EPXiA4XWTAWkIE3hqcV5VsVCBAO1A6wUW0sGPy4m2dSUnK Py/+Tu53RKTwsea11iHBNLQI8ykVsQxVmP/Z26rKhQbq3SesykRcTb8O3dFXrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734415743; 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=xxPbsqgFpIRBQba3EFTgmF06x/pAIgr6pWbszH4AH5A=; b=DNlLUD2GdtX9w2fHcLqx+VfAX4PizGaLaU3ORT+IEHtDdwvcDaPweOA3uO8d74awRw5LMM v06qlrgxtu2gF0OV5F6mCXJ/JtaPmVRBmFimRLCv3Q7X+aT0soIJtf+fNVNBFYN0hDGEaR +UKOqt3zEXXVzoyyEigDqSIuJgTJJwcGWbH+D5FMP+YC8ehBJKAMg2SbzTMDSgmXGl1zic MalvcqBQR/3v2fW3eFIASrVedrU5SzfaiSdoOCaurCEmQk4z8/c5QGzM65fnVXtdgSY96e s7vSvQgBdqxVtZ4ovFltQ5Lu4buprbbnrmvPg0zzRdt973J2BX2uzS0mKx1Jrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734415743; a=rsa-sha256; cv=none; b=YR//Q2sNBWtfgbInLPNdOlEHG0wrMIVivNZ9/G+ZwBtsL97f6fa5fxfJLK7GMSuUbaIW/F TFmyesJFqd4xZFGcUlukxjnqNOUoVr6D0hhJyvEBg3JCQ12/iuTnGJm+zoph6aYGf65RDv a70QEjjH7Y8c7ZFgIAMmKjVfxzyLYZ9rERAfT31XBANpKkNFY8onMifdVsnmAsT7QCcj81 gVChm2XBL7xBoGZzFrM/RmKlR4VVTYRECbJIC28XNuHyixbGxCrhYsIPS2K7T8YHt4n3Fr kXY4LPEJpmAI25LZ0HZsEoTVtv5y88YjDYgawOez6MMnX4/IIjasHzZ2keE9ig== 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 4YC5wv5Sy4z1QHg; Tue, 17 Dec 2024 06:09:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BH693e6075660; Tue, 17 Dec 2024 06:09:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BH6939c075657; Tue, 17 Dec 2024 06:09:03 GMT (envelope-from git) Date: Tue, 17 Dec 2024 06:09:03 GMT Message-Id: <202412170609.4BH6939c075657@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 829ad207d6f0 - main - net-im/telegram-desktop: Fix build with Qt 6.8.x 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 829ad207d6f0c6981ab9d036d42c173f6c62c470 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=829ad207d6f0c6981ab9d036d42c173f6c62c470 commit 829ad207d6f0c6981ab9d036d42c173f6c62c470 Author: Jason E. Hale AuthorDate: 2024-12-17 05:40:22 +0000 Commit: Jason E. Hale CommitDate: 2024-12-17 05:54:06 +0000 net-im/telegram-desktop: Fix build with Qt 6.8.x Revert commit [1] in lib_base that breaks the build. [1] https://github.com/desktop-app/lib_base/commit/601c20431cc3f91de01e1b13a033e0a41cd36353111 PR: 283290 --- .../patch-Telegram_lib__base_base_qt_qt__compare.h | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_qt_qt__compare.h b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_qt_qt__compare.h new file mode 100644 index 000000000000..f0f35866069e --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_qt_qt__compare.h @@ -0,0 +1,24 @@ +Fix build with Qt 6.8.x. This reverts [1]. + +/wrkdirs/usr/ports/net-im/telegram-desktop/work-qt6/tdesktop-5.9.0-full/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp:45:10: +note: defaulted 'operator<=>' is implicitly deleted because there is no viable three-way comparison function for member 'name' + 45 | QString name; + +[1] https://github.com/desktop-app/lib_base/commit/601c20431cc3f91de01e1b13a033e0a41cd36353 + +--- Telegram/lib_base/base/qt/qt_compare.h.orig 2024-11-05 09:17:02 UTC ++++ Telegram/lib_base/base/qt/qt_compare.h +@@ -21,13 +21,11 @@ template + return a.get() <=> b.get(); + } + +-#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0) + [[nodiscard]] inline std::strong_ordering operator<=>( + const QString &a, + const QString &b) noexcept { + return a.compare(b) <=> 0; + } +-#endif // Qt < 6.8.0 + + template + [[nodiscard]] inline std::strong_ordering operator<=>(