Skip to content

Commit

Permalink
Update pango to 1.44.7 and patch out freetype2 fallback.
Browse files Browse the repository at this point in the history
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
jralls committed Nov 7, 2019
1 parent 6c2c9e0 commit de8befb
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
5 changes: 3 additions & 2 deletions modulesets-stable/gtk-osx.modules
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,9 @@
</meson>

<meson id="pango">
<branch version="1.44.6" module="pango/1.44/pango-1.44.6.tar.xz"
hash="sha256:3e1e41ba838737e200611ff001e3b304c2ca4cdbba63d200a20db0b0ddc0f86c">
<branch version="1.44.7" module="pango/1.44/pango-1.44.7.tar.xz"
hash="sha256:66a5b6cc13db73efed67b8e933584509f8ddb7b10a8a40c3850ca4a985ea1b1f">
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/pango-1.44.7-freetype.patch" strip="1"/>
</branch>
<dependencies>
<dep package="glib"/>
Expand Down
3 changes: 1 addition & 2 deletions modulesets/gtk-osx.modules
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,8 @@
</dependencies>
</meson>

<!-- Pango seems to be releasing from master these days. -->
<meson id="pango">
<branch tag="1.44.6"/>
<branch tag="pango-1-44"/>
<dependencies>
<dep package="glib"/>
<dep package="cairo"/>
Expand Down
13 changes: 13 additions & 0 deletions patches/pango-1.44.7-freetype.patch
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'

0 comments on commit de8befb

Please sign in to comment.