From 77645b20b2567eceb1553d1ae04ebd5434951562 Mon Sep 17 00:00:00 2001
From: Yehoshua Pesach Wallach <yehoshuapw@gmail.com>
Date: Tue, 19 Apr 2022 17:56:06 +0300
Subject: [PATCH] fontgen: use patch file for jetbrains 0 fix

---
 .../fonts/fix_jetbrains_mono_bold_20_zero.py  | 30 -------------------
 src/displayapp/fonts/fonts.json               |  2 +-
 .../fonts/jetbrains_mono_bold_20.c_zero.patch |  6 ++++
 3 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100755 src/displayapp/fonts/fix_jetbrains_mono_bold_20_zero.py
 create mode 100644 src/displayapp/fonts/jetbrains_mono_bold_20.c_zero.patch

diff --git a/src/displayapp/fonts/fix_jetbrains_mono_bold_20_zero.py b/src/displayapp/fonts/fix_jetbrains_mono_bold_20_zero.py
deleted file mode 100755
index 1617c36c..00000000
--- a/src/displayapp/fonts/fix_jetbrains_mono_bold_20_zero.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-
-with open('jetbrains_mono_bold_20.c', 'r') as fd:
-    src = fd.read()
-
-zero_area = src.find('U+0030 "0"')
-zero_data_start = src[zero_area:].find('\n') + zero_area + 1
-zero_data_end = src[zero_data_start:].find('\n\n')
-
-curr = src[zero_data_start:zero_data_start+zero_data_end]
-
-OLD="""    0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7f,
-    0xdf, 0xf7, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
-    0x8f, 0xc0,"""
-NEW="""    0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7e,
-    0xdf, 0xb7, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
-    0x8f, 0xc0,"""
-
-if curr != OLD:
-    if curr == NEW:
-        print('Already patched')
-        sys.exit()
-    sys.exit('Target differers from expected data')
-
-
-with open('jetbrains_mono_bold_20.c', 'r+') as fd:
-    fd.seek(zero_data_start) #NOTE: since they are both the same size, this is allowed. Otherwise more editing needs to happen.
-    fd.write(NEW)
diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json
index 6873185b..c04bd213 100644
--- a/src/displayapp/fonts/fonts.json
+++ b/src/displayapp/fonts/fonts.json
@@ -13,7 +13,7 @@
          ],
          "bpp": 1,
          "size": 20,
-         "patches": ["./fix_jetbrains_mono_bold_20_zero.py"],
+         "patches": [["patch", "jetbrains_mono_bold_20.c", "jetbrains_mono_bold_20.c_zero.patch"]],
          "features": {
             "hebrew": [
                {
diff --git a/src/displayapp/fonts/jetbrains_mono_bold_20.c_zero.patch b/src/displayapp/fonts/jetbrains_mono_bold_20.c_zero.patch
new file mode 100644
index 00000000..ecb99662
--- /dev/null
+++ b/src/displayapp/fonts/jetbrains_mono_bold_20.c_zero.patch
@@ -0,0 +1,6 @@
+91,92c91,92
+<     0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7f,
+<     0xdf, 0xf7, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
+---
+>     0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7e,
+>     0xdf, 0xb7, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,