Fix build with newer freetype2.

Thank you, wiz@ and mef@.

4 files changed, 31 insertions, 15 deletions

diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 33d1a615f8e..a83cd0e99ea 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.163 2015/08/29 12:42:55 ryoon Exp $
+$NetBSD: distinfo,v 1.164 2015/09/07 15:19:10 ryoon Exp $
 
 SHA1 (thunderbird-38.2.0.source.tar.bz2) = 0e27c54ee63b71cd7e8ff4fd87bbe66e0a16ffc1
 RMD160 (thunderbird-38.2.0.source.tar.bz2) = 62d8388cf8998bd051ee6b899a98883dd278d85b
@@ -39,7 +39,7 @@ SHA1 (patch-mozilla_config_baseconfig.mk) = e8594d03d0db21e0731d85dcdb38ab9c465e
 SHA1 (patch-mozilla_config_external_moz.build) = ee26e7573fe6d6c7f6e8497d8d1f928174ce4a36
 SHA1 (patch-mozilla_config_stl__wrappers_ios) = 066a9f3db9203afa8131b2ff91d212033e5950e0
 SHA1 (patch-mozilla_config_stl__wrappers_ostream) = 67559c5ab17088680b86dea6b081a48b781f59b5
-SHA1 (patch-mozilla_config_system-headers) = c7d50fbc0d7fd3bad6fc3a0d4c662fda896652ea
+SHA1 (patch-mozilla_config_system-headers) = 2b66e88ad46cf4e7c0b8a663c615b272a475dc59
 SHA1 (patch-mozilla_config_system__wrappers_unwind.h) = 32d4ab3fbf80bf19783dab7c4a875a7262f419cf
 SHA1 (patch-mozilla_dom_base_moz.build) = dce93f4c00bb662d5c702b442ee169bb8888237d
 SHA1 (patch-mozilla_dom_media_AudioStream.h) = b5092adaf26c8c1809b4ad62eb92be101c07ac88
diff --git a/mail/thunderbird/patches/patch-mozilla_config_system-headers b/mail/thunderbird/patches/patch-mozilla_config_system-headers
index 7cc78b05a40..f1a7a14b17d 100644
--- a/mail/thunderbird/patches/patch-mozilla_config_system-headers
+++ b/mail/thunderbird/patches/patch-mozilla_config_system-headers
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_config_system-headers,v 1.5 2015/07/09 15:17:34 ryoon Exp $
+$NetBSD: patch-mozilla_config_system-headers,v 1.6 2015/09/07 15:19:10 ryoon Exp $
 
---- mozilla/config/system-headers.orig	2015-06-08 17:49:23.000000000 +0000
+--- mozilla/config/system-headers.orig	2015-08-13 14:57:14.000000000 +0000
 +++ mozilla/config/system-headers
 @@ -189,7 +189,6 @@ asm/signal.h
  ASRegistry.h
@@ -10,7 +10,15 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.5 2015/07/09 15:17:34 ryoon Exp
  atlcom.h
  atlconv.h
  atlctl.cpp
-@@ -636,6 +635,7 @@ libgnomevfs/gnome-vfs-mime-handlers.h
+@@ -471,6 +470,7 @@ freetype/ftbitmap.h
+ freetype/ftxf86.h
+ freetype.h
+ ftcache.h
++ftfntfmt.h
+ ftglyph.h
+ ftsynth.h
+ ftoutln.h
+@@ -636,6 +636,7 @@ libgnomevfs/gnome-vfs-mime-handlers.h
  libgnomevfs/gnome-vfs-mime-utils.h
  libgnomevfs/gnome-vfs-ops.h
  libgnomevfs/gnome-vfs-standard-callbacks.h
@@ -18,7 +26,7 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.5 2015/07/09 15:17:34 ryoon Exp
  lib$routines.h
  limits
  limits.h
-@@ -1266,7 +1266,6 @@ X11/Xlocale.h
+@@ -1266,7 +1267,6 @@ X11/Xlocale.h
  X11/Xos.h
  X11/Xutil.h
  zmouse.h
@@ -26,7 +34,7 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.5 2015/07/09 15:17:34 ryoon Exp
  #if MOZ_NATIVE_PNG==1
  png.h
  #endif
-@@ -1328,10 +1327,13 @@ vorbis/codec.h
+@@ -1328,10 +1328,13 @@ vorbis/codec.h
  theora/theoradec.h
  tremor/ivorbiscodec.h
  speex/speex_resampler.h
