From nobody Sat Mar 19 16:27:20 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 ED3B81A115FD; Sat, 19 Mar 2022 16:27:20 +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 4KLR9h6KxGz3sFH; Sat, 19 Mar 2022 16:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647707240; 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=VkNKLRbayZB03R0c0gVqDVQ5pVr+TMfCnHnFgRpp+PA=; b=RCx9R2W8L9SByfbbhntT1SdNxtgX1tRx/35ibu4m3++8hvbeYiKduqplTd22n1B/TE/OTA /7wXyRydRXqbpHdHSp0pHa7GwbJ2kPYJIfY9CrFTcOTvCtC0K14eyefbPevRhNMd/Nw8MK Q8F24wn+R3TTtthzvIk+SCD7H4aqEydFzi6rFmfWQgdB6MivRIHddYhuB4DLeEdblaiLw6 hSrTVKjLft5nnbwXXkVs7IUwHHICP/0PVKBEp3jdTmipNvJq8fP3ScO9M/jpDIc0+mephY 9X/TlnbVCvIVcQvlHu+oe097A6olJj56r4Ny62ccgFtG9YWBaRORw8hatIRbcw== 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 B957B16255; Sat, 19 Mar 2022 16:27:20 +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 22JGRKE5083697; Sat, 19 Mar 2022 16:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22JGRK3a083696; Sat, 19 Mar 2022 16:27:20 GMT (envelope-from git) Date: Sat, 19 Mar 2022 16:27:20 GMT Message-Id: <202203191627.22JGRK3a083696@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: da0e29314591 - main - devel/qtcreator: fix build on i386 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da0e29314591ad9cb3efd180b434ea1246c2f396 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647707240; 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=VkNKLRbayZB03R0c0gVqDVQ5pVr+TMfCnHnFgRpp+PA=; b=eceFhyfewfjhECbUMp3BihpRhAyZOg2YNOhtMcLusZ6RVcbztu98D9aOtmAjNpRy3b0iHy o89uXF/7hm+aoCkJImqas+iiYudQ05fIHjy+DX3mnNGMdoKqvOUIFkAViVIBUNXhS2Gbrt NalKRwUKAF7ynTDNq8/66WMluZ/zG49lrT+Ba1q4V/+444jChADP1OQ/6+2d1TSXVFRgzD VZiotFo0yZFrSKOayM2lEfpFE/tnPyhmKFDImMCY1SXmMB7WPu95lgTFzgPOReiekHt1Tn ybJmtMPgszq9c87aQf2UBK7rMzmdMhX2fk9MvLZqJKiqMfmkbcnGcnxnXQhE1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647707240; a=rsa-sha256; cv=none; b=FDHKawGaz4Q3OH+e1Hwp69WeJ1cB14ujJ/1cQglJ9lvJC4zOWFrLS2zF4vS7Aw2no1fWyc 4KrdWl4dZVzxvf7X0IlhsH573C8+DWmMXD7wvtA83mT2hbulmm5rh1uHzQcq0F3iDWR0yF 2RoHYNcxNe/LJCPFAAi1pjYwglvAJIs2itjSAo5kk4KeEiXlxNJmHcQBA9Hw6AZDwCB1bH AWO3GTtPQ+hNObvNSSwoZyVXDgyqo4/uG8B6nY8LQpLa5Bbe2/V1D/ynsLd0exWIQQM2WF eERnxXcWdDDN1Ld6Fb5H7RUpu3v/cQx4/XrUpzEUtnobBrn4TkREdK/TcuoWxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=da0e29314591ad9cb3efd180b434ea1246c2f396 commit da0e29314591ad9cb3efd180b434ea1246c2f396 Author: Tobias C. Berner AuthorDate: 2022-03-19 15:19:17 +0000 Commit: Tobias C. Berner CommitDate: 2022-03-19 16:26:58 +0000 devel/qtcreator: fix build on i386 The issue was noted in the exp-run for KF5-5.92 but is unrelated to it. PR: 262522 Upstream PR: https://bugreports.qt.io/browse/QTCREATORBUG-26910 Submitted by: Christophe Giboudeaux --- devel/qtcreator/files/patch-git_b3e9f24 | 42 +++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/devel/qtcreator/files/patch-git_b3e9f24 b/devel/qtcreator/files/patch-git_b3e9f24 new file mode 100644 index 000000000000..db1821dbb271 --- /dev/null +++ b/devel/qtcreator/files/patch-git_b3e9f24 @@ -0,0 +1,42 @@ +From: Marco Bubke +Date: Mon, 24 Jan 2022 13:38:29 +0000 (+0100) +Subject: QmlDesigner: Fix 32 bit +X-Git-Tag: qds/v3.0.0~7 +X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt-creator%2Fqt-creator.git;a=commitdiff_plain;h=b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a;hp=e05ecea4f52174db2e9e2a4e7d5b9c59bae1fd6f + +QmlDesigner: Fix 32 bit + +Because std::ptrdiff_t and int are the same under 32 bit the constructor +is changed to a template. The class is private so it is very unlikely +that it leads to errors. + +Task-number: QTCREATORBUG-26910 +Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd +Reviewed-by: +Reviewed-by: Christophe Giboudeaux +Reviewed-by: Eike Ziller +Reviewed-by: Qt CI Bot +--- + +diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h +index 747c3d9a07d..27d2905e8e4 100644 +--- src/plugins/qmldesigner/designercore/projectstorage/storagecache.h ++++ src/plugins/qmldesigner/designercore/projectstorage/storagecache.h +@@ -67,15 +67,8 @@ class StorageCache + + StorageCacheIndex(const char *) = delete; + +- constexpr explicit StorageCacheIndex(int id) noexcept +- : id{id} +- {} +- +- constexpr explicit StorageCacheIndex(std::size_t id) noexcept +- : id{static_cast(id)} +- {} +- +- constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept ++ template ++ constexpr explicit StorageCacheIndex(IntegerType id) noexcept + : id{static_cast(id)} + {} +