From a6860e142e97f25eff8db3f373516c25131ff566 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Wed, 9 Aug 2017 11:43:52 +0100
Subject: [PATCH] Bug 1340910 - pt 1 - Update our Brotli import script to pull
 release 0.6.0 from upstream. r=glandium

---
 modules/brotli/clang-cl-exceptions.patch | 39 ------------------------
 modules/brotli/update.sh                 |  6 ++--
 2 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 modules/brotli/clang-cl-exceptions.patch

diff --git a/modules/brotli/clang-cl-exceptions.patch b/modules/brotli/clang-cl-exceptions.patch
deleted file mode 100644
index 6edefda9ab29..000000000000
--- a/modules/brotli/clang-cl-exceptions.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/tools/bro.cc b/tools/bro.cc
-index b254f0ffdb08..30d9858a95b3 100644
---- a/tools/bro.cc
-+++ b/tools/bro.cc
-@@ -282,29 +282,34 @@ int main(int argc, char** argv) {
-     FILE* fin = OpenInputFile(input_path);
-     FILE* fout = OpenOutputFile(output_path, force);
-     if (decompress) {
-       Decompresss(fin, fout);
-     } else {
-       brotli::BrotliParams params;
-       params.lgwin = lgwin;
-       params.quality = quality;
-+/* clang-cl doesn't like exceptions */
-+#if !defined(_MSC_VER) || !defined(__clang__)
-       try {
-+#endif
-         brotli::BrotliFileIn in(fin, 1 << 16);
-         brotli::BrotliFileOut out(fout);
-         if (!BrotliCompress(params, &in, &out)) {
-           fprintf(stderr, "compression failed\n");
-           unlink(output_path);
-           exit(1);
-         }
-+#if !defined(_MSC_VER) || !defined(__clang__)
-       } catch (std::bad_alloc&) {
-         fprintf(stderr, "not enough memory\n");
-         unlink(output_path);
-         exit(1);
-       }
-+#endif
-     }
-     if (fclose(fin) != 0) {
-       perror("fclose");
-       exit(1);
-     }
-     if (fclose(fout) != 0) {
-       perror("fclose");
-       exit(1);
diff --git a/modules/brotli/update.sh b/modules/brotli/update.sh
index f4ec855e6a6c..171560937633 100755
--- a/modules/brotli/update.sh
+++ b/modules/brotli/update.sh
@@ -6,12 +6,12 @@
 MY_TEMP_DIR=`mktemp -d -t brotli_update.XXXXXX` || exit 1
 
 git clone https://github.com/google/brotli ${MY_TEMP_DIR}/brotli
-git -C ${MY_TEMP_DIR}/brotli checkout v0.4.0
+git -C ${MY_TEMP_DIR}/brotli checkout v0.6.0
 
 COMMIT=$(git -C ${MY_TEMP_DIR}/brotli rev-parse HEAD)
 perl -p -i -e "s/\[commit [0-9a-f]{40}\]/[commit ${COMMIT}]/" README.mozilla;
 
-DIRS="dec enc tools"
+DIRS="common dec enc include tools"
 
 for d in $DIRS; do
 	rm -rf $d
@@ -19,8 +19,6 @@ for d in $DIRS; do
 done
 rm -rf ${MY_TEMP_DIR}
 
-patch -p1 < clang-cl-exceptions.patch
-
 hg addremove $DIRS
 
 echo "###"