git: 3dbc3bf8d626 - main - devel/qtcreator: repair build on 15-CURRENT

From: Adriaan de Groot <adridg_at_FreeBSD.org>
Date: Thu, 31 Oct 2024 19:42:23 UTC
The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3dbc3bf8d626d4c3cc82656300db05d3fa58f026

commit 3dbc3bf8d626d4c3cc82656300db05d3fa58f026
Author:     Adriaan de Groot <adridg@FreeBSD.org>
AuthorDate: 2024-10-30 23:01:31 +0000
Commit:     Adriaan de Groot <adridg@FreeBSD.org>
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}; }