diff options
| author | joerg <joerg@pkgsrc.org> | 2016-01-31 23:43:48 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-01-31 23:43:48 +0000 |
| commit | f646cf3ae9c4d0813b582ebaea1c1a1a004f51d9 (patch) | |
| tree | 7280b9237759c1facd1c171da3c73137760130e0 /mail/thunderbird/patches | |
| parent | 1b9712f573519f35fa5a9867ac968f9dccea2a36 (diff) | |
| download | pkgsrc-f646cf3ae9c4d0813b582ebaea1c1a1a004f51d9.tar.gz | |
Don't request static graphite, it breaks the build against newer
external graphite. Add all the graphite headers to the magic wrapper
list to avoid future fun. Remove manual unwind.h header where it still
exists.
Diffstat (limited to 'mail/thunderbird/patches')
4 files changed, 29 insertions, 13 deletions
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 |