From 694afcd60b688a6780204eabfee91ea9567fbce5 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Tue, 28 Aug 2018 15:45:05 +0200
Subject: [PATCH 1/2] Ensure that the built `PdfJsDefaultPreferences.jsm` file
 won't be affected/touched during tree-wide ESLint rule changes in
 `mozilla-central` (PR 9571 follow-up)

Also updates the edit warning, such that the wording is more consistent.
---
 gulpfile.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 5b2ed651c..469b99ca4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -751,15 +751,17 @@ function preprocessDefaultPreferences(content) {
   var preprocessor2 = require('./external/builder/preprocessor2.js');
   var licenseHeader = fs.readFileSync('./src/license_header.js').toString();
 
+  var GLOBALS = '/* eslint-disable */\n';
   var MODIFICATION_WARNING =
-    '//\n// THIS FILE IS AUTOMATICALLY GENERATED, DO NOT EDIT MANUALLY!\n//\n';
+    '//\n// THIS FILE IS GENERATED AUTOMATICALLY, DO NOT EDIT MANUALLY!\n//\n';
 
   content = preprocessor2.preprocessPDFJSCode({
     rootPath: __dirname,
     defines: DEFINES,
   }, content);
 
-  return licenseHeader + '\n' + MODIFICATION_WARNING + '\n' + content + '\n';
+  return (licenseHeader + '\n' + GLOBALS + '\n' + MODIFICATION_WARNING + '\n' +
+          content + '\n');
 }
 
 gulp.task('mozcentral-pre', ['buildnumber', 'locale'], function () {

From d8aaa2f97857e5419394189dd36fec5deeb5c2d9 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Tue, 28 Aug 2018 15:47:38 +0200
Subject: [PATCH 2/2] Update to the current year, i.e. 2018, in the bundle
 license headers

---
 src/license_header.js       | 2 +-
 src/license_header_libre.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/license_header.js b/src/license_header.js
index c2fb3c8bc..988b465f2 100644
--- a/src/license_header.js
+++ b/src/license_header.js
@@ -1,4 +1,4 @@
-/* Copyright 2017 Mozilla Foundation
+/* Copyright 2018 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/license_header_libre.js b/src/license_header_libre.js
index 06e2bf0f7..12d6738b7 100644
--- a/src/license_header_libre.js
+++ b/src/license_header_libre.js
@@ -2,7 +2,7 @@
  * @licstart The following is the entire license notice for the
  * Javascript code in this page
  *
- * Copyright 2017 Mozilla Foundation
+ * Copyright 2018 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.