From 39952f8bdf2ee77e32152bf67df456a83e3e03fe Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 24 Apr 2022 20:52:36 +0200
Subject: [PATCH] Remove build dependency on Fontforge

The required version of fontforge (from 2020!) is not available in many
distros. This is an annoying for contributors and greatly complicated
the CI and F-Droid scripts.

The generated font file is now included in the sources. Fontforge is
still needed when adding new glyphs but this is not a common operation.
---
 .github/workflows/make-apk.yml |  17 ++---------------
 CONTRIBUTING.md                |  10 +++-------
 Makefile                       |  19 +++++++++----------
 srcs/special_font/build.pe     |   4 ++--
 srcs/special_font/result.ttf   | Bin 0 -> 6260 bytes
 5 files changed, 16 insertions(+), 34 deletions(-)
 create mode 100644 srcs/special_font/result.ttf

diff --git a/.github/workflows/make-apk.yml b/.github/workflows/make-apk.yml
index 6457576..3f872ba 100644
--- a/.github/workflows/make-apk.yml
+++ b/.github/workflows/make-apk.yml
@@ -9,19 +9,6 @@ jobs:
   Build-Apk:
     runs-on: ubuntu-latest
     steps:
-    - name: Cache fontforge and extra dependencies
-      uses: actions/cache@v2
-      with:
-        path: /usr/local/bin
-        key: usr-local-bin
-    - name: Install latest FontForge version (using AppImage)
-      run: |
-        # Get most recent version of FontForge
-        # Using AppImage there is no dependecy problem, it is the latest version and it's easier to cache
-        cd /usr/local/bin
-        sudo wget -c -N https://github.com/fontforge/fontforge/releases/download/20220308/FontForge-2022-03-08-582bd41-x86_64.AppImage
-        sudo chmod +x ./FontForge-2022-03-08-582bd41-x86_64.AppImage
-        sudo ln --symbolic --force /usr/local/bin/FontForge-2022-03-08-582bd41-x86_64.AppImage /usr/local/bin/fontforge
     - uses: actions/setup-java@v2
       with:
         distribution: 'zulu' # See 'Supported distributions' for available options
@@ -36,11 +23,11 @@ jobs:
     - name: Restore debug keystore from github Secrets 
       run: |
         mkdir -p _build
-        cd "$GITHUB_WORKSPACE/_build"
+        cd "_build"
         # Check if exist and use the secret named DEBUG_KEYSTORE
         # The contents of the secret can be obtained -
         #    from the debug.keystore.asc from you local _build folder
-        if [[ ! "${{ secrets.DEBUG_KEYSTORE }}" == "" ]]; then
+        if [[ ! "${{ secrets.DEBUG_KEYSTORE }}" = "" ]]; then
             echo "${{ secrets.DEBUG_KEYSTORE }}" > "debug.keystore.asc"
             if [[ -s "debug.keystore.asc" ]]; then
                 gpg -d --passphrase "debug0" --batch "debug.keystore.asc" > "debug.keystore"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bc4b288..4a107b1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,9 +11,9 @@ Fortunately, there's not many dependencies:
 - OpenJDK 8
 - Android SDK: build tools (minimum `28.0.1`), platform `30`
 - Make sure to have the `$ANDROID_HOME` environment variable set.
-- FontForge version >= 20201107
 
-For Nix users, there's a `shell.nix` for setting-up the right environment.
+For Nix users, the right environment can be obtained with `nix-shell ./shell.nix`.
+Instructions to install Nix are [here](https://nixos.wiki/wiki/Nix_Installation_Guide).
 
 Building the debug apk:
 
@@ -21,11 +21,7 @@ Building the debug apk:
 make
 ```
 
-If the build succeed, the debug apk is located in
-`_build/juloo.keyboard2.debug.apk`.
-
-If the build doesn't succeeded check the FontForge version, the version needed is 20201107. 
-Try to use the nix-shell, instructions to install [here](https://nixos.wiki/wiki/Nix_Installation_Guide)
+If the build succeed, the debug apk is located in `_build/juloo.keyboard2.debug.apk`.
 
 ## Using the local debug.keystore on the Github CI actions
 
diff --git a/Makefile b/Makefile
index a606299..a731a0b 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,10 @@ clean:
 	rm -rf _build/*.dex _build/class _build/gen _build/*.apk _build/*.unsigned-apk \
 		_build/*.idsig _build/assets
 
-.PHONY: release debug installd clean
+rebuild_special_font:
+	cd srcs/special_font && fontforge -lang=ff -script build.pe *.svg
+
+.PHONY: release debug installd clean rebuild_special_font
 
 $(shell mkdir -p _build)
 
@@ -85,6 +88,11 @@ _build/%.unaligned-apk: $(addprefix _build/,$(APK_EXTRA_FILES)) $(MANIFEST_FILE)
 		-I $(ANDROID_PLATFORM)/android.jar -F "$@" $(AAPT_PACKAGE_FLAGS)
 	cd $(@D) && $(ANDROID_BUILD_TOOLS)/aapt add $(@F) $(APK_EXTRA_FILES)
 
+# Copy the special font file into _build because aapt requires relative paths
+_build/assets/special_font.ttf: srcs/special_font/result.ttf
+	mkdir -p $(@D)
+	cp "$<" "$@"
+
 # R.java
 
 GEN_DIR = _build/gen
@@ -95,15 +103,6 @@ $(R_FILE): $(RES_FILES) $(MANIFEST_FILE)
 	$(ANDROID_BUILD_TOOLS)/aapt package -f -m -S $(RES_DIR) -J $(GEN_DIR) \
 		-M $(MANIFEST_FILE) -I $(ANDROID_PLATFORM)/android.jar
 
-# Special font
-
-SPECIAL_FONT_GLYPHS = $(wildcard $(CURDIR)/srcs/special_font/*.svg)
-SPECIAL_FONT_SCRIPT = $(CURDIR)/srcs/special_font/build.pe
-
-_build/assets/special_font.ttf: $(SPECIAL_FONT_SCRIPT) $(SPECIAL_FONT_GLYPHS)
-	mkdir -p $(@D)
-	fontforge -lang=ff -script $(SPECIAL_FONT_SCRIPT) $(CURDIR)/$@ $(SPECIAL_FONT_GLYPHS)
-
 # Compile java classes and build classes.dex
 
 OBJ_DIR = _build/class
diff --git a/srcs/special_font/build.pe b/srcs/special_font/build.pe
index 4e2754d..962917f 100644
--- a/srcs/special_font/build.pe
+++ b/srcs/special_font/build.pe
@@ -3,7 +3,7 @@
 New()
 
 # Imports glyphs, file name is position in the font.
-i = 2
+i = 1
 while (i < $argc)
   Select(Strtol($argv[i]:t:r, 16))
   Import($argv[i], 0, 0, 4.0, 0.1)
@@ -11,4 +11,4 @@ while (i < $argc)
   i++
 endloop
 
-Generate($1)
+Generate("result.ttf")
diff --git a/srcs/special_font/result.ttf b/srcs/special_font/result.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..8434a3f15095267e5bdb06c8920893b03cbb1878
GIT binary patch
literal 6260
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
TZ5nM)QnyQ^<X%AfD$M>1C-Q!P

literal 0
HcmV?d00001