[gtk-osx: 7/7] Update pango to 1.44.7 and patch out freetype2 fallback.

[John Ralls <jralls src gnome org>]

commit de8befba6a1a05994df67ab7f886798a9d7f1910
Author: John Ralls <jralls ceridwen us>
Date:   Thu Nov 7 15:47:24 2019 -0800

    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.

 modulesets-stable/gtk-osx.modules   |  5 +++--
 modulesets/gtk-osx.modules          |  3 +--
 patches/pango-1.44.7-freetype.patch | 13 +++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index df8d95c..81c66e8 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -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"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index e4d5ded..bea740e 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -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"/>
diff --git a/patches/pango-1.44.7-freetype.patch b/patches/pango-1.44.7-freetype.patch
new file mode 100644
index 0000000..54c0762
--- /dev/null
+++ b/patches/pango-1.44.7-freetype.patch
@@ -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'