diff --git a/network/web/chromium-browser/actions.py b/network/web/chromium-browser/actions.py index c7be01f677..67150379d8 100644 --- a/network/web/chromium-browser/actions.py +++ b/network/web/chromium-browser/actions.py @@ -17,15 +17,17 @@ ARCH = "x64" def setup(): shelltools.export("LC_ALL", "C") - shelltools.export("JAVA_CMD", "/usr/bin/java_8") + #shelltools.export("JAVA_CMD", "/usr/bin/java_8") shelltools.system("mkdir -p third_party/node/linux/node-linux-x64/bin") shelltools.system("ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/") + + #shelltools.system("sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py") - #for LIB in ["freetype", "flac", "ffmpeg", "fontconfig", "harfbuzz-ng", "libdrm", "libjpeg", "libxml" ,"libxslt", "libwebp", "opus", "re2", "snappy", "yasm"]: - #shelltools.system('find -type f -path "*third_party/$LIB/*" \! -path "*third_party/$LIB/chromium/*" \! -path "*third_party/$LIB/google/*" \! -regex ".*\.\(gn\|gni\|isolate\|py\)" -delete') + #for LIB in ["freetype", "flac", "fontconfig", "libevent", "libwebp", "re2", "snappy"]: + #shelltools.system('find -type f -path "*third_party/%s/*" \! -path "*third_party/%s/chromium/*" \! -path "*third_party/%s/google/*" \! -regex ".*\.\(gn\|gni\|isolate\|py\)" -delete' %(LIB, LIB, LIB)) - #shelltools.system("build/linux/unbundle/replace_gn_files.py --system-libraries flac ffmpeg fontconfig freetype harfbuzz-ng libdrm libjpeg libxml libxslt libwebp opus re2 snappy yasm") + #shelltools.system("build/linux/unbundle/replace_gn_files.py --system-libraries flac fontconfig freetype libevent libwebp re2 snappy") shelltools.system("sed -i -e 's/\/malloc/' -e 's/\/free/' \ third_party/blink/renderer/core/xml/*.cc \ @@ -37,9 +39,9 @@ def setup(): use_sysroot=false \ chrome_pgo_phase=0 \ enable_nacl=true \ - enable_nacl_nonsfi=true \ + enable_nacl_nonsfi=false \ rtc_use_pipewire=true \ - use_custom_libcxx=true \ + use_custom_libcxx=false \ clang_use_chrome_plugins=false \ is_official_build=true \ fieldtrial_testing_like_official_build=true \ @@ -64,12 +66,13 @@ def setup(): closure_compile=false \ symbol_level=0' - - #clangpath = "%s/chromium-%s/third_party/llvm-build/Release+Asserts/bin/" %(get.workDIR(), get.srcVERSION()) + + shelltools.system("/usr/bin/python3 tools/clang/scripts/update.py") + clangpath = "%s/chromium-%s/third_party/llvm-build/Release+Asserts/bin/" %(get.workDIR(), get.srcVERSION()) - shelltools.export("CC", "clang" ) - shelltools.export("CXX", "clang++" ) - shelltools.export("AR", "ar" ) + shelltools.export("CC", "%s/clang" %clangpath) + shelltools.export("CXX", "%s/clang++" %clangpath) + shelltools.export("AR", "%s/llvm-ar" %clangpath) shelltools.export("NM", "nm" ) shelltools.export("RANLIB", "ranlib" ) @@ -79,7 +82,6 @@ def setup(): shelltools.export("CPPFLAGS", "-D__DATE__= -D__TIME__= -D__TIMESTAMP__=") shelltools.system("/usr/bin/python3 build/download_nacl_toolchains.py --packages nacl_x86_newlib,pnacl_newlib,pnacl_translator sync --extract") - #shelltools.system("/usr/bin/python3 tools/clang/scripts/update.py") shelltools.system("/usr/bin/python3 tools/gn/bootstrap/bootstrap.py --gn-gen-args '%s'"% opt) shelltools.system("out/Release/gn gen out/Release --args='%s'"% opt) @@ -96,13 +98,21 @@ def install(): #should be checked should for the missing folder "out/Release" for vla in ["*.pak", "*.json", "chrome", "locales", "resources", "icudtl.dat", "mksnapshot", "chromedriver", "snapshot_blob.bin", "character_data_generator", \ - "libEGL.so", "libGLESv2.so", "libVk*.so", "v8_context_snapshot.bin", "MEIPreload", "nacl_helper", "nacl_helper_bootstrap", "nacl_helper_nonsfi", "nacl_irt_x86_64.nexe"]: + "libEGL.so", "libGLESv2.so", "libVk*.so", "v8_context_snapshot.bin", "MEIPreload", "nacl_helper", "nacl_helper_bootstrap", "nacl_irt_x86_64.nexe"]: pisitools.insinto("/usr/lib/chromium-browser", "%s" % vla) - + pisitools.insinto("/usr/lib/chromium-browser", "chrome_sandbox", "chrome-sandbox") pisitools.dosym("/usr/lib/chromium-browser/chrome", "/usr/bin/chromium-browser") shelltools.system("chmod -v 4755 %s/usr/lib/chromium-browser/chrome-sandbox" %get.installDIR()) + + shelltools.system("sed -ni \ + -e '//d' \ + -e '/

