CVS commit: pkgsrc/editors/qtcreator

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Sat Nov 30 17:47:50 UTC 2024

Modified Files:
        pkgsrc/editors/qtcreator: distinfo
        pkgsrc/editors/qtcreator/patches:
            patch-src_plugins_clangformat_clangformatbaseindenter.cpp
            patch-src_plugins_clangformat_clangformatutils.cpp

Log Message:
editors/qtcreator: add comments about llvm fixes, fix pkglint errors


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/editors/qtcreator/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/editors/qtcreator/patches/patch-src_plugins_clangformat_clangformatbaseindenter.cpp
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/editors/qtcreator/patches/patch-src_plugins_clangformat_clangformatutils.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/qtcreator/distinfo
diff -u pkgsrc/editors/qtcreator/distinfo:1.8 pkgsrc/editors/qtcreator/distinfo:1.9
--- pkgsrc/editors/qtcreator/distinfo:1.8       Sat Nov 30 17:08:16 2024
+++ pkgsrc/editors/qtcreator/distinfo   Sat Nov 30 17:47:49 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2024/11/30 17:08:16 nros Exp $
+$NetBSD: distinfo,v 1.9 2024/11/30 17:47:49 nros Exp $
 
 BLAKE2s (qt-creator-opensource-src-5.0.3.zip) = 961dcaa2d6b6e2b739d774f4a7b0090730bad4b5cf5c93a80f28c39caafdd9a3
 SHA512 (qt-creator-opensource-src-5.0.3.zip) = 9ba7d7a1b506039460efedc9defe974c06905b5024f3e33de2328dcac335ba58d24c2c73ed2083f40305c4393507d6257ff755e2bfe3692cffd601f50bfce131
 Size (qt-creator-opensource-src-5.0.3.zip) = 72614121 bytes
 SHA1 (patch-share_share.pro) = e6f9448295a6eeb78b12979684b53ea29649da95
 SHA1 (patch-src_libs_3rdparty_sqlite_sqlite3.c) = fadde723c6e4fe758d9d66e00e95044755913b92
-SHA1 (patch-src_plugins_clangformat_clangformatbaseindenter.cpp) = bb8aed9d0bb7fdbf95a87591f67df4d53a28b7ca
-SHA1 (patch-src_plugins_clangformat_clangformatutils.cpp) = 603007a52f55d86af393e30a890ed4cc18fc0211
+SHA1 (patch-src_plugins_clangformat_clangformatbaseindenter.cpp) = b0fa0b07c4c0d0c8907429aa2080acbd676dccfb
+SHA1 (patch-src_plugins_clangformat_clangformatutils.cpp) = 15567af1013c227bf97b4b6ea5f834b785c0bd52

Index: pkgsrc/editors/qtcreator/patches/patch-src_plugins_clangformat_clangformatbaseindenter.cpp
diff -u pkgsrc/editors/qtcreator/patches/patch-src_plugins_clangformat_clangformatbaseindenter.cpp:1.1 pkgsrc/editors/qtcreator/patches/patch-src_plugins_clangformat_clangformatbaseindenter.cpp:1.2
--- pkgsrc/editors/qtcreator/patches/patch-src_plugins_clangformat_clangformatbaseindenter.cpp:1.1      Thu May 11 13:30:17 2023
+++ pkgsrc/editors/qtcreator/patches/patch-src_plugins_clangformat_clangformatbaseindenter.cpp  Sat Nov 30 17:47:50 2024
@@ -1,3 +1,9 @@
+$NetBSD: patch-src_plugins_clangformat_clangformatbaseindenter.cpp,v 1.2 2024/11/30 17:47:50 nros Exp $
+
+Fix build with LLVM 16
+https://github.com/qt-creator/qt-creator/commit/e20bdfae4de90401a518135bc22958549dceda66
+https://github.com/qt-creator/qt-creator/commit/f4545807defdfb493c1d66a19430a69d81afa40b
+
 --- src/plugins/clangformat/clangformatbaseindenter.cpp.orig   2023-05-11 14:22:23.741477809 +0200
 +++ src/plugins/clangformat/clangformatbaseindenter.cpp        2023-05-11 14:29:29.745830013 +0200
 @@ -47,11 +47,19 @@

Index: pkgsrc/editors/qtcreator/patches/patch-src_plugins_clangformat_clangformatutils.cpp
diff -u pkgsrc/editors/qtcreator/patches/patch-src_plugins_clangformat_clangformatutils.cpp:1.3 pkgsrc/editors/qtcreator/patches/patch-src_plugins_clangformat_clangformatutils.cpp:1.4
--- pkgsrc/editors/qtcreator/patches/patch-src_plugins_clangformat_clangformatutils.cpp:1.3     Sat Nov 30 17:08:17 2024
+++ pkgsrc/editors/qtcreator/patches/patch-src_plugins_clangformat_clangformatutils.cpp Sat Nov 30 17:47:50 2024
@@ -1,9 +1,18 @@
-$NetBSD: patch-src_plugins_clangformat_clangformatutils.cpp,v 1.3 2024/11/30 17:08:17 nros Exp $
+$NetBSD: patch-src_plugins_clangformat_clangformatutils.cpp,v 1.4 2024/11/30 17:47:50 nros Exp $
 
 Fix build with llvm 16.
 https://github.com/qt-creator/qt-creator/commit/b97c9494af2d4d6e53bcc87b588f21a4f445ef6f
 and newer
 
+Fix build with LLVM 17
+https://github.com/qt-creator/qt-creator/commit/9ad9e49ccf6e0d7f4ba5765cff3af63fbbed60e8
+
+Fix warnings with LLVM 18
+https://github.com/qt-creator/qt-creator/commit/7457b623125f4bcdb7941769a385cfbfc0dcbf2b
+
+Fix build with LLVM 19
+https://github.com/qt-creator/qt-creator/commit/f175ec933f1c5c5d7a345edbaacc8ff90202aee2
+
 --- src/plugins/clangformat/clangformatutils.cpp.orig  2021-11-03 10:14:14.000000000 +0000
 +++ src/plugins/clangformat/clangformatutils.cpp
 @@ -51,7 +51,13 @@ static clang::format::FormatStyle qtcSty