From e40e88174895e57515a77d907cf4fd68dfd34f9e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 17 Aug 2021 21:04:43 +0200 Subject: [PATCH] * remove "scan-build-py-force-utf-8-opening.diff" merged upstream --- debian/changelog | 8 ++++++++ .../patches/scan-build-py-force-utf-8-opening.diff | 13 ------------- debian/patches/series | 1 - 3 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 debian/patches/scan-build-py-force-utf-8-opening.diff diff --git a/debian/changelog b/debian/changelog index 1862d10f..22658a7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-snapshot (1:14~++20210817085703+f5616a981c60-1~exp1) UNRELEASED; urgency=medium + + * experimental New snapshot release + * remove "scan-build-py-force-utf-8-opening.diff" + merged upstream + + -- Sylvestre Ledru Tue, 17 Aug 2021 21:01:03 +0200 + llvm-toolchain-snapshot (1:14~++20210715093511+afc760ef3527-1~exp2) unstable; urgency=medium * revert the s390 as it is probably fixed diff --git a/debian/patches/scan-build-py-force-utf-8-opening.diff b/debian/patches/scan-build-py-force-utf-8-opening.diff deleted file mode 100644 index f7979acb..00000000 --- a/debian/patches/scan-build-py-force-utf-8-opening.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-snapshot_14~++20210805101753+11565320fd55/clang/tools/scan-build-py/lib/libscanbuild/report.py -=================================================================== ---- llvm-toolchain-snapshot_14~++20210805101753+11565320fd55.orig/clang/tools/scan-build-py/lib/libscanbuild/report.py -+++ llvm-toolchain-snapshot_14~++20210805101753+11565320fd55/clang/tools/scan-build-py/lib/libscanbuild/report.py -@@ -417,7 +417,7 @@ def parse_bug_html(filename): - 'bug_path_length': 1 - } - -- with open(filename) as handler: -+ with open(filename, encoding="utf-8") as handler: - for line in handler.readlines(): - # do not read the file further - if endsign.match(line): diff --git a/debian/patches/series b/debian/patches/series index 39c36ff5..b8a89297 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -142,5 +142,4 @@ lld-use-link-atomic-i386.diff lower-python-dep.diff scan-build-py-fix-analyze-path.diff scan-build-py-fix-default-bin.diff -scan-build-py-force-utf-8-opening.diff libclc-llvm-spirv.diff