From 4ef36da69c6f5f07efa165ff153ba337f892793f Mon Sep 17 00:00:00 2001
From: Vilius Sutkus '89 <ViliusSutkus89@gmail.com>
Date: Mon, 11 Dec 2023 02:38:17 +0200
Subject: [PATCH] Bump fontforge and pdf2htmlEX to consume new pango

---
 fontforge/build.gradle.kts  | 12 ++++--------
 pdf2htmlEX/build.gradle.kts |  8 ++++----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/fontforge/build.gradle.kts b/fontforge/build.gradle.kts
index 3b91d16..5a426bf 100644
--- a/fontforge/build.gradle.kts
+++ b/fontforge/build.gradle.kts
@@ -11,15 +11,15 @@ group = rootProject.group
 // Hardcode a list of available versions
 val portVersion = when(project.findProperty("packageVersion")) {
     "20170731" -> {
-        version = "20170731-beta-4"
+        version = "20170731-beta-5"
         "20170731"
     }
     "20200314" -> {
-        version = "20200314-beta-7"
+        version = "20200314-beta-8"
         "20200314"
     }
     else /* "20230101" */ -> {
-        version = "20230101-beta-6"
+        version = "20230101-beta-7"
         "20230101"
     }
 }
@@ -49,11 +49,7 @@ dependencies {
     implementation("com.viliussutkus89.ndk.thirdparty:libuninameslist${ndkVersionSuffix}-static:20230916-beta-2")
     implementation("com.viliussutkus89.ndk.thirdparty:libxml2${ndkVersionSuffix}-static:2.11.5-beta-4")
     implementation("com.viliussutkus89.ndk.thirdparty:spiro${ndkVersionSuffix}-static:20221101-beta-2")
-
-    if (minSupportedSdk >= 21)
-        implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}-static:1.51.0-beta-3")
-    else
-        implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}-static:1.49.4-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}-static:1.51.0-beta-4")
 
     if (portVersion != "20170731") {
         // libfontforge checks for TIFFRewriteField , which was deprecated in libtiff-4
diff --git a/pdf2htmlEX/build.gradle.kts b/pdf2htmlEX/build.gradle.kts
index 118254f..c0efa18 100644
--- a/pdf2htmlEX/build.gradle.kts
+++ b/pdf2htmlEX/build.gradle.kts
@@ -8,11 +8,11 @@ group = rootProject.group
 // Hardcode a list of available versions
 val portVersion = when(project.findProperty("packageVersion")) {
     "0.18.7-poppler-0.81.0" -> {
-        version = "0.18.7-poppler-0.81.0-beta-2"
+        version = "0.18.7-poppler-0.81.0-beta-3"
         "0.18.7-poppler-0.81.0"
     }
     else /* "0.18.8.rc1" */ -> {
-        version = "0.18.8.rc1-beta-1"
+        version = "0.18.8.rc1-beta-2"
         "0.18.8.rc1"
     }
 }
@@ -30,11 +30,11 @@ dependencies {
 
     when (portVersion) {
         "0.18.7-poppler-0.81.0" -> {
-            implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}-static:20170731-beta-4")
+            implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}-static:20170731-beta-5")
             implementation("com.viliussutkus89.ndk.thirdparty:poppler${ndkVersionSuffix}-static:0.81.0-beta-3")
         }
         "0.18.8.rc1" -> {
-            implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}-static:20200314-beta-7")
+            implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}-static:20200314-beta-8")
             implementation("com.viliussutkus89.ndk.thirdparty:poppler${ndkVersionSuffix}-static:0.89.0-beta-3")
         }
     }