forked from jralls/gtk-osx-build
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update pango to 1.44.7 and patch out freetype2 fallback.
Because freetype2 is supposed to be needed only when fontconfig is built. The freetype2 they're falling back to is furthermore obsolete because it requires harfbuzz to be built with freetype2 support--which of course requires first building freetype2 without harfbuzz support.
- Loading branch information
Showing
3 changed files
with
17 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
--- Development/gtk-build/gtk-stable-10.13-x86_64/src/pango-1.44.7/meson.build~ 2019-10-24 20:45:11.000000000 -0700 | ||
+++ Development/gtk-build/gtk-stable-10.13-x86_64/src/pango-1.44.7/meson.build 2019-11-07 14:16:07.000000000 -0800 | ||
@@ -308,8 +308,8 @@ | ||
|
||
# The first version of freetype with a pkg-config file is 2.1.5 | ||
# We require both fontconfig and freetype if we are to have either. | ||
-freetype_dep = dependency('freetype2', required: false, | ||
- fallback: ['freetype2', 'freetype_dep']) | ||
+freetype_dep = dependency('freetype2', required: false) | ||
+# fallback: ['freetype2', 'freetype_dep']) | ||
|
||
if freetype_dep.found() | ||
freetype2_pc = 'freetype2' |