Update FontForge patches and POM

ViliusSutkus89 · Nov 3, 2023 · 2277197 · 2277197
1 parent 8ad45fa
commit 2277197
Show file tree

Hide file tree

Showing 19 changed files with 815 additions and 368 deletions.
diff --git a/fontforge/build.gradle.kts b/fontforge/build.gradle.kts
diff --git a/fontforge/patches/file_offset_bits.patch → ...e/patches/20170731/file_offset_bits.patch b/fontforge/patches/file_offset_bits.patch → ...e/patches/20170731/file_offset_bits.patch
diff --git a/fontforge/patches/fontforge-http.patch → ...rge/patches/20170731/fontforge-http.patch b/fontforge/patches/fontforge-http.patch → ...rge/patches/20170731/fontforge-http.patch
diff --git a/...tches/fontforge-noprefs.NL_LANGINFO.patch → ...70731/fontforge-noprefs.NL_LANGINFO.patch b/...tches/fontforge-noprefs.NL_LANGINFO.patch → ...70731/fontforge-noprefs.NL_LANGINFO.patch
diff --git a/...rgeexe-startnoui.FindOrMakeEncoding.patch → ...rgeexe-startnoui.FindOrMakeEncoding.patch b/...rgeexe-startnoui.FindOrMakeEncoding.patch → ...rgeexe-startnoui.FindOrMakeEncoding.patch
diff --git a/fontforge/patches/gutils-fsys.patch → fontforge/patches/20170731/gutils-fsys.patch b/fontforge/patches/gutils-fsys.patch → fontforge/patches/20170731/gutils-fsys.patch
@@ -1,5 +1,5 @@
---- fsys.c	2017-07-22 05:00:39.154250006 -0000
-+++ fsys.c	2019-09-23 02:35:01.093000000 -0000
+--- gutils/fsys.c	2017-07-22 05:00:39.154250006 -0000
++++ gutils/fsys.c	2019-09-23 02:35:01.093000000 -0000
 @@ -175,6 +175,11 @@
  return buffer;
      }

