diff options
Diffstat (limited to 'repo/chromium')
| -rw-r--r-- | repo/chromium/chromium.xibuild | 55 | ||||
| -rw-r--r-- | repo/chromium/no-mallinfo.patch | 41 |
2 files changed, 67 insertions, 29 deletions
diff --git a/repo/chromium/chromium.xibuild b/repo/chromium/chromium.xibuild index a97458a..819a6f5 100644 --- a/repo/chromium/chromium.xibuild +++ b/repo/chromium/chromium.xibuild @@ -3,10 +3,9 @@ NAME="chromium" DESC="Chromium webbrowser (ungoogled)" -MAKEDEPS="meson ninja hwids lld pciutils" -DEPS="alsa-lib at-spi2-atk at-spi2-core atk cairo dbus eudev expat ffmpeg4 flac font-opensans fontconfig freetype2 glib gtk3 harfbuzz lcms2 libdrm libevent libjpeg-turbo libpng pulseaudio libwebp libx11 libxcb libxcomposite libxdamage libxext libxfixes libxkbcommon libxml2 libxrandr libxslt mesa musl nspr nss opus pango re2 snappy wayland xdg-utils nodejs" +MAKEDEPS="meson ninja hwids lld pciutils alsa-lib at-spi2-atk at-spi2-core atk cairo dbus eudev expat ffmpeg4 flac font-opensans fontconfig freetype2 glib gtk3 harfbuzz lcms2 libdrm libevent libjpeg-turbo libpng pulseaudio libwebp libx11 libxcb libxcomposite libxdamage libxext libxfixes libxkbcommon libxml2 libxrandr libxslt mesa musl nspr nss opus pango re2 snappy wayland xdg-utils nodejs libexecinfo" -PKG_VER=100.0.4896.127 +PKG_VER=108.0.5359.124 SOURCE="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$PKG_VER.tar.xz" @@ -18,7 +17,6 @@ https://chromium-fonts.storage.googleapis.com/$fonts_package chromium-VirtualCursor-standard-layout.patch chromium-revert-drop-of-system-java.patch -chromium-use-alpine-target.patch chromium.conf chromium-launcher.sh chromium.desktop @@ -45,7 +43,6 @@ no-getcontext.patch no-mallinfo.patch quiche-arena-size.patch resolver.patch -revert-use-ffile-compilation-dir.patch scoped-file.patch system-opus.patch use-deprecated-ffmpeg-api.patch @@ -101,7 +98,6 @@ prepare () { # added benefit of not having to list all the remaining libraries local use_system=" - ffmpeg flac fontconfig freetype @@ -128,23 +124,31 @@ prepare () { python build/linux/unbundle/replace_gn_files.py \ --system-libraries ${use_system} python third_party/libaddressinput/chromium/tools/update-strings.py + + # avoid errors like error: unknown type name 'ssize_t' + sed -i "1i#include <sys/types.h>" base/third_party/symbolize/symbolize.h + + # this header is missing for some reason? + sed -i "1i#include <cstdint>" net/third_party/quiche/src/quiche/http2/adapter/window_manager.h + } build () { - export CC=clang - export CXX=clang++ - export LD=clang++ - #export AR=ar - #export NM=nm - #export LDFLAGS="-stdlib=libstdc++" + export cc=gcc + export cxx=g++ + export ld=ld + export ar=ar + export nm=nm + #export ldflags="-stdlib=libstdc++" flags=" +is_clang=false custom_toolchain=\"//build/toolchain/linux/unbundle:default\" host_toolchain=\"//build/toolchain/linux/unbundle:default\" enable_nacl=false use_sysroot=false gold_path=\"/usr/bin/ld.gold\" -use_custom_libcxx=true +use_custom_libcxx=false use_gold=false is_debug=false blink_symbol_level=0 @@ -154,6 +158,7 @@ use_allocator=\"none\" use_allocator_shim=false enable_widevine=true use_system_harfbuzz=false +use_system_libffi=true use_system_wayland_scanner=true use_cups=false use_gnome_keyring=false @@ -163,7 +168,7 @@ use_pulseaudio=true link_pulseaudio=true rtc_use_pipewire=true proprietary_codecs=false -ffmpeg_branding=\"Chrome\" +ffmpeg_branding=\"chrome\" fatal_linker_warnings=false disable_fieldtrial_testing_config=true is_official_build=true @@ -173,19 +178,25 @@ use_cfi_icall=false chrome_pgo_phase=0 " - # Append ungoogled chromium flags to _flags array + # append ungoogled chromium flags to _flags array flags="$flags - $(cat "ungoogled-chromium-$PKG_VER-1/flags.gn") + $(cat "ungoogled-chromium-$pkg_ver-1/flags.gn") + enable_mse_mpeg2ts_stream_parser=false " # Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn) - CFLAGS="$CFLAGS -Wno-builtin-macro-redefined" - CXXFLAGS="$CXXFLAGS -Wno-builtin-macro-redefined" - CPPFLAGS="$CPPFLAGS -D__DATE__= -D__TIME__= -D__TIMESTAMP__=" - # Do not warn about unknown warning options - CFLAGS="$CFLAGS -Wno-unknown-warning-option" - CXXFLAGS="$CXXFLAGS -Wno-unknown-warning-option" + # these don't work on gcc build + #CFLAGS="$CFLAGS -WNO-BUILTIN-MACRO-REDEFINED" + #CXXFLAGS="$CXXFLAGS -WNO-BUILTIN-MACRO-REDEFINED" + + # avoid redefining + #CPPFLAGS="$CPPFLAGS -D__DATE__= -D__TIME__= -D__TIMESTAMP__=" + + + # these don't work on gcc build + #CFLAGS="$CFLAGS -WNO-UNKNOWN-WARNING-OPTION" + #CXXFLAGS="$CXXFLAGS -WNO-UNKNOWN-WARNING-OPTION" python3 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles diff --git a/repo/chromium/no-mallinfo.patch b/repo/chromium/no-mallinfo.patch index 23ce40e..675d5b0 100644 --- a/repo/chromium/no-mallinfo.patch +++ b/repo/chromium/no-mallinfo.patch @@ -1,14 +1,30 @@ ---- ./base/trace_event/malloc_dump_provider.cc.orig -+++ ./base/trace_event/malloc_dump_provider.cc -@@ -212,7 +212,7 @@ +--- a/base/trace_event/malloc_dump_provider.cc ++++ b/base/trace_event/malloc_dump_provider.cc +@@ -185,7 +185,6 @@ + #define MALLINFO2_FOUND_IN_LIBC + struct mallinfo2 info = mallinfo2(); + #endif +-#endif // defined(__GLIBC__) && defined(__GLIBC_PREREQ) + #if !defined(MALLINFO2_FOUND_IN_LIBC) + struct mallinfo info = mallinfo(); + #endif +@@ -205,6 +204,7 @@ + sys_alloc_dump->AddScalar(MemoryAllocatorDump::kNameSize, + MemoryAllocatorDump::kUnitsBytes, info.uordblks); + } ++#endif // defined(__GLIBC__) && defined(__GLIBC_PREREQ) + } + #endif + +@@ -339,7 +340,7 @@ &allocated_objects_count); - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. -#else +#elif defined(__GLIBC__) - #if defined(__GLIBC__) && defined(__GLIBC_PREREQ) - #if __GLIBC_PREREQ(2, 33) - #define MALLINFO2_FOUND_IN_LIBC + ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size, + &allocated_objects_size, &allocated_objects_count); + #endif --- ./base/process/process_metrics_posix.cc.orig +++ ./base/process/process_metrics_posix.cc @@ -105,7 +105,7 @@ @@ -81,3 +97,14 @@ /* Define to 1 if you have the <malloc.h> header file. */ #define HAVE_MALLOC_H 1 +--- a/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc ++++ b/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc +@@ -717,7 +717,7 @@ + + #endif // !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if 0 + SHIM_ALWAYS_EXPORT struct mallinfo mallinfo(void) __THROW { + base::SimplePartitionStatsDumper allocator_dumper; + Allocator()->DumpStats("malloc", true, &allocator_dumper); |