diff options
Diffstat (limited to '2000_system_harfbuzz_support.patch')
-rw-r--r-- | 2000_system_harfbuzz_support.patch | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/2000_system_harfbuzz_support.patch b/2000_system_harfbuzz_support.patch index dc46fa360949..21ccd1f0cd40 100644 --- a/2000_system_harfbuzz_support.patch +++ b/2000_system_harfbuzz_support.patch @@ -34,7 +34,7 @@ diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild diff --git a/dom/base/moz.build b/dom/base/moz.build --- a/dom/base/moz.build +++ b/dom/base/moz.build -@@ -534,16 +534,19 @@ include('/ipc/chromium/chromium-config.m +@@ -538,13 +538,16 @@ include('/ipc/chromium/chromium-config.m FINAL_LIBRARY = 'xul' if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: @@ -46,14 +46,11 @@ diff --git a/dom/base/moz.build b/dom/base/moz.build +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - GENERATED_FILES += [ - 'UseCounterList.h', - ] - - counterlist = GENERATED_FILES['UseCounterList.h'] - counterlist.script = 'gen-usecounters.py:use_counter_list' - counterlist.inputs = ['UseCounters.conf'] + GeneratedFile('UseCounterList.h', script='gen-usecounters.py', + entry_point='use_counter_list', inputs=['UseCounters.conf']) + if CONFIG['CC_TYPE'] in ('clang', 'gcc'): + CXXFLAGS += ['-Wno-error=shadow'] diff --git a/gfx/moz.build b/gfx/moz.build --- a/gfx/moz.build +++ b/gfx/moz.build @@ -170,9 +167,9 @@ diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build --- a/netwerk/dns/moz.build +++ b/netwerk/dns/moz.build -@@ -81,12 +81,15 @@ etld_data = GENERATED_FILES['etld_data.i - etld_data.script = 'prepare_tlds.py' - etld_data.inputs = ['effective_tld_names.dat'] +@@ -77,12 +77,15 @@ FINAL_LIBRARY = 'xul' + GeneratedFile('etld_data.inc', script='prepare_tlds.py', + inputs=['effective_tld_names.dat']) # need to include etld_data.inc LOCAL_INCLUDES += [ @@ -189,7 +186,7 @@ diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build -@@ -240,16 +240,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']: +@@ -234,16 +234,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']: OS_LIBS += [ '-L%s' % CONFIG['MOZ_ANDROID_GOOGLE_VR_LIBS'], '-lgvr', @@ -212,7 +209,7 @@ diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build diff --git a/toolkit/moz.configure b/toolkit/moz.configure --- a/toolkit/moz.configure +++ b/toolkit/moz.configure -@@ -390,16 +390,26 @@ def freetype2_combined_info(fontconfig_i +@@ -394,16 +394,26 @@ def freetype2_combined_info(fontconfig_i return namespace( cflags=freetype2_info.cflags + fontconfig_info.cflags, libs=freetype2_info.libs + fontconfig_info.libs, |