diff options
Diffstat (limited to 'debian/patches/clang-format-version.diff')
| -rw-r--r-- | debian/patches/clang-format-version.diff | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff new file mode 100644 index 0000000..f8e1619 --- /dev/null +++ b/debian/patches/clang-format-version.diff @@ -0,0 +1,39 @@ +--- + clang/tools/clang-format/clang-format-diff.py | 2 +- + clang/tools/clang-format/clang-format.el | 2 +- + clang/tools/clang-format/clang-format.py | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +--- a/clang/tools/clang-format/clang-format-diff.py ++++ b/clang/tools/clang-format/clang-format-diff.py +@@ -55,7 +55,7 @@ def main(): + parser.add_argument('-style', + help='formatting style to apply (LLVM, Google, Chromium, ' + 'Mozilla, WebKit)') +- parser.add_argument('-binary', default='clang-format', ++ parser.add_argument('-binary', default='clang-format-5.0', + help='location of binary to use for clang-format') + args = parser.parse_args() + +--- a/clang/tools/clang-format/clang-format.el ++++ b/clang/tools/clang-format/clang-format.el +@@ -36,7 +36,7 @@ + :group 'tools) + + (defcustom clang-format-executable +- (or (executable-find "clang-format") ++ (or (executable-find "clang-format-5.0") + "clang-format") + "Location of the clang-format executable. + +--- a/clang/tools/clang-format/clang-format.py ++++ b/clang/tools/clang-format/clang-format.py +@@ -35,7 +35,7 @@ import vim + + # set g:clang_format_path to the path to clang-format if it is not on the path + # Change this to the full path if clang-format is not on the path. +-binary = 'clang-format' ++binary = 'clang-format-5.0' + if vim.eval('exists("g:clang_format_path")') == "1": + binary = vim.eval('g:clang_format_path') + |