From 148aedeeb40f27a11b3920fe329117d041b79cfc Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Wed, 19 Feb 2020 17:44:03 -0800
Subject: [PATCH] Changes necessary to make Windows build work

---
 .gitattributes              | 1 +
 package.json                | 3 ++-
 patches/typo-js+1.1.0.patch | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000000..61c5a3e01b69
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+patches/* binary
diff --git a/package.json b/package.json
index 7f7275eec96f..17d39b091551 100644
--- a/package.json
+++ b/package.json
@@ -279,7 +279,8 @@
         "node_modules/sharp"
       ],
       "artifactName": "${name}-win-${version}.${ext}",
-      "certificateSubjectName": "Signal",
+      "certificateSubjectName": "Signal (Quiet Riddle Ventures, LLC)",
+      "certificateSha1": "77B2AA4421E5F377454B8B91E573746592D1543D",
       "publisherName": "Signal (Quiet Riddle Ventures, LLC)",
       "icon": "build/icons/win/icon.ico",
       "publish": [
diff --git a/patches/typo-js+1.1.0.patch b/patches/typo-js+1.1.0.patch
index 99c4e9321e07..9a9606827945 100644
--- a/patches/typo-js+1.1.0.patch
+++ b/patches/typo-js+1.1.0.patch
@@ -1,11 +1,11 @@
 diff --git a/node_modules/typo-js/typo.js b/node_modules/typo-js/typo.js
-index 68c285b..11710a1 100644
+index 68c285b..95ebc6c 100644
 --- a/node_modules/typo-js/typo.js
 +++ b/node_modules/typo-js/typo.js
 @@ -431,7 +431,7 @@ Typo.prototype = {
  				dictionaryTable[word] = null;
  			}
-
+ 			
 -			if (rules.length > 0) {
 +			if (rules && rules.length > 0) {
  				if (dictionaryTable[word] === null) {
@@ -15,7 +15,7 @@ index 68c285b..11710a1 100644
  		else if (this.flags.FLAG === "num") {
  			return textCodes.split(",");
  		}
-+    return [];
++		return [];
  	},
-
+ 	
  	/**