From nobody Thu Oct 31 19:42:23 2024 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 4XfZC353Zpz5cGk5; Thu, 31 Oct 2024 19:42:23 +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 4XfZC34N15z4MPb; Thu, 31 Oct 2024 19:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730403743; 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=yvdeBXTErcrD/J8cJAJHsPiXBdx4exkGp06jpF3BV14=; b=gO2Hd7BGx1lZJEd814hu+3f5zJvN9D6yMXvJOLFKPTCIOHgcXFUI0Z38+vumAR2BwcJoPb 3NejnShhHZlh24rEs2KxoLOR9b2YvkGF66tnhl669Z1blpatoMyDOcIrdCpETbElqiHMcZ NWb2hUq/eAy8nsjB3o2XraMO+IkOICSBUoI2HgbHLcf9A6lfNOP5dHcLZ1nKzcjAqR1/aO t7g/pMvjGvfurDltPsuo8/gjWS4DN/tiPBtwhwy3+kGXMLNlFRD+ayq3IWBQ6RWSu1SJqj liBnjITvAuj3UgMXtkIuVydh7AWg2hUt401vvVlvDzPNvHlCl/YWBhSWOafJ7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730403743; 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=yvdeBXTErcrD/J8cJAJHsPiXBdx4exkGp06jpF3BV14=; b=Vn8h7Y2mURB1bzoHevyTiiEElLNM8SIxsG8+/spByEwGFBLhsk14ZzYGz4oZapMMFP53x5 tKWEBiIESA3lLoTzzhBZToJDGgyOgnmHpwrrvIcl/Vq8ftL+l8DWEATEzZhXWsaVsQfLzJ PWngOs8xCwqsmnI917xqDXKDEOU9AzAHZk0cX8HioT1B8xOK/adwm95V/LjfGtD5NLByak vBkWODO6FoOeOVTssB3wMYmB9y4Aw53D428YPAKVR4kEi9UzibAtSDKEpYyyX6jZBK27Hb BA1ogfs3/F7H1RtTc3O+KOQlKGkQk6MR8dVToENQlBTpMg8CebfUANECMgXQQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730403743; a=rsa-sha256; cv=none; b=gtOn42ai6eZhnMJgW09sx4Dj/ICk1bXJ4hlrUKp1KnlciZBcBFTFlHmzmhve5QmxzqmJwT 2pOzi0UWDLsOcEHQF7GsNT/2o8v/1J0oEXynqS7o/fPr0I4hoz5NYCiaV7Tx1ZrW4QfKkg tW6BnYMn8+H9vvhLlW+tJNOZ7J3ZJoZc8uJuEJlFQh7tZ/R3tAnxHcnEWPjOjA8QRTdq3Q pxUXMIR3r44k/MNFGUyAJqLsgiz05Fnusvta79+EdXrpdsOZYYCQAf++I+FC07VMwVTLR/ gQASkK8Me85GW/DjkM9rhXvlulMGoK0PQhvzulk/uogmWmZfGunD0qJ/davdaA== 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 4XfZC33rGTzpvv; Thu, 31 Oct 2024 19:42:23 +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 49VJgN1d087239; Thu, 31 Oct 2024 19:42:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VJgNOl087236; Thu, 31 Oct 2024 19:42:23 GMT (envelope-from git) Date: Thu, 31 Oct 2024 19:42:23 GMT Message-Id: <202410311942.49VJgNOl087236@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 3dbc3bf8d626 - main - devel/qtcreator: repair build on 15-CURRENT 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3dbc3bf8d626d4c3cc82656300db05d3fa58f026 Auto-Submitted: auto-generated The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=3dbc3bf8d626d4c3cc82656300db05d3fa58f026 commit 3dbc3bf8d626d4c3cc82656300db05d3fa58f026 Author: Adriaan de Groot AuthorDate: 2024-10-30 23:01:31 +0000 Commit: Adriaan de Groot CommitDate: 2024-10-31 19:42:21 +0000 devel/qtcreator: repair build on 15-CURRENT The (unused) move-constructor of BaseSqliteResultRange is ill-formed because it mentions a field that does not exist. --- devel/qtcreator/Makefile | 1 + .../files/patch-src_libs_3rdparty_sqlite_sqlite3.c | 4 ++-- .../files/patch-src_libs_sqlite_sqlitebasestatement.h | 13 +++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index 8ed2e99f282f..b83c70652f04 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -1,5 +1,6 @@ PORTNAME= qtcreator DISTVERSION= 14.0.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION} DISTNAME= qt-creator-opensource-src-${DISTVERSION} diff --git a/devel/qtcreator/files/patch-src_libs_3rdparty_sqlite_sqlite3.c b/devel/qtcreator/files/patch-src_libs_3rdparty_sqlite_sqlite3.c index 3fab555d2021..c0cff4036e88 100644 --- a/devel/qtcreator/files/patch-src_libs_3rdparty_sqlite_sqlite3.c +++ b/devel/qtcreator/files/patch-src_libs_3rdparty_sqlite_sqlite3.c @@ -1,6 +1,6 @@ ---- src/libs/3rdparty/sqlite/sqlite3.c.orig 2024-05-31 12:46:31 UTC +--- src/libs/3rdparty/sqlite/sqlite3.c.orig 2024-09-27 01:17:49 UTC +++ src/libs/3rdparty/sqlite/sqlite3.c -@@ -13857,7 +13857,7 @@ struct fts5_api { +@@ -14185,7 +14185,7 @@ struct fts5_api { ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit ** it. */ diff --git a/devel/qtcreator/files/patch-src_libs_sqlite_sqlitebasestatement.h b/devel/qtcreator/files/patch-src_libs_sqlite_sqlitebasestatement.h new file mode 100644 index 000000000000..7803d35ac358 --- /dev/null +++ b/devel/qtcreator/files/patch-src_libs_sqlite_sqlitebasestatement.h @@ -0,0 +1,13 @@ +--- src/libs/sqlite/sqlitebasestatement.h.orig 2024-10-30 22:45:51 UTC ++++ src/libs/sqlite/sqlitebasestatement.h +@@ -412,9 +412,7 @@ class StatementImplementation : public BaseStatement ( + BaseSqliteResultRange(BaseSqliteResultRange &) = delete; + BaseSqliteResultRange &operator=(BaseSqliteResultRange &) = delete; + +- BaseSqliteResultRange(BaseSqliteResultRange &&other) +- : m_statement{std::move(other.resetter)} +- {} ++ BaseSqliteResultRange(BaseSqliteResultRange &&other) = delete; + BaseSqliteResultRange &operator=(BaseSqliteResultRange &&) = delete; + + iterator begin() & { return iterator{m_statement}; }