Update pango prefab dependencies

Add pangocairo (instead of just pango) to fontforge.pc
ViliusSutkus89 · Dec 25, 2023 · fa8caca · fa8caca
1 parent 78d23d5
commit fa8caca
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/fontforge/build.gradle.kts b/fontforge/build.gradle.kts
@@ -9,15 +9,15 @@ group = rootProject.group
 // Hardcode a list of available versions
 val portVersion = when(project.findProperty("packageVersion")) {
     "20170731" -> {
-        version = "20170731-beta-8"
+        version = "20170731-beta-9"
         "20170731"
     }
     "20200314" -> {
-        version = "20200314-beta-13"
+        version = "20200314-beta-14"
         "20200314"
     }
     else /* "20230101" */ -> {
-        version = "20230101-beta-13"
+        version = "20230101-beta-14"
         "20230101"
     }
 }
@@ -47,7 +47,7 @@ dependencies {
     implementation("com.viliussutkus89.ndk.thirdparty:libuninameslist${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20230916-beta-3")
     implementation("com.viliussutkus89.ndk.thirdparty:libxml2${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:2.12.3-beta-2")
     implementation("com.viliussutkus89.ndk.thirdparty:spiro${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20221101-beta-3")
-    implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:1.51.0-beta-7")
+    implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:1.51.0-beta-8")
 
     if (portVersion != "20170731") {
         // libfontforge checks for TIFFRewriteField , which was deprecated in libtiff-4
@@ -295,7 +295,7 @@ when (portVersion) {
                         // Add Missing Requires:
                         .replace(
                             "Requires:",
-                            "Requires: freetype2 intl gio-2.0 libxml-2.0 pango"
+                            "Requires: freetype2 intl gio-2.0 libxml-2.0 pangocairo"
                         )
                         // Pull dependencies as Requires:, instead of Libs:
                         .replace("-ljpeg", "")
@@ -310,7 +310,7 @@ when (portVersion) {
                         // Add Missing Requires:
                         .replace(
                             "Requires:",
-                            "Requires: freetype2 intl gio-2.0 libxml-2.0 pango"
+                            "Requires: freetype2 intl gio-2.0 libxml-2.0 pangocairo"
                         )
                         // Pull dependencies as Requires:, instead of Libs:
                         .replace("-ljpeg", "")
@@ -455,7 +455,7 @@ tasks.prefabPackage {
                         "//proxy-libintl:intl",
                         "//glib2:gio-2.0",
                         "//libxml2:xml2",
-                        "//pango:pango-1.0",
+                        "//pango:pangocairo-1.0",
                         "//cairo:cairo",
                     ))
                 }
@@ -478,7 +478,7 @@ tasks.prefabPackage {
                         "//proxy-libintl:intl",
                         "//glib2:gio-2.0",
                         "//libxml2:xml2",
-                        "//pango:pango-1.0",
+                        "//pango:pangocairo-1.0",
                         "//cairo:cairo",
                     ))
                 }
@@ -511,7 +511,7 @@ tasks.prefabPackage {
                         "//proxy-libintl:intl",
                         "//glib2:gio-2.0",
                         "//libxml2:xml2",
-                        "//pango:pango-1.0",
+                        "//pango:pangocairo-1.0",
                         "//cairo:cairo",
                         "//libtiff:tiff",
                     ))
@@ -533,7 +533,7 @@ tasks.prefabPackage {
                         "//proxy-libintl:intl",
                         "//glib2:gio-2.0",
                         "//libxml2:xml2",
-                        "//pango:pango-1.0",
+                        "//pango:pangocairo-1.0",
                         "//cairo:cairo",
                         "//libtiff:tiff",
                     ))

diff --git a/fontforge/patches/20200314/libfontforge.pc b/fontforge/patches/20200314/libfontforge.pc
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 Name: libfontforge
 Description: a font manipulation library.
 Version: 20200314
-Requires: libturbojpeg libpng16 libspiro libuninameslist freetype2 intl gio-2.0 libxml-2.0 pango libtiff-4 openlibm
+Requires: libturbojpeg libpng16 libspiro libuninameslist freetype2 intl gio-2.0 libxml-2.0 pangocairo libtiff-4 openlibm
 Requires.private:  cairo zlib
 Libs: -L${libdir} -lfontforge
 Libs.private: -L${libdir} -lltdl -lm

diff --git a/fontforge/patches/20230101/libfontforge.pc b/fontforge/patches/20230101/libfontforge.pc
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 Name: libfontforge
 Description: a font manipulation library.
 Version: 20230101
-Requires: libturbojpeg libpng16 libspiro libuninameslist freetype2 intl gio-2.0 libxml-2.0 pango libtiff-4 openlibm
+Requires: libturbojpeg libpng16 libspiro libuninameslist freetype2 intl gio-2.0 libxml-2.0 pangocairo libtiff-4 openlibm
 Requires.private:  cairo zlib
 Libs: -L${libdir} -lfontforge
 Libs.private: -L${libdir} -lltdl -lm

diff --git a/pango/build.gradle.kts b/pango/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 group = rootProject.group
 
 val portVersion = "1.51.0"
-version = "1.51.0-beta-7"
+version = "1.51.0-beta-8"
 
 plugins {
     id("maven-publish")
@@ -108,8 +108,8 @@ tasks.prefabPackage {
             static.set(project.findProperty("libraryType") == "static")
             dependencies.set(listOf(
                 "m",
-                ":pango",
-                ":pangoft2",
+                ":pango-1.0",
+                ":pangoft2-1.0",
                 "//glib2:glib-2.0",
                 "//glib2:gobject-2.0",
                 "//glib2:gio-2.0",
@@ -124,7 +124,7 @@ tasks.prefabPackage {
             static.set(project.findProperty("libraryType") == "static")
             dependencies.set(listOf(
                 "m",
-                ":pango",
+                ":pango-1.0",
                 "//glib2:glib-2.0",
                 "//glib2:gobject-2.0",
                 "//glib2:gio-2.0",

diff --git a/pdf2htmlEX/build.gradle.kts b/pdf2htmlEX/build.gradle.kts
@@ -8,16 +8,16 @@ 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-7"
+        version = "0.18.7-poppler-0.81.0-beta-8"
         "0.18.7-poppler-0.81.0"
     }
     "0.18.8.rc1" -> {
-        version = "0.18.8.rc1-beta-7"
+        version = "0.18.8.rc1-beta-8"
         "0.18.8.rc1"
     }
     // https://github.com/pdf2htmlEX/pdf2htmlEX/pull/154 Hoping it will be named rc2
     else /* "0.18.8.rc2" */ -> {
-        version = "0.18.8.rc2-beta-5"
+        version = "0.18.8.rc2-beta-6"
         "0.18.8.rc2"
     }
 }
@@ -36,15 +36,15 @@ dependencies {
 
     when (portVersion) {
         "0.18.7-poppler-0.81.0" -> {
-            implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20170731-beta-8")
+            implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20170731-beta-9")
             implementation("com.viliussutkus89.ndk.thirdparty:poppler${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:0.81.0-beta-6")
         }
         "0.18.8.rc1" -> {
-            implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20200314-beta-13")
+            implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20200314-beta-14")
             implementation("com.viliussutkus89.ndk.thirdparty:poppler${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:0.89.0-beta-7")
         }
         "0.18.8.rc2" -> {
-            implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20230101-beta-13")
+            implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20230101-beta-14")
             implementation("com.viliussutkus89.ndk.thirdparty:poppler${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:23.12.0-beta-5")
         }
     }