diff options
author | Björn Bidar | 2021-01-03 03:33:44 +0200 |
---|---|---|
committer | Björn Bidar | 2021-01-03 16:52:48 +0200 |
commit | 7f494b67b528e2cee23db7701d8143257e742a51 (patch) | |
tree | 923c30b98a66b4257aaa7d2fcd6600bae9eac64c /2000_system_harfbuzz_support.patch | |
parent | 78eda2b6d49cfd1e5fcbeb8b68f7bb03bf049e6f (diff) | |
download | aur-7f494b67b528e2cee23db7701d8143257e742a51.tar.gz |
Update to 84.0.1-1
- New upstream release
- Update unity-menubar patch from Ubuntu
- Update firefox-kde patches from openSUSE
- Drop patch to fix building against rust 1.48 as its commited
upstream MOZILLA#1667736
- No longer depend on cbindgen as newer versions now work when building
firefox
- Rebase patches
- system-sqlite
- system-harfbuzz
- system-graphite2
- system-dav1d
- sandbox needs to be built with --param lto-partitions=1 when GCC LTO is enabled
MOZILLA#1516803
- Use remoting name for GDK application names MOZILLA#1530052
- Disable elfhack
- Add several patches from/collected by Gentoo to improve PGO/LTO
builds with GCC
- Remove old PGO patch with workarounds that are no longer required for
PGP/LTO builds patch, move parts that are still needed to a patch
superseding it
- Use bld binutils linker instead of gold
(it crashed during linking:
"/usr/bin/ld.gold:
internal error in set_xindex, at /build/binutils/src/binutils-gdb/gold/object.h:1007")
Diffstat (limited to '2000_system_harfbuzz_support.patch')
-rw-r--r-- | 2000_system_harfbuzz_support.patch | 136 |
1 files changed, 39 insertions, 97 deletions
diff --git a/2000_system_harfbuzz_support.patch b/2000_system_harfbuzz_support.patch index 06072d3cd411..37017f9623de 100644 --- a/2000_system_harfbuzz_support.patch +++ b/2000_system_harfbuzz_support.patch @@ -34,59 +34,38 @@ 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 -@@ -543,16 +543,19 @@ include('/ipc/chromium/chromium-config.m - FINAL_LIBRARY = 'xul' - - if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: - DEFINES['HAVE_SIDEBAR'] = True - - if CONFIG['MOZ_X11']: - CXXFLAGS += CONFIG['TK_CFLAGS'] +@@ -549,6 +549,9 @@ + if CONFIG["MOZ_X11"]: + CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - GeneratedFile('UseCounterList.h', script='gen-usecounters.py', - entry_point='use_counter_list', inputs=['UseCounters.conf']) - - GeneratedFile('UseCounterWorkerList.h', script='gen-usecounters.py', - entry_point='use_counter_list', inputs=['UseCountersWorker.conf']) - - if CONFIG['CC_TYPE'] in ('clang', 'gcc'): - CXXFLAGS += ['-Wno-error=shadow'] + GeneratedFile( + "UseCounterList.h", + script="gen-usecounters.py", + diff --git a/gfx/moz.build b/gfx/moz.build --- a/gfx/moz.build +++ b/gfx/moz.build -@@ -8,26 +8,28 @@ with Files('**'): - BUG_COMPONENT = ('Core', 'Graphics') - SCHEDULES.inclusive += ['android-hw-gfx'] - with Files('wr/**'): - BUG_COMPONENT = ('Core', 'Graphics: WebRender') - - if CONFIG['MOZ_TREE_CAIRO']: - DIRS += ['cairo'] +@@ -13,6 +13,9 @@ + if CONFIG["MOZ_TREE_CAIRO"]: + DIRS += ["cairo"] +if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: + DIRS += ['harfbuzz/src'] + DIRS += [ - '2d', - 'ycbcr', - 'angle', - 'src', - 'qcms', - 'gl', - 'layers', - 'graphite2/src', -- 'harfbuzz/src', - 'ots/src', - 'thebes', - 'ipc', - 'vr', - 'config', - 'webrender_bindings', - 'wgpu_bindings', - ] + "2d", + "ycbcr", +@@ -22,7 +25,6 @@ + "gl", + "layers", + "graphite2/src", +- "harfbuzz/src", + "ots/src", + "thebes", + "ipc", diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py --- a/gfx/skia/generate_mozbuild.py +++ b/gfx/skia/generate_mozbuild.py @@ -136,90 +115,58 @@ diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build -@@ -285,11 +285,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk' - - if CONFIG['MOZ_WAYLAND']: - CXXFLAGS += CONFIG['MOZ_WAYLAND_CFLAGS'] - - LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] +@@ -289,6 +289,9 @@ - DEFINES['GRAPHITE2_STATIC'] = True + DEFINES["GRAPHITE2_STATIC"] = True +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - if CONFIG['CC_TYPE'] == 'clang': + if CONFIG["CC_TYPE"] == "clang": # Suppress warnings from Skia header files. - SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough'] + SOURCES["gfxPlatform.cpp"].flags += ["-Wno-implicit-fallthrough"] diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build --- a/intl/unicharutil/util/moz.build +++ b/intl/unicharutil/util/moz.build -@@ -20,9 +20,12 @@ UNIFIED_SOURCES += [ - 'ICUUtils.cpp', - 'IrishCasing.cpp', - 'nsBidiUtils.cpp', - 'nsSpecialCasingData.cpp', - 'nsUnicharUtils.cpp', - 'nsUnicodeProperties.cpp', +@@ -25,4 +25,7 @@ + "nsUnicodeProperties.cpp", ] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - FINAL_LIBRARY = 'xul' + FINAL_LIBRARY = "xul" diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build --- a/netwerk/dns/moz.build +++ b/netwerk/dns/moz.build -@@ -80,12 +80,15 @@ GeneratedFile('etld_data.inc', script='p - inputs=['effective_tld_names.dat']) +@@ -102,5 +102,8 @@ - # need to include etld_data.inc - LOCAL_INCLUDES += [ - '/netwerk/base', - '/netwerk/protocol/http', - ] + USE_LIBS += ["icu"] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - USE_LIBS += ['icu'] - - if CONFIG['CC_TYPE'] in ('clang', 'gcc'): - CXXFLAGS += ['-Wno-error=shadow'] + if CONFIG["CC_TYPE"] in ("clang", "gcc"): + CXXFLAGS += ["-Wno-error=shadow"] diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build -@@ -234,16 +234,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']: - OS_LIBS += [ - '-L%s' % CONFIG['MOZ_ANDROID_GOOGLE_VR_LIBS'], - '-lgvr', - ] - - OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] - OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] +@@ -238,6 +238,9 @@ + OS_LIBS += CONFIG["MOZ_CAIRO_OSLIBS"] + OS_LIBS += CONFIG["MOZ_WEBRTC_X11_LIBS"] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] + - if CONFIG['MOZ_SYSTEM_JPEG']: - OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] - - if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] + if CONFIG["MOZ_SYSTEM_JPEG"]: + OS_LIBS += CONFIG["MOZ_JPEG_LIBS"] - if CONFIG['MOZ_SYSTEM_WEBP']: - OS_LIBS += CONFIG['MOZ_WEBP_LIBS'] diff --git a/toolkit/moz.configure b/toolkit/moz.configure --- a/toolkit/moz.configure +++ b/toolkit/moz.configure -@@ -397,16 +397,26 @@ def freetype2_combined_info(fontconfig_i - return namespace( - cflags=freetype2_info.cflags + fontconfig_info.cflags, - libs=freetype2_info.libs + fontconfig_info.libs, - ) - - add_old_configure_assignment('_HAVE_FREETYPE2', - depends_if(freetype2_info)(lambda _: True)) +@@ -475,6 +475,16 @@ + "_HAVE_FREETYPE2", depends_if(freetype2_info)(lambda _: True) + ) +# HarfBuzz +# ============================================================== @@ -234,8 +181,3 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure # Apple platform decoder support # ============================================================== @depends(toolkit) - def applemedia(toolkit): - if toolkit in ('cocoa', 'uikit'): - return True - - set_config('MOZ_APPLEMEDIA', applemedia) |