From nobody Tue Dec 12 19:44:32 2023 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 4SqTb42vvpz54LpP; Tue, 12 Dec 2023 19:44:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SqTb42HvGz3gdM; Tue, 12 Dec 2023 19:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702410272; 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=HsYQBKAWsEU3yYOtO5kAjgHW1IFJ8Bh1yBfP5mMnmsc=; b=kUyrjM/4VYKj/MRsXs+fRTUiPYMoHPwpsIoJXsfPdPsi3At2EfPxReelRRSvMoWOTnWdvU gEOecuogBwuOCogY+8v8ss7biubexTd/fblHJLt+WtK1tvDKYLeTYtCJMSxguf+Jr/9S3A nnidMVw8j55i9WD4wjPGn/8YQ1mnwVrknvQXRkBkHB1o1C3qLibiYZC7V0NGsdzJ2wH2GY 8Oeq+kH7T6QuIqU3sGX9yP0BqhXE1pH0zVDZ/IpeKXwuigcI4GmGOOvxP/44eHUO6vDpH+ IkbFteKIkQz7MgAmVBFA8iv1HugYY4BfMZHrx4K2GyGq8In/Wkh1vkb1RRY+OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702410272; a=rsa-sha256; cv=none; b=I+uxR7Cq4KTRN4nYEtnPTdfP+gUgs9pq+luQVoYXLlnH/Gr7xJ49YQyrtAW1mXdSsNW62Y vaJvJjhB2i0oQ9QbNHd3S3HUDByh+YfwIlFzyRT5CADllisy0KzTWLsicfytlTIOOoYEG3 JUz69jAWdsGNf25UManYNL8OlGNqCXtmcr/rLOxmD3XsjeqcUpTIJlI028nISbw1o0Y3ha ZIOJhcQkEWBDF7d5ACqbyUZZKqXTc7yz2bvq0PtrSL4w2eYxNYH5/JbnD5n9bOPzE9y0zb dX0W/wUtbTNQp6i3BKadVFStA/7i3oFOXtL+sbeomftQwoOSnF+6SBDMeJf0SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702410272; 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=HsYQBKAWsEU3yYOtO5kAjgHW1IFJ8Bh1yBfP5mMnmsc=; b=fo6syYqgcSwAX8/j+/QZtLWxrmYKWcLcUV88ytA82tLZrYdpXR2Jsu3K98NltfQI32k4Ej tv22cKZ86yNMadSKnLI6JyUn28p17Wu2q7H44D+zpe2p60M0066+1OYmYUftOdj3/TgWb/ 45iXqw4tWsbNthnG6TqMwVghMWSgMc4scKZhmwTvG9fxcZiWtz4RGyLSkFADRfMBQB8E3p hp6uBCEp5zJf8hc5c9AnL2Iun1YGIn0kefSVRhfCQ0ElwFRhY+2/4Nk+U3rUMTkA3CJJ68 OIWDRSOIpQXkFg/Q8xs2aonHLjpn79P4YL+FrV97iHCnj//I3k+dtrZG4Ce8jQ== 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 4SqTb41GHFzDFQ; Tue, 12 Dec 2023 19:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BCJiWE4038037; Tue, 12 Dec 2023 19:44:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BCJiWFU038034; Tue, 12 Dec 2023 19:44:32 GMT (envelope-from git) Date: Tue, 12 Dec 2023 19:44:32 GMT Message-Id: <202312121944.3BCJiWFU038034@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: a75fb0906770 - main - devel/qtcreator: Use llvm17 as recommended 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: a75fb0906770e806bcb69c2796bff9dbe0a1181a Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=a75fb0906770e806bcb69c2796bff9dbe0a1181a commit a75fb0906770e806bcb69c2796bff9dbe0a1181a Author: Florian Walpen AuthorDate: 2023-11-25 22:13:54 +0000 Commit: Jason E. Hale 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