diff --git a/...atches/gutils-gio.no-pthread-cancel.patch → ...170731/gutils-gio.no-pthread-cancel.patch b/...atches/gutils-gio.no-pthread-cancel.patch → ...170731/gutils-gio.no-pthread-cancel.patch
diff --git a/fontforge/patches/gutils-gutils.patch → ...orge/patches/20170731/gutils-gutils.patch b/fontforge/patches/gutils-gutils.patch → ...orge/patches/20170731/gutils-gutils.patch
diff --git a/fontforge/patches/lib-localtime-buffer.patch → ...tches/20170731/lib-localtime-buffer.patch b/fontforge/patches/lib-localtime-buffer.patch → ...tches/20170731/lib-localtime-buffer.patch
diff --git a/fontforge/patches/localeconv.patch → fontforge/patches/20170731/localeconv.patch b/fontforge/patches/localeconv.patch → fontforge/patches/20170731/localeconv.patch
diff --git a/fontforge/patches/20200314/FindGLib.patch b/fontforge/patches/20200314/FindGLib.patch
@@ -0,0 +1,24 @@
+--- cmake/packages/FindGLIB.cmake	2019-11-13 11:00:19.000000000 +0200
++++ cmake/packages/FindGLIB.cmake	2023-11-03 07:49:34.466000000 +0200
+@@ -126,7 +126,8 @@
+   set_property(TARGET GLIB::GLIB PROPERTY
+                INTERFACE_INCLUDE_DIRECTORIES "${GLIB_INCLUDE_DIRS}")
+   set_property(TARGET GLIB::GLIB PROPERTY
+-               INTERFACE_LINK_LIBRARIES "${GLIB_LIBRARIES}")
++               INTERFACE_LINK_LIBRARIES "${PC_GLIB_LIBRARIES}")
++  set_property(TARGET GLIB::GLIB PROPERTY INTERFACE_LINK_DIRECTORIES "${PC_GLIB_LIBDIR}")
+   if(DEFINED GLIB_GIO_LIBRARIES)
+     set_property(TARGET GLIB::GLIB APPEND PROPERTY
+                  INTERFACE_LINK_LIBRARIES "${GLIB_GIO_LIBRARIES}")
+
+--- CMakeLists.txt	2020-03-14 06:01:25.000000000 +0200
++++ CMakeLists.txt	2023-11-03 07:53:25.053000000 +0200
+@@ -99,7 +99,7 @@
+ find_package(Freetype 2.3.7 REQUIRED)
+ find_package(Gettext REQUIRED)
+ find_package_with_target(Intl REQUIRED)
+-find_package(GLIB 2.6 REQUIRED COMPONENTS gio)
++find_package(GLIB 2.6 REQUIRED COMPONENTS gio gobject gmodule)
+ find_package(Iconv REQUIRED)
+ find_package(LibXml2 REQUIRED)
+ find_package(MathLib REQUIRED)
diff --git a/fontforge/patches/20200314/InstallLibrary.patch b/fontforge/patches/20200314/InstallLibrary.patch
@@ -0,0 +1,42 @@
+--- fontforge/CMakeLists.txt	2020-01-27 10:39:51.000000000 +0200
++++ fontforge/CMakeLists.txt	2023-11-03 10:04:11.517000000 +0200
+@@ -112,8 +112,6 @@
+ )
+
+ add_library(fontforge
+-  ${FONTFORGE_NOINST_HEADERS}
+-  ${FONTFORGE_INST_HEADERS}
+   activeinui.c
+   asmfpst.c
+   autohint.c
+@@ -209,6 +207,9 @@
+   zapfnomen.c
+ )
+
++set_target_properties(fontforge PROPERTIES PUBLIC_HEADER "${FONTFORGE_INST_HEADERS}")
++set_target_properties(fontforge PROPERTIES PRIVATE_HEADER "${FONTFORGE_NOINST_HEADERS}")
++
+ if(ENABLE_WOFF2_RESULT)
+   target_sources(fontforge PRIVATE woff2.cc)
+ endif()
+@@ -269,11 +270,13 @@
+   target_link_libraries(fontforge PRIVATE gunicode gutils)
+ endif()
+
+-# No dev package -> no need to install if static
+-if(BUILD_SHARED_LIBS)
+-  if(WIN32)
+-    install(TARGETS fontforge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-  else()
+-    install(TARGETS fontforge RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-  endif()
++if(WIN32)
++  install(TARGETS fontforge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++else()
++  install(TARGETS fontforge
++    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++  )
+ endif()
diff --git a/fontforge/patches/20200314/gutils-fsys.patch b/fontforge/patches/20200314/gutils-fsys.patch
@@ -0,0 +1,24 @@
+--- gutils/fsys.c	2017-07-22 05:00:39.154250006 -0000
++++ gutils/fsys.c	2019-09-23 02:35:01.093000000 -0000
+@@ -175,6 +175,11 @@
+ return buffer;
+     }
+ return NULL;
++#elif defined(__ANDROID__)
++    static char *dir;
++    dir = getenv("HOME");
++    if ( dir!=NULL )
++	return( copy(dir) );
+ #else
+     static char *dir;
+     uid_t uid;
+@@ -893,6 +898,9 @@
+ return dir;
+ 	}
+ return NULL;
++#elif defined(__ANDROID__)
++	char *home = getenv("HOME");
++  return home;
+ #else
+ 	uid_t uid;
+ 	struct passwd *pw;
diff --git a/fontforge/patches/20200314/include-iconv.patch b/fontforge/patches/20200314/include-iconv.patch
@@ -0,0 +1,10 @@
+--- inc/CMakeLists.txt	2019-11-13 11:00:19.000000000 +0200
++++ inc/CMakeLists.txt	2023-11-03 07:30:10.325000000 +0200
+@@ -15,6 +15,7 @@
+ target_link_libraries(fontforge_common_headers
+   INTERFACE
+     GLIB::GLIB
++    Iconv::Iconv
+ )
+
+ if(ENABLE_CODE_COVERAGE_RESULT)
diff --git a/fontforge/patches/20200314/pie.patch b/fontforge/patches/20200314/pie.patch
@@ -0,0 +1,27 @@
+--- gutils/CMakeLists.txt	2019-11-13 11:00:19.000000000 +0200
++++ gutils/CMakeLists.txt	2023-11-03 08:16:14.105000000 +0200
+@@ -33,9 +33,7 @@
+   unicodelibinfo.c
+ )
+
+-if(BUILD_SHARED_LIBS)
+-  set_property(TARGET gutils PROPERTY POSITION_INDEPENDENT_CODE ON)
+-endif()
++set_property(TARGET gutils PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+ if(ENABLE_LIBGIF_RESULT)
+   list(APPEND gutils_LIBRARIES GIF::GIF)
+
+--- Unicode/CMakeLists.txt	2020-03-03 11:24:02.000000000 +0200
++++ Unicode/CMakeLists.txt	2023-11-03 07:33:25.986000000 +0200
+@@ -43,9 +43,7 @@
+   charset/ZapfDingbats.c
+ )
+
+-if(BUILD_SHARED_LIBS)
+-  set_property(TARGET gunicode PROPERTY POSITION_INDEPENDENT_CODE ON)
+-endif()
++set_property(TARGET gunicode PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+ if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
+   make_object_interface(gunicode
diff --git a/fontforge/patches/20230101/FindGLib.patch b/fontforge/patches/20230101/FindGLib.patch
@@ -0,0 +1,24 @@
+--- cmake/packages/FindGLIB.cmake	2019-11-13 11:00:19.000000000 +0200
++++ cmake/packages/FindGLIB.cmake	2023-11-03 07:49:34.466000000 +0200
+@@ -126,7 +126,8 @@
+   set_property(TARGET GLIB::GLIB PROPERTY
+                INTERFACE_INCLUDE_DIRECTORIES "${GLIB_INCLUDE_DIRS}")
+   set_property(TARGET GLIB::GLIB PROPERTY
+-               INTERFACE_LINK_LIBRARIES "${GLIB_LIBRARIES}")
++               INTERFACE_LINK_LIBRARIES "${PC_GLIB_LIBRARIES}")
++  set_property(TARGET GLIB::GLIB PROPERTY INTERFACE_LINK_DIRECTORIES "${PC_GLIB_LIBDIR}")
+   if(DEFINED GLIB_GIO_LIBRARIES)
+     set_property(TARGET GLIB::GLIB APPEND PROPERTY
+                  INTERFACE_LINK_LIBRARIES "${GLIB_GIO_LIBRARIES}")
+
+--- CMakeLists.txt 2023-11-03 10:06:29.967000000 +0200
++++ CMakeLists.txt 2023-11-03 10:08:14.996000000 +0200
+@@ -109,7 +109,7 @@
+ find_package(Gettext REQUIRED)
+ find_package_with_target(Intl REQUIRED)
+ if(UNIX AND NOT APPLE)
+-  find_package(GLIB 2.6 REQUIRED COMPONENTS gio gobject)
++  find_package(GLIB 2.6 REQUIRED COMPONENTS gio gobject gmodule)
+ else()
+   find_package(GLIB 2.58 REQUIRED COMPONENTS gio gobject)
+ endif()
diff --git a/fontforge/patches/20230101/InstallLibrary.patch b/fontforge/patches/20230101/InstallLibrary.patch
@@ -0,0 +1,42 @@
+--- fontforge/CMakeLists.txt	2020-01-27 10:39:51.000000000 +0200
++++ fontforge/CMakeLists.txt	2023-11-03 10:04:11.517000000 +0200
+@@ -112,8 +112,6 @@
+ )
+
+ add_library(fontforge
+-  ${FONTFORGE_NOINST_HEADERS}
+-  ${FONTFORGE_INST_HEADERS}
+   activeinui.c
+   asmfpst.c
+   autohint.c
+@@ -209,6 +207,9 @@
+   zapfnomen.c
+ )
+
++set_target_properties(fontforge PROPERTIES PUBLIC_HEADER "${FONTFORGE_INST_HEADERS}")
++set_target_properties(fontforge PROPERTIES PRIVATE_HEADER "${FONTFORGE_NOINST_HEADERS}")
++
+ if(ENABLE_WOFF2_RESULT)
+   target_sources(fontforge PRIVATE woff2.cc)
+ endif()
+@@ -269,11 +270,13 @@
+   target_link_libraries(fontforge PRIVATE gunicode gutils)
+ endif()
+
+-# No dev package -> no need to install if static
+-if(BUILD_SHARED_LIBS)
+-  if(WIN32 OR CYGWIN)
+-    install(TARGETS fontforge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-  else()
+-    install(TARGETS fontforge RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-  endif()
++if(WIN32)
++  install(TARGETS fontforge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++else()
++  install(TARGETS fontforge
++    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++  )
+ endif()
diff --git a/fontforge/patches/20230101/gutils-fsys.patch b/fontforge/patches/20230101/gutils-fsys.patch
@@ -0,0 +1,24 @@
+--- gutils/fsys.c	2017-07-22 05:00:39.154250006 -0000
++++ gutils/fsys.c	2019-09-23 02:35:01.093000000 -0000
+@@ -175,6 +175,11 @@
+ return buffer;
+     }
+ return NULL;
++#elif defined(__ANDROID__)
++    static char *dir;
++    dir = getenv("HOME");
++    if ( dir!=NULL )
++	return( copy(dir) );
+ #else
+     static char *dir;
+     uid_t uid;
+@@ -893,6 +898,9 @@
+ return dir;
+ 	}
+ return NULL;
++#elif defined(__ANDROID__)
++	char *home = getenv("HOME");
++  return home;
+ #else
+ 	uid_t uid;
+ 	struct passwd *pw;
diff --git a/fontforge/patches/20230101/pie.patch b/fontforge/patches/20230101/pie.patch
@@ -0,0 +1,27 @@
+--- gutils/CMakeLists.txt	2019-11-13 11:00:19.000000000 +0200
++++ gutils/CMakeLists.txt	2023-11-03 08:16:14.105000000 +0200
+@@ -33,9 +33,7 @@
+   unicodelibinfo.c
+ )
+
+-if(BUILD_SHARED_LIBS)
+-  set_property(TARGET gutils PROPERTY POSITION_INDEPENDENT_CODE ON)
+-endif()
++set_property(TARGET gutils PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+ if(ENABLE_LIBGIF_RESULT)
+   list(APPEND gutils_LIBRARIES GIF::GIF)
+
+--- Unicode/CMakeLists.txt	2020-03-03 11:24:02.000000000 +0200
++++ Unicode/CMakeLists.txt	2023-11-03 07:33:25.986000000 +0200
+@@ -43,9 +43,7 @@
+   charset/ZapfDingbats.c
+ )
+
+-if(BUILD_SHARED_LIBS)
+-  set_property(TARGET gunicode PROPERTY POSITION_INDEPENDENT_CODE ON)
+-endif()
++set_property(TARGET gunicode PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+ if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
+   make_object_interface(gunicode