[gtk-osx] Remove the Freetype, Fontconfig, and Harfbuzz dependencies.

[John Ralls <jralls src gnome org>]

commit 5b522924c26e59e23f090c27f20ca2997a1159f1
Author: John Ralls <jralls ceridwen us>
Date:   Thu Oct 15 14:40:37 2015 -0700

    Remove the Freetype, Fontconfig, and Harfbuzz dependencies.
    
    From Cairo, Pango, and Webkit-1.10. Modern Cairo and Pango work with Quartz
    fonts so it's not necessary; Webkit makes no pango_ft2 call so it doesn't
    need it either.

 modulesets-stable/gtk-osx-unsupported.modules      |    6 ++++--
 modulesets-stable/gtk-osx.modules                  |    2 --
 modulesets-unstable/gtk-osx-unsupported.modules    |    3 ++-
 modulesets/gtk-osx-unsupported.modules             |    3 ++-
 .../webkit-1.10-remove-pangoft2-dependency.patch   |   16 ++++++++++++++++
 .../webkit-1.6.-remove-pangoft2-dependency.patch   |   14 ++++++++++++++
 6 files changed, 38 insertions(+), 6 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index efb9ec8..5bb649c 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -228,12 +228,13 @@
              strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-pango-includes.patch";
              strip="1"/>
+      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-remove-pangoft2-dependency.patch";
+             strip="1"/>
     </branch>
     <dependencies>
       <dep package="enchant"/>
       <dep package="icu"/>
       <dep package="libsoup"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-core"/>
@@ -253,7 +254,8 @@
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-gnome-3.6-fixup.patch"; 
strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-clang-fixup.patch"; 
strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-out-of-source-fixup.patch"; 
strip="1"/>
-
+      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-remove-pangoft2-dependency.patch";
+             strip="1"/>
     </branch>
     <dependencies>
       <dep package="enchant"/>
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index cd1c5c2..7a5340a 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -234,8 +234,6 @@
     </branch>
     <dependencies>
       <dep package="pixman"/>
-      <dep package="fontconfig"/>
-      <dep package="freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index 248f3db..7436d77 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -189,12 +189,13 @@
              strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-pango-includes.patch";
              strip="1"/>
+      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-remove-pangoft2-dependency.patch";
+             strip="1"/>
     </branch>
     <dependencies>
       <dep package="enchant"/>
       <dep package="icu"/>
       <dep package="libsoup"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-core"/>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 046e94f..d851463 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -198,12 +198,13 @@
              strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-pango-includes.patch";
              strip="1"/>
+      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-remove-pangoft2-dependency.patch";
+             strip="1"/>
     </branch>
     <dependencies>
       <dep package="libsoup"/>
       <dep package="enchant"/>
       <dep package="icu"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-core"/>
diff --git a/patches/webkit-1.10-remove-pangoft2-dependency.patch 
b/patches/webkit-1.10-remove-pangoft2-dependency.patch
new file mode 100644
index 0000000..e82c24d
--- /dev/null
+++ b/patches/webkit-1.10-remove-pangoft2-dependency.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac    Apr  6 17:36:15 2015
++++ b/configure.ac     Thu Oct 15 12:28:08 2015
+@@ -452,9 +452,8 @@
+ AC_SUBST(LIBXML_CFLAGS)
+ AC_SUBST(LIBXML_LIBS)
+ 
+-PKG_CHECK_MODULES(PANGO, 
+-                  [pango >= $PANGO_REQUIRED_VERSION
+-                   pangoft2])
++PKG_CHECK_MODULES(PANGO,
++                  [pango >= $PANGO_REQUIRED_VERSION])
+ AC_SUBST(PANGO_CFLAGS)
+ AC_SUBST(PANGO_LIBS)
+ 
+
+Diff finished.  Thu Oct 15 14:27:48 2015
diff --git a/patches/webkit-1.6.-remove-pangoft2-dependency.patch 
b/patches/webkit-1.6.-remove-pangoft2-dependency.patch
new file mode 100644
index 0000000..29fc44b
--- /dev/null
+++ b/patches/webkit-1.6.-remove-pangoft2-dependency.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac     Sun Oct  4 15:11:53 2015
++++ b/configure.ac     Thu Oct 15 14:59:04 2015
+@@ -292,9 +292,8 @@
+ AC_SUBST(LIBXML_CFLAGS)
+ AC_SUBST(LIBXML_LIBS)
+ 
+-PKG_CHECK_MODULES(PANGO, 
+-                  [pango >= $PANGO_REQUIRED_VERSION
+-                   pangoft2])
++PKG_CHECK_MODULES(PANGO,
++                  [pango >= $PANGO_REQUIRED_VERSION])
+ AC_SUBST(PANGO_CFLAGS)
+ AC_SUBST(PANGO_LIBS)
+