From nobody Sat Nov 02 16:18:09 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 4XgjZT6zfQz5cH8c; Sat, 02 Nov 2024 16:18:09 +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 4XgjZT6SBrz4P3j; Sat, 2 Nov 2024 16:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730564289; 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=9Shs5TF/t6gl6BXDqSsggVGb21JgBakHWshwDXCRfoA=; b=FCsMhvYRedF1JlfeywQkegGx0FYx8Crn9wiyUCG9rU1coJhFrhelzcmCznINn2HD4veS81 uJSihRquSEe+nSvqD7OZoRto3tjrEXWTbfB4m54VmpAFv1PRktJWl3Nw43ipS2KNc6hMD/ XYjnWkMmqPlw/lwDaAi8M+eDKnC3VUnYhc17mq/AkdiUmC+DN+QGdi0v7ERfvFtZBuzKdR lg+3lRfeD/Z1LbiwK3cdG4Qlem1PIGPhqsg/sF+1zNUpHK3H0GtoOdv5RrZFXnEuIwXaI3 Rt9JQg5JGFKUD7aAAi85dQ66sKVdH0sZBi4tCbuNONpTElpb66m/JwxYRZm/Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730564289; 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=9Shs5TF/t6gl6BXDqSsggVGb21JgBakHWshwDXCRfoA=; b=R2Q6C4MpwRQM2hrlsLgtfGNd82cmgtFz9qjOhvARoWVoZOw17Xbo7Nb4wlZH/C5IygZ13i N2erzvqsgTEeUVCjk7xQWO1xVwzZCKIJX2lTkuOcV0FxxVxWa9hKV0nwPkTmOi319pg118 IUa/8zo/+Q+pVLY+I44+81sWCUHcYDiJgXI+NoUT42i6ev9hEbr57/rodSDtQ5ZnOXtBeO 0ByIepFLppl9HRjGNKQ4P8SPonqBuCi08S/WRUqb+Tp+HI39224lyNeIfsCBAbnCAWkVnw F5Kvt3COBCwB4LaccA1n9c3kU53jCLTGCzPu0k6r1ztXZlmuzteDFb2Saj9MFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730564289; a=rsa-sha256; cv=none; b=A+zxm1rDm7Y9MfMLCOEBSvhM71Mt3QsVdDPv0KtNgDhcLYlzheRn9mGuhR4fZbjLIVjesd 0TXtpYlB0ioLslI4R/ZszCcAXyHqcGL5WXnfXMWJvQ+yk0HOw5rvn8D4sXKqRuQZKM9SLn QbiFshXDw0a5fdfi7lWDbBdRyBD/Bf1329uWGNXWR7MqXZOvK3egQ494OE1Wt0Dco3WN7H TfEQP85yUcppeNmVcZIjOl642EpBdpj57jFeh3iUHmSgQ3OYGCRS//0V2RAN20jupmf7N2 A7cyhLOYgvk3aaqqEcDXOn/M7aU+eBPcxrH+FRc429644clDxFTuQb1uohpd8Q== 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 4XgjZT5w7zz1BZJ; Sat, 2 Nov 2024 16:18:09 +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 4A2GI9DK061493; Sat, 2 Nov 2024 16:18:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A2GI9qE061490; Sat, 2 Nov 2024 16:18:09 GMT (envelope-from git) Date: Sat, 2 Nov 2024 16:18:09 GMT Message-Id: <202411021618.4A2GI9qE061490@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Jason E. Hale" Subject: git: 0861a35858ac - 2024Q4 - devel/qtcreator: repair build on 15-CURRENT 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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 0861a35858ac00af9fd8e2d800956b8651f95e25 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=0861a35858ac00af9fd8e2d800956b8651f95e25 commit 0861a35858ac00af9fd8e2d800956b8651f95e25 Author: Adriaan de Groot AuthorDate: 2024-10-30 23:01:31 +0000 Commit: Jason E. Hale CommitDate: 2024-11-02 16:17:12 +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. (cherry picked from commit 3dbc3bf8d626d4c3cc82656300db05d3fa58f026) --- 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}; }