From 5ba8e1e31d6e75823b52bf891c6024ee5c4fdfdb Mon Sep 17 00:00:00 2001
From: Jules <jules@j3s.fr>
Date: Tue, 5 Apr 2022 13:26:41 +0000
Subject: [PATCH] Update Unexpected Keyboard to 1.14.0 (18)

---
 metadata/juloo.keyboard2.yml | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/metadata/juloo.keyboard2.yml b/metadata/juloo.keyboard2.yml
index ded0207d98..658ba77532 100644
--- a/metadata/juloo.keyboard2.yml
+++ b/metadata/juloo.keyboard2.yml
@@ -122,19 +122,31 @@ Builds:
       - apt-get update || apt-get update
       - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
+      - apt-get install libjpeg-dev libtiff5-dev libpng-dev libfreetype6-dev libgif-dev
+        libgtk-3-dev libxml2-dev libpango1.0-dev libcairo2-dev libspiro-dev libuninameslist-dev
+        python3-dev ninja-build build-essential
+      - curl -LO https://github.com/fontforge/fontforge/releases/download/20201107/fontforge-20201107.tar.xz
+      - echo "68bcba8f602819eddc29cd356ee13fafbad7a80d19b652d354c6791343476c78  fontforge-20201107.tar.xz"
+        | sha256sum -c -
+      - tar xf fontforge-20201107.tar.xz
+      - cd fontforge-20201107
+      - mkdir build
+      - cd build
+      - cmake -GNinja ..
+      - ninja
+      - ninja install
     output: unsigned.apk
-    prebuild:
-      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'platforms;android-30'
-        'build-tools;31.0.0' 'build-tools;30.0.3' > /dev/null
-      - cp $$SDK$$/build-tools/30.0.3/lib/dx.jar $$SDK$$/build-tools/31.0.0/lib/dx.jar
-      - cp $$SDK$$/build-tools/30.0.3/dx $$SDK$$/build-tools/31.0.0/dx
+    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
+        'platforms;android-30' > /dev/null
     build:
       - make _build/juloo.keyboard2.unsigned-apk
       - mv _build/juloo.keyboard2.unsigned-apk unsigned.apk
 
 MaintainerNotes: |-
-    Requires Android Build Tools <= 30.0.3. The build script uses 'dx' that
-    seems to be gone in 31.0.0.
+    Until version 1.13.1,
+    required the 'dx' tool from Android Build Tools <= 30.0.3.
+    Starting from version 1.14.0,
+    requires FontForge >= 20201107 which is too recent for some distros.
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags