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 /www/seamonkey/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 'www/seamonkey/patches')
3 files changed, 31 insertions, 5 deletions
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 + |