summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/thunderbird/distinfo8
-rw-r--r--mail/thunderbird/patches/patch-mozilla_config_system-headers6
-rw-r--r--mail/thunderbird/patches/patch-mozilla_config_system__wrappers_unwind.h9
-rw-r--r--mail/thunderbird/patches/patch-mozilla_gfx_graphite2_src_moz.build15
-rw-r--r--mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build12
-rw-r--r--mail/thunderbird31/distinfo6
-rw-r--r--mail/thunderbird31/patches/patch-mozilla_config_system-headers6
-rw-r--r--mail/thunderbird31/patches/patch-mozilla_gfx_graphite2_src_moz.build15
-rw-r--r--mail/thunderbird31/patches/patch-mozilla_gfx_thebes_moz.build12
-rw-r--r--www/firefox31/distinfo6
-rw-r--r--www/firefox31/patches/patch-config_system-headers6
-rw-r--r--www/firefox31/patches/patch-gfx_graphite2_src_moz.build15
-rw-r--r--www/firefox31/patches/patch-gfx_thebes_moz.build12
-rw-r--r--www/firefox38/distinfo8
-rw-r--r--www/firefox38/patches/patch-config_system-headers6
-rw-r--r--www/firefox38/patches/patch-config_system__wrappers_unwind.h9
-rw-r--r--www/firefox38/patches/patch-gfx_graphite2_src_moz.build15
-rw-r--r--www/firefox38/patches/patch-gfx_thebes_moz.build14
-rw-r--r--www/seamonkey/distinfo7
-rw-r--r--www/seamonkey/patches/patch-mozilla_config_system-headers6
-rw-r--r--www/seamonkey/patches/patch-mozilla_gfx_graphite2_src_moz.build15
-rw-r--r--www/seamonkey/patches/patch-mozilla_gfx_thebes_moz.build15
22 files changed, 172 insertions, 51 deletions
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 9f6759d9868..d773667e471 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.170 2016/01/20 22:14:13 ryoon Exp $
+$NetBSD: distinfo,v 1.171 2016/01/31 23:43:48 joerg Exp $
SHA1 (thunderbird-38.5.0.source.tar.bz2) = 75ae57e7ae018a07a55ce4402ae9f88e7867559f
RMD160 (thunderbird-38.5.0.source.tar.bz2) = 649fbff7746387024b1bc87ad5d6cd24407344f4
@@ -40,8 +40,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) = dd93fa354f79a320735063792fdcc87cf44bde75
-SHA1 (patch-mozilla_config_system__wrappers_unwind.h) = 32d4ab3fbf80bf19783dab7c4a875a7262f419cf
+SHA1 (patch-mozilla_config_system-headers) = a42f21a5647cc7832d26e12c2ebca5adea57dae9
SHA1 (patch-mozilla_dom_base_moz.build) = dce93f4c00bb662d5c702b442ee169bb8888237d
SHA1 (patch-mozilla_dom_events_MessageEvent.h) = 677c3531230147baf260aca9e39d7a04b2a7c673
SHA1 (patch-mozilla_dom_media_AudioStream.h) = b5092adaf26c8c1809b4ad62eb92be101c07ac88
@@ -54,10 +53,11 @@ SHA1 (patch-mozilla_dom_system_OSFileConstants.cpp) = 665007aa3640bdc7d2dfb26c25
SHA1 (patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp) = 3865b172e85ee0146baf0641c1181bd01e955b35
SHA1 (patch-mozilla_gfx_graphite2_moz-gr-update.sh) = 49a7d2d4de18565ca256e000fedaab1cb3e714f2
SHA1 (patch-mozilla_gfx_graphite2_src_Bidi.cpp) = 5b5190da8a8e4eabd793d9bd5932f773b685dbf4
+SHA1 (patch-mozilla_gfx_graphite2_src_moz.build) = 12601e295244497f5b3a255350ee2b67c20d4f0c
SHA1 (patch-mozilla_gfx_moz.build) = 93f0eba2ea5a4d678c6356b254a1a91bf0ad7ea9
SHA1 (patch-mozilla_gfx_skia_generate__mozbuild.py) = 7d1f1b85ec1a332d1370f2030f941c38ef83d021
SHA1 (patch-mozilla_gfx_skia_moz.build) = c7298e883ec7a77c7fb85929dac8eced022cd438
-SHA1 (patch-mozilla_gfx_thebes_moz.build) = 57966be80ca5ce9f24350114bc7cb151b42adffd
+SHA1 (patch-mozilla_gfx_thebes_moz.build) = 4d09f500e5caa17ec71ddcd032a01fcb4acf1508
SHA1 (patch-mozilla_gfx_ycbcr_moz.build) = fcd9af6d97c2d7cf85856d8f11e1a13c0ebe8f52
SHA1 (patch-mozilla_gfx_ycbcr_yuv__row__arm.S) = 5562543a67b0dec358a4ecc44612f2faa669d8b0
SHA1 (patch-mozilla_image_decoders_nsJPEGDecoder.cpp) = bd08482f32102412517b3150e5c70500e8f921fa
diff --git a/mail/thunderbird/patches/patch-mozilla_config_system-headers b/mail/thunderbird/patches/patch-mozilla_config_system-headers
index 08fe5a5277e..484dd81d466 100644
--- a/mail/thunderbird/patches/patch-mozilla_config_system-headers
+++ b/mail/thunderbird/patches/patch-mozilla_config_system-headers
@@ -1,4 +1,4 @@
-$NetBSD: patch-mozilla_config_system-headers,v 1.8 2016/01/20 22:14:13 ryoon Exp $
+$NetBSD: patch-mozilla_config_system-headers,v 1.9 2016/01/31 23:43:48 joerg Exp $
--- mozilla/config/system-headers.orig 2015-12-21 22:32:58.000000000 +0000
+++ mozilla/config/system-headers
@@ -48,13 +48,15 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.8 2016/01/20 22:14:13 ryoon Exp
#endif
gst/gst.h
gst/app/gstappsink.h
-@@ -1362,3 +1365,43 @@ unicode/utypes.h
+@@ -1362,3 +1365,45 @@ unicode/utypes.h
#endif
libutil.h
unwind.h
+#if MOZ_NATIVE_GRAPHITE2==1
+graphite2/Font.h
++graphite2/Log.h
+graphite2/Segment.h
++graphite2/Types.h
+#endif
+#if MOZ_NATIVE_HARFBUZZ==1
+harfbuzz/hb-ot.h
diff --git a/mail/thunderbird/patches/patch-mozilla_config_system__wrappers_unwind.h b/mail/thunderbird/patches/patch-mozilla_config_system__wrappers_unwind.h
deleted file mode 100644
index d13ed78267d..00000000000
--- a/mail/thunderbird/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 2013/05/14 12:41:02 joerg 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
diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_graphite2_src_moz.build b/mail/thunderbird/patches/patch-mozilla_gfx_graphite2_src_moz.build
new file mode 100644
index 00000000000..855c7fc7a40
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_gfx_graphite2_src_moz.build
@@ -0,0 +1,15 @@
+$NetBSD: patch-mozilla_gfx_graphite2_src_moz.build,v 1.1 2016/01/31 23:43:48 joerg Exp $
+
+--- mozilla/gfx/graphite2/src/moz.build.orig 2016-01-31 20:58:00.012715770 +0000
++++ mozilla/gfx/graphite2/src/moz.build
+@@ -60,10 +60,6 @@ MSVC_ENABLE_PGO = True
+ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ NO_VISIBILITY_FLAGS = True
+ DEFINES['GRAPHITE2_EXPORTING'] = True
+-else:
+- # tell graphite2 not to export symbols, we'll be linking it directly with
+- # thebes
+- DEFINES['GRAPHITE2_STATIC'] = True
+
+ FINAL_LIBRARY = 'gkmedias'
+
diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build b/mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build
index b16b992052f..0bf2c1ccdc8 100644
--- a/mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build
+++ b/mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_gfx_thebes_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp $
+$NetBSD: patch-mozilla_gfx_thebes_moz.build,v 1.2 2016/01/31 23:43:48 joerg Exp $
---- mozilla/gfx/thebes/moz.build.orig 2015-06-08 17:49:17.000000000 +0000
+--- mozilla/gfx/thebes/moz.build.orig 2015-12-21 22:32:53.000000000 +0000
+++ mozilla/gfx/thebes/moz.build
@@ -287,6 +287,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
@@ -15,3 +15,11 @@ $NetBSD: patch-mozilla_gfx_thebes_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'):
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
+@@ -298,7 +304,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
+ CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
+
+-DEFINES['GRAPHITE2_STATIC'] = True
+-
+ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ DEFINES['OTS_DLL'] = True
diff --git a/mail/thunderbird31/distinfo b/mail/thunderbird31/distinfo
index 9d46d2b2d55..82d3921fe54 100644
--- a/mail/thunderbird31/distinfo
+++ b/mail/thunderbird31/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2016/01/20 22:14:13 ryoon Exp $
+$NetBSD: distinfo,v 1.5 2016/01/31 23:43:48 joerg 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) = eb009f99d689ca9568187b86e7c5d4e7ccb5abbb
+SHA1 (patch-mozilla_config_system-headers) = bfd31db600ef160b212ed16e3e5e601977705f98
SHA1 (patch-mozilla_content_base_src_moz.build) = 0a7f7665a23a50d6c60a99c58e7d074465f4917c
SHA1 (patch-mozilla_content_media_AudioStream.cpp) = 9faaa001b9a8d142ee0027622e773151de8c7287
SHA1 (patch-mozilla_content_media_AudioStream.h) = 5970af4cfae07e02943a0411dfb195f2bcf10226
@@ -65,9 +65,11 @@ SHA1 (patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp) = aa4e89010af5bf2844
SHA1 (patch-mozilla_dom_system_OSFileConstants.cpp) = 8880a3956dd13628f898b79326620ec9f122d362
SHA1 (patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp) = ecc46454804bd1f2dc97621e0d788e16bb2eaea9
SHA1 (patch-mozilla_gfx_graphite2_src_Bidi.cpp) = 5b5190da8a8e4eabd793d9bd5932f773b685dbf4
+SHA1 (patch-mozilla_gfx_graphite2_src_moz.build) = a7a0efc38f808b97025e0823c8426dd337466f63
SHA1 (patch-mozilla_gfx_moz.build) = 93f0eba2ea5a4d678c6356b254a1a91bf0ad7ea9
SHA1 (patch-mozilla_gfx_skia_Makefile.in) = c67f4c4fd47b6d00b6f2f951a8ebebf22087ddf6
SHA1 (patch-mozilla_gfx_thebes_Makefile.in) = b8295dfd28fbd9d21d83734f2b8928486df09344
+SHA1 (patch-mozilla_gfx_thebes_moz.build) = c1785f95010f168197df490213940cf834969400
SHA1 (patch-mozilla_image_decoders_nsJPEGDecoder.cpp) = 9f25aae0c01f3341540ed4b821265b0921c5f74f
SHA1 (patch-mozilla_intl_hyphenation_src_hnjalloc.h) = 23b4045d687d2823f3078a5f81adc4b4309d7a11
SHA1 (patch-mozilla_intl_unicharutil_util_Makefile.in) = 1cf07aec1f7f38d465608fe8137d1f5e030ebf3f
diff --git a/mail/thunderbird31/patches/patch-mozilla_config_system-headers b/mail/thunderbird31/patches/patch-mozilla_config_system-headers
index ccc973691d7..333c5cdc4ee 100644
--- a/mail/thunderbird31/patches/patch-mozilla_config_system-headers
+++ b/mail/thunderbird31/patches/patch-mozilla_config_system-headers
@@ -1,4 +1,4 @@
-$NetBSD: patch-mozilla_config_system-headers,v 1.4 2016/01/20 22:14:13 ryoon Exp $
+$NetBSD: patch-mozilla_config_system-headers,v 1.5 2016/01/31 23:43:48 joerg Exp $
--- mozilla/config/system-headers.orig 2015-05-07 18:53:47.000000000 +0000
+++ mozilla/config/system-headers
@@ -37,13 +37,15 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.4 2016/01/20 22:14:13 ryoon Exp
#endif
gst/gst.h
gst/app/gstappsink.h
-@@ -1145,3 +1148,37 @@ unicode/utypes.h
+@@ -1145,3 +1148,39 @@ unicode/utypes.h
#endif
libutil.h
unwind.h
+#if MOZ_NATIVE_GRAPHITE2==1
+graphite2/Font.h
++graphite2/Log.h
+graphite2/Segment.h
++graphite2/Types.h
+#endif
+#if MOZ_NATIVE_HARFBUZZ==1
+harfbuzz/hb-ot.h
diff --git a/mail/thunderbird31/patches/patch-mozilla_gfx_graphite2_src_moz.build b/mail/thunderbird31/patches/patch-mozilla_gfx_graphite2_src_moz.build
new file mode 100644
index 00000000000..21018edcf89
--- /dev/null
+++ b/mail/thunderbird31/patches/patch-mozilla_gfx_graphite2_src_moz.build
@@ -0,0 +1,15 @@
+$NetBSD: patch-mozilla_gfx_graphite2_src_moz.build,v 1.1 2016/01/31 23:43:48 joerg Exp $
+
+--- mozilla/gfx/graphite2/src/moz.build.orig 2016-01-31 21:02:29.327652701 +0000
++++ mozilla/gfx/graphite2/src/moz.build
+@@ -60,10 +60,6 @@ MSVC_ENABLE_PGO = True
+ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ NO_VISIBILITY_FLAGS = True
+ DEFINES['GRAPHITE2_EXPORTING'] = True
+-else:
+- # tell graphite2 not to export symbols, we'll be linking it directly with
+- # thebes
+- DEFINES['GRAPHITE2_STATIC'] = True
+
+ FINAL_LIBRARY = 'gkmedias'
+
diff --git a/mail/thunderbird31/patches/patch-mozilla_gfx_thebes_moz.build b/mail/thunderbird31/patches/patch-mozilla_gfx_thebes_moz.build
new file mode 100644
index 00000000000..e04b562452e
--- /dev/null
+++ b/mail/thunderbird31/patches/patch-mozilla_gfx_thebes_moz.build
@@ -0,0 +1,12 @@
+$NetBSD: patch-mozilla_gfx_thebes_moz.build,v 1.1 2016/01/31 23:43:48 joerg Exp $
+
+--- mozilla/gfx/thebes/moz.build.orig 2016-01-31 21:02:29.328507813 +0000
++++ mozilla/gfx/thebes/moz.build
+@@ -289,7 +289,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
+ # top of the android java runtime.
+ DEFINES['MOZ_USING_ANDROID_JAVA_WIDGETS'] = True
+
+-DEFINES['GRAPHITE2_STATIC'] = True
+-
+ if CONFIG['OS_TARGET'] == 'WINNT':
+ DEFINES['OTS_DLL'] = True
diff --git a/www/firefox31/distinfo b/www/firefox31/distinfo
index 14e6c2fbdf2..04888b10e31 100644
--- a/www/firefox31/distinfo
+++ b/www/firefox31/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2015/11/04 02:46:53 agc Exp $
+$NetBSD: distinfo,v 1.20 2016/01/31 23:43:48 joerg Exp $
SHA1 (firefox-31.8.0esr.source.tar.bz2) = 1b09b4ac975f521b48d0ef794f00c4e3696cb1d7
RMD160 (firefox-31.8.0esr.source.tar.bz2) = c7cd74d1a5cde5c6419becddcb3333d7ec46bf68
@@ -30,7 +30,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) = 1e7349fcba8a8575bf97093148b0a65494bdb0f0
+SHA1 (patch-config_system-headers) = 7680a9e45eb6467d878df59d9476bff0c515dafe
SHA1 (patch-content_base_src_moz.build) = fc2660dcc82f11c89d6d5a5772f27c9827f58f44
SHA1 (patch-content_media_AudioStream.cpp) = 70021dfd1cc86e8999f144b49a23bfb27dd24157
SHA1 (patch-content_media_AudioStream.h) = 11cd8649f35c001fa0bf9e0f6119e49bd41ab9b4
@@ -46,9 +46,11 @@ SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 5ab28cc0398b72cb5e1b058640
SHA1 (patch-dom_system_OSFileConstants.cpp) = fec01c3c2c1b7e1c57abe9ec269067ee98eede3d
SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = a2a0652d0eac018fda06e729bf5ba786dd8a3866
SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce
+SHA1 (patch-gfx_graphite2_src_moz.build) = c2ddbec41d624732e191f79100d6df6db435396b
SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9
SHA1 (patch-gfx_skia_Makefile.in) = 03349db0ff9b14c2012c36d746adf2ee6cb87e62
SHA1 (patch-gfx_thebes_Makefile.in) = 16b63bc42870aa8c042416c6e04b3513981ca6f0
+SHA1 (patch-gfx_thebes_moz.build) = 1330ff2b9f4f6a5e1027340799766d9228a4c459
SHA1 (patch-gfx_ycbcr_moz.build) = b11c2c15957861eefa33af554aee58e4403e9cfc
SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = d3a5437507e3d0fcf64e506c9c5cb5b7dce87970
SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e5df11499b1ec14e1d4c9a1408c0611d1c4e0574
diff --git a/www/firefox31/patches/patch-config_system-headers b/www/firefox31/patches/patch-config_system-headers
index 7e3eb50b002..cf6c8120978 100644
--- a/www/firefox31/patches/patch-config_system-headers
+++ b/www/firefox31/patches/patch-config_system-headers
@@ -1,4 +1,4 @@
-$NetBSD: patch-config_system-headers,v 1.3 2015/09/17 17:11:02 joerg Exp $
+$NetBSD: patch-config_system-headers,v 1.4 2016/01/31 23:43:48 joerg Exp $
https://hg.mozilla.org/integration/mozilla-inbound/rev/afd840d66e6a
@@ -38,13 +38,15 @@ https://hg.mozilla.org/integration/mozilla-inbound/rev/afd840d66e6a
#endif
gst/gst.h
gst/app/gstappsink.h
-@@ -1145,3 +1147,37 @@ unicode/utypes.h
+@@ -1145,3 +1147,39 @@ unicode/utypes.h
#endif
libutil.h
unwind.h
+#if MOZ_NATIVE_GRAPHITE2==1
+graphite2/Font.h
++graphite2/Log.h
+graphite2/Segment.h
++graphite2/Types.h
+#endif
+#if MOZ_NATIVE_HARFBUZZ==1
+harfbuzz/hb-ot.h
diff --git a/www/firefox31/patches/patch-gfx_graphite2_src_moz.build b/www/firefox31/patches/patch-gfx_graphite2_src_moz.build
new file mode 100644
index 00000000000..8bd374e6c56
--- /dev/null
+++ b/www/firefox31/patches/patch-gfx_graphite2_src_moz.build
@@ -0,0 +1,15 @@
+$NetBSD: patch-gfx_graphite2_src_moz.build,v 1.1 2016/01/31 23:43:48 joerg Exp $
+
+--- gfx/graphite2/src/moz.build.orig 2016-01-31 20:19:43.913697846 +0000
++++ gfx/graphite2/src/moz.build
+@@ -60,10 +60,6 @@ MSVC_ENABLE_PGO = True
+ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ NO_VISIBILITY_FLAGS = True
+ DEFINES['GRAPHITE2_EXPORTING'] = True
+-else:
+- # tell graphite2 not to export symbols, we'll be linking it directly with
+- # thebes
+- DEFINES['GRAPHITE2_STATIC'] = True
+
+ FINAL_LIBRARY = 'gkmedias'
+
diff --git a/www/firefox31/patches/patch-gfx_thebes_moz.build b/www/firefox31/patches/patch-gfx_thebes_moz.build
new file mode 100644
index 00000000000..20359a1f712
--- /dev/null
+++ b/www/firefox31/patches/patch-gfx_thebes_moz.build
@@ -0,0 +1,12 @@
+$NetBSD: patch-gfx_thebes_moz.build,v 1.1 2016/01/31 23:43:48 joerg Exp $
+
+--- gfx/thebes/moz.build.orig 2016-01-31 20:20:00.627163711 +0000
++++ gfx/thebes/moz.build
+@@ -289,7 +289,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
+ # top of the android java runtime.
+ DEFINES['MOZ_USING_ANDROID_JAVA_WIDGETS'] = True
+
+-DEFINES['GRAPHITE2_STATIC'] = True
+-
+ if CONFIG['OS_TARGET'] == 'WINNT':
+ DEFINES['OTS_DLL'] = True
diff --git a/www/firefox38/distinfo b/www/firefox38/distinfo
index 87edc32a4d5..445d82fb556 100644
--- a/www/firefox38/distinfo
+++ b/www/firefox38/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2016/01/20 22:14:13 ryoon Exp $
+$NetBSD: distinfo,v 1.11 2016/01/31 23:43:48 joerg Exp $
SHA1 (firefox-38.5.0esr.source.tar.bz2) = 9a3fe6b51f4a786b1fc6a47f2eb512ef806cffd9
RMD160 (firefox-38.5.0esr.source.tar.bz2) = e14a751a20c0183f5d97620ef7541756f1b40772
@@ -25,8 +25,7 @@ SHA1 (patch-config_external_moz.build) = ee5fe1672333a7d71e61a23f3739ffefcca692d
SHA1 (patch-config_rules.mk) = d7f7060b246092eae3d7a792e43b14e462a37abd
SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
-SHA1 (patch-config_system-headers) = 1119b8d99b6b0fe40c79f9b331342a0ca61fa522
-SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
+SHA1 (patch-config_system-headers) = c9ac68ecbe1ce74e1aa62d792541955c31797f2d
SHA1 (patch-dom_base_moz.build) = 8b59c33958b7037c4c051742c64f1455096ced46
SHA1 (patch-dom_events_MessageEvent.h) = c7caec0955a7cff777ef84599fe9a6eec7c78a66
SHA1 (patch-dom_media_AudioStream.h) = 96b5a1a2b1c930cfcfa77a125d47b6eb93fac1c6
@@ -39,10 +38,11 @@ SHA1 (patch-dom_system_OSFileConstants.cpp) = 4fe5d4ecf6116c7163ee6d2322db8b1b78
SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = 747354373bcaf2c76bdff71677f354d47837704b
SHA1 (patch-gfx_graphite2_moz-gr-update.sh) = b987dad1bd4513b8a04fb280bd1c5280a03af746
SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce
+SHA1 (patch-gfx_graphite2_src_moz.build) = 1715ac0814dce4004454013b9675517152726a7a
SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9
SHA1 (patch-gfx_skia_generate__mozbuild.py) = e0bf45842ae74f896678b1c29d97606165cf5914
SHA1 (patch-gfx_skia_moz.build) = ce83717ec6e386d52af75a0f5592fa866b83b3bc
-SHA1 (patch-gfx_thebes_moz.build) = f64917350eaf693866b0e7196cb7f1cc9e9470fc
+SHA1 (patch-gfx_thebes_moz.build) = fa468f388322819bfa87681bf0a443fbd16568d1
SHA1 (patch-gfx_ycbcr_moz.build) = 121386ef62ff7425e6f93bc624555199f2ac3485
SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = f9909ded72762b2c3547dd002707db43745f2b9d
SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = ec12085f52b3614bc67b797c3a6b36ab5daee9ea
diff --git a/www/firefox38/patches/patch-config_system-headers b/www/firefox38/patches/patch-config_system-headers
index 67cef67a1c4..4aab1d9c741 100644
--- a/www/firefox38/patches/patch-config_system-headers
+++ b/www/firefox38/patches/patch-config_system-headers
@@ -1,4 +1,4 @@
-$NetBSD: patch-config_system-headers,v 1.4 2016/01/20 22:14:14 ryoon Exp $
+$NetBSD: patch-config_system-headers,v 1.5 2016/01/31 23:43:48 joerg Exp $
--- config/system-headers.orig 2015-12-14 23:36:05.000000000 +0000
+++ config/system-headers
@@ -48,13 +48,15 @@ $NetBSD: patch-config_system-headers,v 1.4 2016/01/20 22:14:14 ryoon Exp $
#endif
gst/gst.h
gst/app/gstappsink.h
-@@ -1362,3 +1365,43 @@ unicode/utypes.h
+@@ -1362,3 +1365,45 @@ unicode/utypes.h
#endif
libutil.h
unwind.h
+#if MOZ_NATIVE_GRAPHITE2==1
+graphite2/Font.h
++graphite2/Log.h
+graphite2/Segment.h
++graphite2/Types.h
+#endif
+#if MOZ_NATIVE_HARFBUZZ==1
+harfbuzz/hb-ot.h
diff --git a/www/firefox38/patches/patch-config_system__wrappers_unwind.h b/www/firefox38/patches/patch-config_system__wrappers_unwind.h
deleted file mode 100644
index 24a4426ef1c..00000000000
--- a/www/firefox38/patches/patch-config_system__wrappers_unwind.h
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-config_system__wrappers_unwind.h,v 1.1 2015/07/09 14:13:52 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
diff --git a/www/firefox38/patches/patch-gfx_graphite2_src_moz.build b/www/firefox38/patches/patch-gfx_graphite2_src_moz.build
new file mode 100644
index 00000000000..321fc378f42
--- /dev/null
+++ b/www/firefox38/patches/patch-gfx_graphite2_src_moz.build
@@ -0,0 +1,15 @@
+$NetBSD: patch-gfx_graphite2_src_moz.build,v 1.1 2016/01/31 23:43:48 joerg Exp $
+
+--- gfx/graphite2/src/moz.build.orig 2016-01-31 20:42:26.674057599 +0000
++++ gfx/graphite2/src/moz.build
+@@ -60,10 +60,6 @@ MSVC_ENABLE_PGO = True
+ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ NO_VISIBILITY_FLAGS = True
+ DEFINES['GRAPHITE2_EXPORTING'] = True
+-else:
+- # tell graphite2 not to export symbols, we'll be linking it directly with
+- # thebes
+- DEFINES['GRAPHITE2_STATIC'] = True
+
+ FINAL_LIBRARY = 'gkmedias'
+
diff --git a/www/firefox38/patches/patch-gfx_thebes_moz.build b/www/firefox38/patches/patch-gfx_thebes_moz.build
index 1f812247130..a9c594f0cef 100644
--- a/www/firefox38/patches/patch-gfx_thebes_moz.build
+++ b/www/firefox38/patches/patch-gfx_thebes_moz.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-gfx_thebes_moz.build,v 1.1 2015/07/09 14:13:52 ryoon Exp $
+$NetBSD: patch-gfx_thebes_moz.build,v 1.2 2016/01/31 23:43:48 joerg Exp $
---- gfx/thebes/moz.build.orig 2014-11-21 03:37:31.000000000 +0000
+--- gfx/thebes/moz.build.orig 2015-12-14 23:35:58.000000000 +0000
+++ gfx/thebes/moz.build
-@@ -276,6 +276,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
+@@ -287,6 +287,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CFLAGS += CONFIG['TK_CFLAGS']
@@ -15,3 +15,11 @@ $NetBSD: patch-gfx_thebes_moz.build,v 1.1 2015/07/09 14:13:52 ryoon Exp $
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'):
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
+@@ -298,7 +304,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
+ CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
+
+-DEFINES['GRAPHITE2_STATIC'] = True
+-
+ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ DEFINES['OTS_DLL'] = True
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 84c9f33b4d0..87fd7539a66 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.132 2016/01/20 22:14:14 ryoon Exp $
+$NetBSD: distinfo,v 1.133 2016/01/31 23:43:48 joerg Exp $
SHA1 (seamonkey-2.39.source.tar.xz) = cae3d2cf38f85190d0639a391f04953d9313d48b
RMD160 (seamonkey-2.39.source.tar.xz) = 35d442092e359145ff4799d82576e1e8c0ee5a06
@@ -22,7 +22,7 @@ SHA1 (patch-mozilla_config_external_moz.build) = 3cc238e147eff66de1fd42671547b83
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) = 41d86b02ecff5bcb06903c18b487cafad8ec544f
+SHA1 (patch-mozilla_config_system-headers) = fb1deec06c10aa858c235a95c2ae6f9c72a149dc
SHA1 (patch-mozilla_dom_base_DOMRequest.cpp) = 3c01dd16ea83b2d972e437e92b2126aeec68a7a1
SHA1 (patch-mozilla_dom_base_moz.build) = de05328ca4339e0e3a92da3e4517697df9d3b53a
SHA1 (patch-mozilla_dom_events_MessageEvent.h) = 6be0cb8c8c6b60cf9e2604e2deb018bc69b6e2d5
@@ -37,13 +37,14 @@ SHA1 (patch-mozilla_gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 818a1b1cb48
SHA1 (patch-mozilla_gfx_gl_GLContextProviderGLX.cpp) = d4d0cdf25ae15f7cc07d1ad213ec7d2b015e4168
SHA1 (patch-mozilla_gfx_graphite2_moz-gr-update.sh) = ba55405496adf27442dd26a5420397e51a784539
SHA1 (patch-mozilla_gfx_graphite2_src_Bidi.cpp) = fb97becdfeeea742e8c0bc51e10efc124a2a11f3
+SHA1 (patch-mozilla_gfx_graphite2_src_moz.build) = 844b567da0d6f054054b0e9dfb2263e7bc9ee4d6
SHA1 (patch-mozilla_gfx_moz.build) = 9cd67c170321c399b85f9f7729a6d130bb331f17
SHA1 (patch-mozilla_gfx_skia_generate__mozbuild.py) = da3f8c9581d879099e8efbf852049a0f61cb7b24
SHA1 (patch-mozilla_gfx_skia_moz.build) = 8f82fa997976f39d601fe2b003e91e9a63956d88
SHA1 (patch-mozilla_gfx_skia_skia_src_core_SkUtilsArm.cpp) = d830e2aa24ad6b9a68580273a636b1a0a845f5c4
SHA1 (patch-mozilla_gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp) = 7d1f2ca05efbaef16f9058ac98c8b80c05784aeb
SHA1 (patch-mozilla_gfx_skia_skia_src_opts_memset.arm.S) = 7e7e9ba1638935b81128bdf5bc01005797add4cb
-SHA1 (patch-mozilla_gfx_thebes_moz.build) = c9fc7811cf24c735f1f829f206af5d8bba27d505
+SHA1 (patch-mozilla_gfx_thebes_moz.build) = a90dce52fcd9ebdb502acf041d7e861dd0194937
SHA1 (patch-mozilla_gfx_ycbcr_moz.build) = 263c37980558d485e868a7097689cdf35c5f678d
SHA1 (patch-mozilla_gfx_ycbcr_yuv__row__arm.S) = 74c70bad49b9781dae6be4fd46c33da886bcfd34
SHA1 (patch-mozilla_image_decoders_nsJPEGDecoder.cpp) = ff09ce62a57b0024cf664e807afc813fc25eefdf
diff --git a/www/seamonkey/patches/patch-mozilla_config_system-headers b/www/seamonkey/patches/patch-mozilla_config_system-headers
index 134ef8329e8..f20c52d270c 100644
--- a/www/seamonkey/patches/patch-mozilla_config_system-headers
+++ b/www/seamonkey/patches/patch-mozilla_config_system-headers
@@ -1,4 +1,4 @@
-$NetBSD: patch-mozilla_config_system-headers,v 1.19 2016/01/20 22:14:14 ryoon Exp $
+$NetBSD: patch-mozilla_config_system-headers,v 1.20 2016/01/31 23:43:48 joerg Exp $
--- mozilla/config/system-headers.orig 2015-11-04 01:56:15.000000000 +0000
+++ mozilla/config/system-headers
@@ -32,13 +32,15 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.19 2016/01/20 22:14:14 ryoon Ex
#endif
gst/gst.h
gst/app/gstappsink.h
-@@ -1355,3 +1360,44 @@ unicode/utypes.h
+@@ -1355,3 +1360,46 @@ unicode/utypes.h
#endif
libutil.h
unwind.h
+#if MOZ_NATIVE_GRAPHITE2==1
+graphite2/Font.h
++graphite2/Log.h
+graphite2/Segment.h
++graphite2/Types.h
+#endif
+#if MOZ_NATIVE_HARFBUZZ==1
+harfbuzz/hb-ot.h
diff --git a/www/seamonkey/patches/patch-mozilla_gfx_graphite2_src_moz.build b/www/seamonkey/patches/patch-mozilla_gfx_graphite2_src_moz.build
new file mode 100644
index 00000000000..85b7d84ba88
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_gfx_graphite2_src_moz.build
@@ -0,0 +1,15 @@
+$NetBSD: patch-mozilla_gfx_graphite2_src_moz.build,v 1.1 2016/01/31 23:43:48 joerg Exp $
+
+--- mozilla/gfx/graphite2/src/moz.build.orig 2016-01-31 22:13:27.833347842 +0000
++++ mozilla/gfx/graphite2/src/moz.build
+@@ -58,10 +58,6 @@ UNIFIED_SOURCES += [
+ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ NO_VISIBILITY_FLAGS = True
+ DEFINES['GRAPHITE2_EXPORTING'] = True
+-else:
+- # tell graphite2 not to export symbols, we'll be linking it directly with
+- # thebes
+- DEFINES['GRAPHITE2_STATIC'] = True
+
+ FINAL_LIBRARY = 'gkmedias'
+
diff --git a/www/seamonkey/patches/patch-mozilla_gfx_thebes_moz.build b/www/seamonkey/patches/patch-mozilla_gfx_thebes_moz.build
index 805f6197b71..e2a87a90833 100644
--- a/www/seamonkey/patches/patch-mozilla_gfx_thebes_moz.build
+++ b/www/seamonkey/patches/patch-mozilla_gfx_thebes_moz.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_gfx_thebes_moz.build,v 1.1 2015/01/02 04:26:21 ryoon Exp $
+$NetBSD: patch-mozilla_gfx_thebes_moz.build,v 1.2 2016/01/31 23:43:48 joerg Exp $
---- mozilla/gfx/thebes/moz.build.orig 2014-12-03 06:22:42.000000000 +0000
+--- mozilla/gfx/thebes/moz.build.orig 2015-11-04 01:55:29.000000000 +0000
+++ mozilla/gfx/thebes/moz.build
-@@ -276,6 +276,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
+@@ -290,6 +290,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CFLAGS += CONFIG['TK_CFLAGS']
@@ -15,3 +15,12 @@ $NetBSD: patch-mozilla_gfx_thebes_moz.build,v 1.1 2015/01/02 04:26:21 ryoon Exp
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'):
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
+@@ -303,8 +309,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk
+
+ LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
+
+-DEFINES['GRAPHITE2_STATIC'] = True
+-
+ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ DEFINES['OTS_DLL'] = True
+