Deal with freetype update. Drop unnecessary manual system wrapper for

unwind.h

3 files changed, 15 insertions, 17 deletions

diff --git a/www/firefox31/distinfo b/www/firefox31/distinfo
index 8c0a63380bd..1b1952a3d91 100644
--- a/www/firefox31/distinfo
+++ b/www/firefox31/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2015/07/25 04:05:37 ryoon Exp $
+$NetBSD: distinfo,v 1.18 2015/09/17 17:11:01 joerg Exp $
 
 SHA1 (firefox-31.8.0esr.source.tar.bz2) = 1b09b4ac975f521b48d0ef794f00c4e3696cb1d7
 RMD160 (firefox-31.8.0esr.source.tar.bz2) = c7cd74d1a5cde5c6419becddcb3333d7ec46bf68
@@ -29,8 +29,7 @@ SHA1 (patch-config_external_moz.build) = f437c4802de266caf512dc470879c8ed0961559
 SHA1 (patch-config_rules.mk) = ec74e2e385e95252a1325c8c9c859a0b2dcee693
 SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
-SHA1 (patch-config_system-headers) = 5b4079d11a50a8b903951e2a869b28da0dbfd3ee
-SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
+SHA1 (patch-config_system-headers) = 1e7349fcba8a8575bf97093148b0a65494bdb0f0
 SHA1 (patch-content_base_src_moz.build) = fc2660dcc82f11c89d6d5a5772f27c9827f58f44
 SHA1 (patch-content_media_AudioStream.cpp) = 70021dfd1cc86e8999f144b49a23bfb27dd24157
 SHA1 (patch-content_media_AudioStream.h) = 11cd8649f35c001fa0bf9e0f6119e49bd41ab9b4
diff --git a/www/firefox31/patches/patch-config_system-headers b/www/firefox31/patches/patch-config_system-headers
index a32f6f7372e..7e3eb50b002 100644
--- a/www/firefox31/patches/patch-config_system-headers
+++ b/www/firefox31/patches/patch-config_system-headers
@@ -1,10 +1,18 @@
-$NetBSD: patch-config_system-headers,v 1.2 2015/07/25 04:04:54 ryoon Exp $
+$NetBSD: patch-config_system-headers,v 1.3 2015/09/17 17:11:02 joerg Exp $
 
 https://hg.mozilla.org/integration/mozilla-inbound/rev/afd840d66e6a
 
 --- config/system-headers.orig	2015-06-24 21:24:43.000000000 +0000
 +++ config/system-headers
-@@ -415,6 +415,7 @@ freetype/ftbitmap.h
+@@ -402,6 +402,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
+@@ -415,6 +416,7 @@ freetype/ftbitmap.h
  freetype/ftxf86.h
  freetype.h
  ftcache.h
@@ -12,7 +20,7 @@ https://hg.mozilla.org/integration/mozilla-inbound/rev/afd840d66e6a
  ftglyph.h
  ftsynth.h
  ftoutln.h
-@@ -1048,8 +1049,6 @@ X11/Xlocale.h
+@@ -1048,8 +1050,6 @@ X11/Xlocale.h
  X11/Xos.h
  X11/Xutil.h
  zmouse.h
@@ -21,7 +29,7 @@ https://hg.mozilla.org/integration/mozilla-inbound/rev/afd840d66e6a
  #if MOZ_NATIVE_PNG==1
  png.h
  #endif
-@@ -1117,6 +1116,8 @@ ogg/ogg.h
+@@ -1117,6 +1117,8 @@ ogg/ogg.h
  ogg/os_types.h
  nestegg/nestegg.h
  cubeb/cubeb.h
@@ -30,7 +38,7 @@ https://hg.mozilla.org/integration/mozilla-inbound/rev/afd840d66e6a
  #endif
  gst/gst.h
  gst/app/gstappsink.h
-@@ -1145,3 +1146,37 @@ unicode/utypes.h
+@@ -1145,3 +1147,37 @@ unicode/utypes.h
  #endif
  libutil.h
  unwind.h
diff --git a/www/firefox31/patches/patch-config_system__wrappers_unwind.h b/www/firefox31/patches/patch-config_system__wrappers_unwind.h
deleted file mode 100644
index b522f7c6317..00000000000
--- a/www/firefox31/patches/patch-config_system__wrappers_unwind.h
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-config_system__wrappers_unwind.h,v 1.1 2014/11/03 12:18:32 ryoon Exp $
-
---- config/system_wrappers/unwind.h.orig	2013-05-13 19:56:18.000000000 +0000
-+++ 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