/N;/

\n.*\(We invite\|Chromium supports Vorbis\)/,/<\/p>/d' \ + -e '/^ + +-#ifdef _EVENT_HAVE_UINT64_T ++/* #ifdef _EVENT_HAVE_UINT64_T */ + #define ev_uint64_t uint64_t + #define ev_int64_t int64_t +-#elif defined(WIN32) ++#if defined(WIN32) + #define ev_uint64_t unsigned __int64 + #define ev_int64_t signed __int64 + #elif _EVENT_SIZEOF_LONG_LONG == 8 +@@ -68,9 +68,9 @@ + #error "No way to define ev_uint64_t" + #endif + +-#ifdef _EVENT_HAVE_UINT32_T ++/* #ifdef _EVENT_HAVE_UINT32_T */ + #define ev_uint32_t uint32_t +-#elif defined(WIN32) ++#if defined(WIN32) + #define ev_uint32_t unsigned int + #elif _EVENT_SIZEOF_LONG == 4 + #define ev_uint32_t unsigned long +@@ -80,9 +80,9 @@ + #error "No way to define ev_uint32_t" + #endif + +-#ifdef _EVENT_HAVE_UINT16_T ++/* #ifdef _EVENT_HAVE_UINT16_T */ + #define ev_uint16_t uint16_t +-#elif defined(WIN32) ++#if defined(WIN32) + #define ev_uint16_t unsigned short + #elif _EVENT_SIZEOF_INT == 2 + #define ev_uint16_t unsigned int +@@ -92,11 +92,12 @@ + #error "No way to define ev_uint16_t" + #endif + +-#ifdef _EVENT_HAVE_UINT8_T ++/* #ifdef _EVENT_HAVE_UINT8_T */ + #define ev_uint8_t uint8_t ++/* + #else + #define ev_uint8_t unsigned char +-#endif ++#endif */ + + int evutil_socketpair(int d, int type, int protocol, int sv[2]); + int evutil_make_socket_nonblocking(int sock); diff --git a/network/web/chromium-browser/pspec.xml b/network/web/chromium-browser/pspec.xml index 3fa396d6dd..5a01b3d7b3 100644 --- a/network/web/chromium-browser/pspec.xml +++ b/network/web/chromium-browser/pspec.xml @@ -65,6 +65,7 @@ libxslt-devel llvm-clang-devel lld-devel + llvm compiler-rt minizip-devel mit-kerberos @@ -97,6 +98,7 @@ libxkbcommon-devel jre8-openjdk-headless pipewire-0.2-devel + libevent-devel add-dependency-on-opus-in-webcodecs.patch @@ -131,7 +133,7 @@ at-spi2-core gtk3 - + libevent libXcomposite libXcursor libXdamage @@ -180,6 +182,7 @@ /usr/share/man /usr/share/doc /usr/share/icons + /usr/share/metainfo /usr/share/pixmaps /usr/share/applications /usr/share/drirc.d/10-chromium-browser.conf