Update libfontforge to 20190801. Adds libuninameslist dependency, removes the need for one patch (upstreamed)

Author: ViliusSutkus89

3rdparty/packages/FixFontforgeSource.sh

@@ -12,13 +12,3 @@ BASEDIR=$(dirname "$THIS_FILE")
 #endif /* __ANDROID_API__ >= 26 */
 patch $1/gutils/fsys.c < ${BASEDIR}/libfontforgeFsys.patch
 
-# Fix sent upstream:
-# https://github.com/fontforge/fontforge/pull/3746
-#
-# android-ndk-r20/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/langinfo.h:char*
-# if __ANDROID_API__ >= 26
-# char* nl_langinfo(nl_item __item) __INTRODUCED_IN(26);
-# char* nl_langinfo_l(nl_item __item, locale_t __l) __INTRODUCED_IN(26);
-# #endif /* __ANDROID_API__ >= 26 */
-
-patch $1/fontforge/noprefs.c < ${BASEDIR}/libfontforgeNoprefs.patch

3rdparty/packages/libfontforge.cmake

@@ -26,10 +26,10 @@ if (ANDROID)
 endif()
 
 ExternalProjectAutotools(libfontforge
-  DEPENDS freetype glib-2.0 iconv libintl libjpeg libxml-2.0 zlib
+  DEPENDS libuninameslist freetype glib-2.0 iconv libintl libjpeg libxml-2.0 zlib
 
-  URL https://github.com/fontforge/fontforge/releases/download/20190413/fontforge-20190413.tar.gz
-  URL_HASH SHA256=6762a045aba3d6ff1a7b856ae2e1e900a08a8925ccac5ebf24de91692b206617
+  URL https://github.com/fontforge/fontforge/releases/download/20190801/fontforge-20190801.tar.gz
+  URL_HASH SHA256=d92075ca783c97dc68433b1ed629b9054a4b4c74ac64c54ced7f691540f70852
   CONFIGURE_ARGUMENTS ${FONTFORGE_BUILD_PROGRAMS_ARGUMENT}
 
     # libfontforge checks for TIFFRewriteField , which was deprecated in libtiff-4
@@ -49,6 +49,4 @@ ExternalProjectAutotools(libfontforge
   # Fix after install
     TEST_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/packages/FixFontforgeInstall.sh ${THIRDPARTY_PREFIX}
     LOG_TEST 1
-
-  ${FONTFORGE_STATIC}
 )

3rdparty/packages/libfontforgeNoprefs.patch

@@ -0,0 +1,6 @@
+include_guard(GLOBAL)
+
+ExternalProjectAutotools(libuninameslist
+  URL https://github.com/fontforge/libuninameslist/releases/download/20190701/libuninameslist-dist-20190701.tar.gz
+  URL_HASH SHA256=168b0d0877f275c1622fd075e6a1d072c52113dcf5da530536a2f2803ebb89a1
+)

3rdparty/packages/libuninameslist.cmake

@@ -111,7 +111,7 @@ void ffw_finalize(void)
 
 long ffw_get_version(void)
 {
-    return FONTFORGE_VERSIONDATE_RAW;
+    return FONTFORGE_VERSION;
 }
 
 void ffw_new_font()