Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fontconfig] fix dll name in def file #14946

Merged
merged 2 commits into from
Dec 8, 2020
Merged

[fontconfig] fix dll name in def file #14946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
387ca5f
[fontconfig] fix dll name in def file
Neumann-A Dec 4, 2020
890e315
make the patch conditional
Neumann-A Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/fontconfig/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
13 changes: 13 additions & 0 deletions ports/fontconfig/fix_def_dll_name.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-@[email protected]; \
+ echo LIBRARY fontconfig-@[email protected]; \
echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@
@ ! $(GREP) -q FcERROR $@ || ($(RM) $@; false)

5 changes: 5 additions & 0 deletions ports/fontconfig/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -10,6 +14,7 @@ vcpkg_from_gitlab(
PATCHES remove_tests.patch
build.patch
build2.patch
${PATCHES}
)

vcpkg_find_acquire_program(GPERF)
Expand Down