Deal with new freetype header. Remove unwind.h override, the normal

system header list already includes it.

3 files changed, 23 insertions, 17 deletions

diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index db83670eab0..e9a409bbc6e 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.121 2015/03/26 20:41:53 ryoon Exp $
+$NetBSD: distinfo,v 1.122 2015/09/13 15:05:35 joerg Exp $
 
 SHA1 (enigmail-1.8.1.tar.gz) = 2ddd71a752c8cfc0b110c9a05bddf16b4d5b59db
 RMD160 (enigmail-1.8.1.tar.gz) = 2c4c53d02901198f1111f47f31f5d7721e19fd5b
@@ -31,8 +31,7 @@ SHA1 (patch-mozilla_config_external_moz.build) = 172f2066e14f38ac56defc76b41e0f3
 SHA1 (patch-mozilla_config_rules.mk) = ce24fd149c05a252acffc05a72dc0f86eabe16b4
 SHA1 (patch-mozilla_config_stl__wrappers_ios) = 9200935d025d899a5810dc615345b9a7005369b2
 SHA1 (patch-mozilla_config_stl__wrappers_ostream) = 232e253bca5d8f7f0de1b880dc34b613f8852ee7
-SHA1 (patch-mozilla_config_system-headers) = 13aaec8d3a4a45da6e26fe05ddeccb31d007876a
-SHA1 (patch-mozilla_config_system__wrappers_unwind.h) = e88b3a5d1f884bc645762a74f95bc4b7e360c9bf
+SHA1 (patch-mozilla_config_system-headers) = e5dd1686b7cb7c0d3b4cc1e66c4882d037a6e4a9
 SHA1 (patch-mozilla_dom_base_moz.build) = de05328ca4339e0e3a92da3e4517697df9d3b53a
 SHA1 (patch-mozilla_dom_media_AudioStream.h) = 92029dfdf3cfd168b88e313806340db9d13d408f
 SHA1 (patch-mozilla_dom_media_gmp_GMPChild.cpp) = 39bd9871057efd69853f26b2230f58bcf9e4c94b
diff --git a/www/seamonkey/patches/patch-mozilla_config_system-headers b/www/seamonkey/patches/patch-mozilla_config_system-headers
index 97d3430eccf..08f7f2b0b3e 100644
--- a/www/seamonkey/patches/patch-mozilla_config_system-headers
+++ b/www/seamonkey/patches/patch-mozilla_config_system-headers
@@ -1,8 +1,24 @@
-$NetBSD: patch-mozilla_config_system-headers,v 1.13 2015/01/02 04:26:21 ryoon Exp $
+$NetBSD: patch-mozilla_config_system-headers,v 1.14 2015/09/13 15:05:35 joerg Exp $
 
---- mozilla/config/system-headers.orig	2014-12-03 06:22:33.000000000 +0000
+--- mozilla/config/system-headers.orig	2015-03-22 02:59:55.000000000 +0000
 +++ mozilla/config/system-headers
-@@ -1267,7 +1267,6 @@ X11/Xlocale.h
+@@ -457,6 +457,7 @@ frame/log.h
+ frame/req.h
+ freetype/freetype.h
+ freetype/ftcache.h
++freetype/ftfntfmt.h
+ freetype/ftglyph.h
+ freetype/ftsynth.h
+ freetype/ftoutln.h
+@@ -470,6 +471,7 @@ freetype/ftbitmap.h
+ freetype/ftxf86.h
+ freetype.h
+ ftcache.h
++ftfntfmt.h
+ ftglyph.h
+ ftsynth.h
+ ftoutln.h
+@@ -1265,7 +1267,6 @@ X11/Xlocale.h
  X11/Xos.h
  X11/Xutil.h
  zmouse.h
@@ -10,7 +26,7 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.13 2015/01/02 04:26:21 ryoon Ex
  #if MOZ_NATIVE_PNG==1
  png.h
  #endif
-@@ -1329,10 +1328,13 @@ vorbis/codec.h
+@@ -1327,10 +1328,13 @@ vorbis/codec.h
  theora/theoradec.h
  tremor/ivorbiscodec.h
  speex/speex_resampler.h
@@ -24,7 +40,7 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.13 2015/01/02 04:26:21 ryoon Ex
  #endif
  gst/gst.h
  gst/app/gstappsink.h
-@@ -1361,3 +1363,37 @@ unicode/utypes.h
+@@ -1359,3 +1363,37 @@ unicode/utypes.h
  #endif
  libutil.h
  unwind.h
diff --git a/www/seamonkey/patches/patch-mozilla_config_system__wrappers_unwind.h b/www/seamonkey/patches/patch-mozilla_config_system__wrappers_unwind.h
deleted file mode 100644
index b797ca38541..00000000000
--- a/www/seamonkey/patches/patch-mozilla_config_system__wrappers_unwind.h
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-mozilla_config_system__wrappers_unwind.h,v 1.5 2015/01/02 04:26:21 ryoon Exp $
-
---- mozilla/config/system_wrappers/unwind.h.orig	2015-01-01 17:44:51.000000000 +0000
-+++ mozilla/config/system_wrappers/unwind.h
-@@ -0,0 +1,4 @@
-+#pragma GCC system_header
-+#pragma GCC visibility push(default)
-+#include_next <unwind.h>
-+#pragma GCC visibility pop