From c1f4f7de947105a83eb7b8791bded67aeb9511c8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 8 May 2020 11:25:13 +0200 Subject: [PATCH] rebase of the patch --- debian/patches/clang-format-version.diff | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index cc1a9341..4f356634 100644 --- a/debian/patches/clang-format-version.diff +++ b/debian/patches/clang-format-version.diff @@ -4,23 +4,23 @@ clang/tools/clang-format/clang-format.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/tools/clang-format/clang-format-diff.py +Index: llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb/clang/tools/clang-format/clang-format-diff.py =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/tools/clang-format/clang-format-diff.py -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/tools/clang-format/clang-format-diff.py -@@ -54,7 +54,7 @@ def main(): +--- llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb.orig/clang/tools/clang-format/clang-format-diff.py ++++ llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb/clang/tools/clang-format/clang-format-diff.py +@@ -58,7 +58,7 @@ def main(): parser.add_argument('-style', - help='formatting style to apply (LLVM, Google, Chromium, ' - 'Mozilla, WebKit)') + help='formatting style to apply (LLVM, GNU, Google, Chromium, ' + 'Microsoft, Mozilla, WebKit)') - parser.add_argument('-binary', default='clang-format', + parser.add_argument('-binary', default='clang-format-11', help='location of binary to use for clang-format') args = parser.parse_args() -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/tools/clang-format/clang-format.el +Index: llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb/clang/tools/clang-format/clang-format.el =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/tools/clang-format/clang-format.el -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/tools/clang-format/clang-format.el +--- llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb.orig/clang/tools/clang-format/clang-format.el ++++ llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb/clang/tools/clang-format/clang-format.el @@ -37,7 +37,7 @@ :group 'tools) @@ -30,10 +30,10 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/tools/clang "clang-format") "Location of the clang-format executable. -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/tools/clang-format/clang-format.py +Index: llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb/clang/tools/clang-format/clang-format.py =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/tools/clang-format/clang-format.py -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/tools/clang-format/clang-format.py +--- llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb.orig/clang/tools/clang-format/clang-format.py ++++ llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb/clang/tools/clang-format/clang-format.py @@ -48,7 +48,7 @@ import vim # set g:clang_format_path to the path to clang-format if it is not on the path