git: a75fb0906770 - main - devel/qtcreator: Use llvm17 as recommended
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 12 Dec 2023 19:44:32 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a75fb0906770e806bcb69c2796bff9dbe0a1181a
commit a75fb0906770e806bcb69c2796bff9dbe0a1181a
Author: Florian Walpen <dev@submerge.ch>
AuthorDate: 2023-11-25 22:13:54 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2023-12-12 19:44:16 +0000
devel/qtcreator: Use llvm17 as recommended
QtCreator would crash in the settings dialog if not rebuilt after
an update of Qt packages to 6.6.1 release. Make build and run depend
on llvm17 as recommended upstream, for better clangd compatibility:
https://www.qt.io/blog/qt-creator-12-c-code-model-update
Since llvm17 seems to be more strict about non-standard alloca stack
allocation, patch that out of the internal SQLite build config. This
matches the config of databases/sqlite3 in ports.
PR: 275636
---
devel/qtcreator/Makefile | 3 ++-
devel/qtcreator/files/patch-src_libs_3rdparty_sqlite_config.h | 10 ++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
index acf1a796e744..b0cdd38c763b 100644
--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@@ -1,5 +1,6 @@
PORTNAME= qtcreator
DISTVERSION= 12.0.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
DISTNAME= qt-creator-opensource-src-${DISTVERSION}
@@ -21,7 +22,7 @@ LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader \
libxkbcommon.so:x11/libxkbcommon \
libzstd.so:archivers/zstd
-USES= cmake compiler:c++17-lang desktop-file-utils gl llvm:build,run,min=15 \
+USES= cmake compiler:c++17-lang desktop-file-utils gl llvm:build,run,min=17 \
pkgconfig python qt:6 shebangfix tar:xz
USE_GL= gl
USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME}
diff --git a/devel/qtcreator/files/patch-src_libs_3rdparty_sqlite_config.h b/devel/qtcreator/files/patch-src_libs_3rdparty_sqlite_config.h
new file mode 100644
index 000000000000..c94a3faa8795
--- /dev/null
+++ b/devel/qtcreator/files/patch-src_libs_3rdparty_sqlite_config.h
@@ -0,0 +1,10 @@
+--- src/libs/3rdparty/sqlite/config.h.orig 2023-11-22 08:33:13 UTC
++++ src/libs/3rdparty/sqlite/config.h
+@@ -65,7 +65,6 @@
+ #define SQLITE_OMIT_DECLTYPE 1
+ #define SQLITE_MAX_EXPR_DEPTH 0
+ #define SQLITE_OMIT_SHARED_CACHE 1
+-#define SQLITE_USE_ALLOCA 1
+ #define SQLITE_ENABLE_MEMORY_MANAGEMENT 1
+ #define SQLITE_ENABLE_NULL_TRIM 1
+ #define SQLITE_ALLOW_COVERING_INDEX_SCAN 1