summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2015-09-15 20:58:15 +0000
committerjoerg <joerg@pkgsrc.org>2015-09-15 20:58:15 +0000
commit022a913405c0550feb298108beccb222074ab228 (patch)
tree9e08c1840d661c40e7f747e5718ee8723a6c39bc
parent56fe86ff77cc3a8b3e17b82ea82724443fd1c34e (diff)
downloadpkgsrc-022a913405c0550feb298108beccb222074ab228.tar.gz
Uses common infrastructure for wrapping unwind.h. Add new freetype
header to the wrapping list.
-rw-r--r--mail/thunderbird24/distinfo5
-rw-r--r--mail/thunderbird24/patches/patch-mozilla_config_system-headers27
-rw-r--r--mail/thunderbird24/patches/patch-mozilla_config_system__wrappers_unwind.h9
3 files changed, 26 insertions, 15 deletions
diff --git a/mail/thunderbird24/distinfo b/mail/thunderbird24/distinfo
index 3ef6fc0b440..7ceb13791eb 100644
--- a/mail/thunderbird24/distinfo
+++ b/mail/thunderbird24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2014/12/04 05:34:47 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2015/09/15 20:58:15 joerg Exp $
SHA1 (enigmail-1.7.2.tar.gz) = e72eeff5a47491267981090129b0b2594b5dc96f
RMD160 (enigmail-1.7.2.tar.gz) = 1dcd10e758321846eb20ac7f1d3ae6465c47bfe7
@@ -43,8 +43,7 @@ SHA1 (patch-mozilla_config_Makefile.in) = 033df80250dc77fad1fa1dc69e74aa8218260f
SHA1 (patch-mozilla_config_baseconfig.mk) = 106b9b1cafa2865b6014d61c6eb3bf6821c7fb56
SHA1 (patch-mozilla_config_stl__wrappers_ios) = 066a9f3db9203afa8131b2ff91d212033e5950e0
SHA1 (patch-mozilla_config_stl__wrappers_ostream) = 67559c5ab17088680b86dea6b081a48b781f59b5
-SHA1 (patch-mozilla_config_system-headers) = 26f0b0471fcd60a834bdbbdb44093b166a7755e7
-SHA1 (patch-mozilla_config_system__wrappers_unwind.h) = 32d4ab3fbf80bf19783dab7c4a875a7262f419cf
+SHA1 (patch-mozilla_config_system-headers) = 3e5a58e35edb136913cbf66d49f441592f206e94
SHA1 (patch-mozilla_content_media_gstreamer_GStreamerFormatHelper.cpp) = 0e0f18e19b54e42814207dfdfeb1ea6cacc656d3
SHA1 (patch-mozilla_content_svg_content_src_SVGComponentTransferFunctionElement.h) = 2ecd1de12b1d1ce885c5ca0bf0e1d7ecdfb9a514
SHA1 (patch-mozilla_content_svg_content_src_nsSVGFilters.cpp) = 5a75926b80154dadf676e67248b6256c665001fb
diff --git a/mail/thunderbird24/patches/patch-mozilla_config_system-headers b/mail/thunderbird24/patches/patch-mozilla_config_system-headers
index 2428c9f3b69..a717e72adfb 100644
--- a/mail/thunderbird24/patches/patch-mozilla_config_system-headers
+++ b/mail/thunderbird24/patches/patch-mozilla_config_system-headers
@@ -1,8 +1,29 @@
-$NetBSD: patch-mozilla_config_system-headers,v 1.1 2014/07/27 05:36:07 ryoon Exp $
+$NetBSD: patch-mozilla_config_system-headers,v 1.2 2015/09/15 20:58:15 joerg Exp $
---- mozilla/config/system-headers.orig 2013-10-23 22:08:50.000000000 +0000
+--- mozilla/config/system-headers.orig 2014-09-24 05:24:54.000000000 +0000
+++ mozilla/config/system-headers
-@@ -1132,3 +1132,14 @@ kvm.h
+@@ -1,3 +1,4 @@
++unwind.h
+ nspr.h
+ plarena.h
+ plarenas.h
+@@ -402,6 +403,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 +417,7 @@ freetype/ftbitmap.h
+ freetype/ftxf86.h
+ freetype.h
+ ftcache.h
++ftfntfmt.h
+ ftglyph.h
+ ftsynth.h
+ ftoutln.h
+@@ -1145,3 +1148,14 @@ kvm.h
spawn.h
err.h
xlocale.h
diff --git a/mail/thunderbird24/patches/patch-mozilla_config_system__wrappers_unwind.h b/mail/thunderbird24/patches/patch-mozilla_config_system__wrappers_unwind.h
deleted file mode 100644
index c64aadd8262..00000000000
--- a/mail/thunderbird24/patches/patch-mozilla_config_system__wrappers_unwind.h
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-mozilla_config_system__wrappers_unwind.h,v 1.1 2014/07/27 05:36:07 ryoon Exp $
-
---- mozilla/config/system_wrappers/unwind.h.orig 2013-05-13 19:56:18.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