Attachment 246908 Details for Bug 275636 – Bump revision for Qt 6.6.1, use llvm17 as recommended.

[patch] Bump revision for Qt 6.6.1, use llvm17 as recommended.

devel-qtcreator-Bump-revision-use-llvm17-as-recommen.patch (text/plain), 2.72 KB, created by Florian Walpen on 2023-12-08 14:02:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Walpen

Created: 2023-12-08 14:02:46 UTC

Size: 2.72 KB

patch

obsolete

>From 0f78e739aae2f1f32f866b4e6f4d65a73c22ac3b Mon Sep 17 00:00:00 2001
>From: Florian Walpen <dev@submerge.ch>
>Date: Sat, 25 Nov 2023 23:13:54 +0100
>Subject: [PATCH] devel/qtcreator: Bump revision, 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. While here, remove
>obsolete flag that disabled precompiled headers for build.
>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
>---
> devel/qtcreator/Makefile                               |  7 +++----
> .../files/patch-src_libs_3rdparty_sqlite_config.h      | 10 ++++++++++
> 2 files changed, 13 insertions(+), 4 deletions(-)
> create mode 100644 devel/qtcreator/files/patch-src_libs_3rdparty_sqlite_config.h
>
>diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
>index acf1a796e744..f604df51eb7e 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}
>@@ -41,10 +42,8 @@ CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH:STRING="${LLVM_PREFIX};${PREFIX}"
> # - Prevent accidental use of devel/googletest headers, use bundled.
> CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_elfutils \
> 		CMAKE_DISABLE_FIND_PACKAGE_Googletest
>-# - Disable precompiled headers for now, they are missing compile flags.
> # - Suppress installed yaml-cpp, use bundled.
>-CMAKE_OFF=	BUILD_WITH_PCH \
>-		yaml-cpp_FOUND
>+CMAKE_OFF=	yaml-cpp_FOUND
> 
> LDFLAGS+=	-lexecinfo
> 
>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
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 275636: 246908 | 246985