diff options
Diffstat (limited to 'mail')
9 files changed, 68 insertions, 21 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 |