@@ -40,7 +48,7 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.5 2015/07/09 15:17:34 ryoon Exp
  #endif
  gst/gst.h
  gst/app/gstappsink.h
-@@ -1360,3 +1362,43 @@ unicode/utypes.h
+@@ -1360,3 +1363,43 @@ unicode/utypes.h
  #endif
  libutil.h
  unwind.h
diff --git a/mail/thunderbird31/distinfo b/mail/thunderbird31/distinfo
index 2b64462f681..61c69954bdc 100644
--- a/mail/thunderbird31/distinfo
+++ b/mail/thunderbird31/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2015/07/13 17:49:26 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2015/09/07 15:19:10 ryoon Exp $
 
 SHA1 (enigmail-1.7.2.tar.gz) = e72eeff5a47491267981090129b0b2594b5dc96f
 RMD160 (enigmail-1.7.2.tar.gz) = 1dcd10e758321846eb20ac7f1d3ae6465c47bfe7
@@ -50,7 +50,7 @@ SHA1 (patch-mozilla_config_baseconfig.mk) = e8594d03d0db21e0731d85dcdb38ab9c465e
 SHA1 (patch-mozilla_config_external_moz.build) = 61d9d60ad4e360b6d9511205ebe0d68422a2501b
 SHA1 (patch-mozilla_config_stl__wrappers_ios) = 066a9f3db9203afa8131b2ff91d212033e5950e0
 SHA1 (patch-mozilla_config_stl__wrappers_ostream) = 67559c5ab17088680b86dea6b081a48b781f59b5
-SHA1 (patch-mozilla_config_system-headers) = 51833d7c421c547471fb9cc5e635015f0ec70ab1
+SHA1 (patch-mozilla_config_system-headers) = 2875dc40fe6892005f2e371d90ca4fc6efc1adb8
 SHA1 (patch-mozilla_config_system__wrappers_unwind.h) = 32d4ab3fbf80bf19783dab7c4a875a7262f419cf
 SHA1 (patch-mozilla_content_base_src_moz.build) = 0a7f7665a23a50d6c60a99c58e7d074465f4917c
 SHA1 (patch-mozilla_content_media_AudioStream.cpp) = 9faaa001b9a8d142ee0027622e773151de8c7287
diff --git a/mail/thunderbird31/patches/patch-mozilla_config_system-headers b/mail/thunderbird31/patches/patch-mozilla_config_system-headers
index 7321b2f0a7b..c9365cc9b91 100644
--- a/mail/thunderbird31/patches/patch-mozilla_config_system-headers
+++ b/mail/thunderbird31/patches/patch-mozilla_config_system-headers
@@ -1,8 +1,16 @@
-$NetBSD: patch-mozilla_config_system-headers,v 1.1 2015/07/13 17:49:26 ryoon Exp $
+$NetBSD: patch-mozilla_config_system-headers,v 1.2 2015/09/07 15:19:10 ryoon Exp $
 
---- mozilla/config/system-headers.orig	2014-07-18 00:05:11.000000000 +0000
+--- mozilla/config/system-headers.orig	2015-05-07 18:53:47.000000000 +0000
 +++ mozilla/config/system-headers
-@@ -1048,8 +1048,6 @@ X11/Xlocale.h
+@@ -415,6 +415,7 @@ freetype/ftbitmap.h
+ freetype/ftxf86.h
+ freetype.h
+ ftcache.h
++ftfntfmt.h
+ ftglyph.h
+ ftsynth.h
+ ftoutln.h
+@@ -1048,8 +1049,6 @@ X11/Xlocale.h
  X11/Xos.h
  X11/Xutil.h
  zmouse.h
@@ -11,7 +19,7 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.1 2015/07/13 17:49:26 ryoon Exp
  #if MOZ_NATIVE_PNG==1
  png.h
  #endif
-@@ -1117,6 +1115,8 @@ ogg/ogg.h
+@@ -1117,6 +1116,8 @@ ogg/ogg.h
  ogg/os_types.h
  nestegg/nestegg.h
  cubeb/cubeb.h
@@ -20,7 +28,7 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.1 2015/07/13 17:49:26 ryoon Exp
  #endif
  gst/gst.h
  gst/app/gstappsink.h
-@@ -1145,3 +1145,37 @@ unicode/utypes.h
+@@ -1145,3 +1146,37 @@ unicode/utypes.h
  #endif
  libutil.h
  unwind.h