[fontconfig] fix dll name in def file (#14946)

* [fontconfig] fix dll name in def file * make the patch conditional
microsoft · Dec 8, 2020 · 5dcfd3e · 5dcfd3e
1 parent fc05ba6
commit 5dcfd3e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL
@@ -1,5 +1,6 @@
 Source: fontconfig
 Version: 2.13.1
+Port-Version: 1
 Homepage: https://www.freedesktop.org/software/fontconfig/front.html
 Description: Library for configuring and customizing font access.
 Build-Depends: freetype, expat, libiconv, dirent, pthread, json-c, dirent, libuuid (!windows&!osx), gettext
diff --git a/ports/fontconfig/fix_def_dll_name.patch b/ports/fontconfig/fix_def_dll_name.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3cf93a7f8..c80f4dd83 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -218,7 +218,7 @@ fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES)
+ 	(cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \
+ 	$(GREP) '^Fc[^ ]* *(' | $(SED) -e 's/ *(.*$$//' -e 's/^/	/' | \
+ 	sort; \
+-	echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
++	echo LIBRARY fontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
+ 	echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@
+ 	@ ! $(GREP) -q FcERROR $@ || ($(RM) $@; false)
+
diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake
@@ -1,5 +1,9 @@
 set(FONTCONFIG_VERSION 2.13.1)
 
+if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS)
+    set(PATCHES fix_def_dll_name.patch)
+endif()
+
 vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.freedesktop.org
     OUT_SOURCE_PATH SOURCE_PATH
@@ -10,6 +14,7 @@ vcpkg_from_gitlab(
     PATCHES remove_tests.patch
             build.patch
             build2.patch
+            ${PATCHES}
 )
 
 vcpkg_find_acquire_program(GPERF)