search

ungoogled-software / ungoogled-chromium-macos

macOS packaging for ungoogled-chromium
BSD 3-Clause "New" or "Revised" License
252 stars 69 forks source link

Update to ungoogled-chromium 125.0.6422.60 #168

Closed Cubik65536 closed 1 month ago

Cubik65536 commented 1 month ago

Notes:

Builds and runs fine locally:

image

Signed-off-by: Qian Qian "Cubik"‎ cubik65536@cubik65536.top

Cubik65536 commented 1 month ago

Currently having a build issue...

[60427/60583] SOLINK 'obj/chrome/chrome_framework_shared_library/Chromium Framework' 'obj/chrome/...k.dSYM/Contents/Info.plist' 'Chromium Framework.dSYM/Contents/Resources/DWARF/Chromium Framework'
FAILED: obj/chrome/chrome_framework_shared_library/Chromium Framework obj/chrome/chrome_framework_shared_library/Chromium Framework.TOC Chromium Framework.dSYM/Contents/Info.plist Chromium Framework.dSYM/Contents/Resources/DWARF/Chromium Framework
if [ ! -e "obj/chrome/chrome_framework_shared_library/Chromium Framework" -o ! -e "obj/chrome/chrome_framework_shared_library/Chromium Framework.TOC" ] || /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/otool -l "obj/chrome/chrome_framework_shared_library/Chromium Framework" | grep -q LC_REEXPORT_DYLIB ; then TOOL_VERSION=1715809550 ../../build/toolchain/apple/linker_driver.py -Wcrl,driver,../../third_party/llvm-build/Release+Asserts/bin/clang++ -Wcrl,strippath,/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip -Wcrl,installnametoolpath,../../third_party/llvm-build/Release+Asserts/bin/llvm-install-name-tool -shared  -Wcrl,dsym,. -Wcrl,dsymutilpath,/usr/bin/dsymutil -compatibility_version 6422.0.60 -current_version 6422.0.60 -Wl,-install_name,@executable_path/../Frameworks/Chromium\ Framework.framework/Versions/125.0.6422.60/Chromium\ Framework -fuse-ld=lld -Wl,--icf=all -Wl,--color-diagnostics -Wl,-mllvm,-instcombine-lower-dbg-declare=0 -Wl,-mllvm,-split-threshold-for-reg-with-hint=0 -Wl,-cache_path_lto,thinlto-cache -Wl,--thinlto-cache-policy=cache_size=10\%:cache_size_bytes=40g:cache_size_files=100000 -flto=thin -Wl,--thinlto-jobs=all -Wl,-mllvm,-import-instr-limit=30 -Wcrl,object_path_lto -Wl,-mllvm,-disable-auto-upgrade-debug-info -fwhole-program-vtables -Wl,--strict-auto-link -Wl,--no-call-graph-profile-sort --target=arm64-apple-macos -Wl,-mllvm,-enable-machine-outliner=never -no-canonical-prefixes -Wl,-dead_strip -Wl,-no_data_in_code_info -Wl,-no_function_starts -nostdlib++ -isysroot ../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk -mmacos-version-min=10.15 -Wl,-ObjC -Wcrl,strip,-x,-S -Wl,--lto-O2 -Wl,-order_file -Wl,../../chrome/app/framework.order -Wl,-exported_symbols_list -Wl,../../chrome/app/framework.exports prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libstd.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/liballoc.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libcfg_if.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libcompiler_builtins.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libcore.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libgetopts.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libhashbrown.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/liblibc.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libpanic_abort.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libpanic_unwind.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/librustc_demangle.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libstd_detect.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libtest.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libunicode_width.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libunwind.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libaddr2line.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libadler.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libgimli.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libmemchr.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libminiz_oxide.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libobject.rlib -L/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk/usr/lib -o "obj/chrome/chrome_framework_shared_library/Chromium Framework" "@obj/chrome/chrome_framework_shared_library/Chromium Framework.rsp" obj/third_party/rust/cxx/v1/lib/libcxx_lib.rlib obj/skia/libskia_cbridge_urust_uside.rlib obj/third_party/rust/font_types/v0_4/lib/libfont_types_lib.rlib obj/third_party/rust/read_fonts/v0_15/lib/libread_fonts_lib.rlib obj/third_party/rust/skrifa/v0_15/lib/libskrifa_lib.rlib obj/build/rust/chromium_prelude/libchromium.rlib obj/third_party/blink/common/rust_crash/libthird_uparty_sblink_scommon_srust_ucrash_crs.rlib obj/components/qr_code_generator/libcomponents_sqr_ucode_ugenerator_cqr_ucode_ugenerator_uffi_uglue.rlib obj/third_party/rust/qr_code/v2/lib/libqr_code_lib.rlib && { /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/otool -l "obj/chrome/chrome_framework_shared_library/Chromium Framework" | grep LC_ID_DYLIB -A 5; /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm -gPp "obj/chrome/chrome_framework_shared_library/Chromium Framework" | cut -f1-2 -d' ' | grep -v U$$; true; } > "obj/chrome/chrome_framework_shared_library/Chromium Framework.TOC"; else TOOL_VERSION=1715809550 ../../build/toolchain/apple/linker_driver.py -Wcrl,driver,../../third_party/llvm-build/Release+Asserts/bin/clang++ -Wcrl,strippath,/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip -Wcrl,installnametoolpath,../../third_party/llvm-build/Release+Asserts/bin/llvm-install-name-tool -shared  -Wcrl,dsym,. -Wcrl,dsymutilpath,/usr/bin/dsymutil -compatibility_version 6422.0.60 -current_version 6422.0.60 -Wl,-install_name,@executable_path/../Frameworks/Chromium\ Framework.framework/Versions/125.0.6422.60/Chromium\ Framework -fuse-ld=lld -Wl,--icf=all -Wl,--color-diagnostics -Wl,-mllvm,-instcombine-lower-dbg-declare=0 -Wl,-mllvm,-split-threshold-for-reg-with-hint=0 -Wl,-cache_path_lto,thinlto-cache -Wl,--thinlto-cache-policy=cache_size=10\%:cache_size_bytes=40g:cache_size_files=100000 -flto=thin -Wl,--thinlto-jobs=all -Wl,-mllvm,-import-instr-limit=30 -Wcrl,object_path_lto -Wl,-mllvm,-disable-auto-upgrade-debug-info -fwhole-program-vtables -Wl,--strict-auto-link -Wl,--no-call-graph-profile-sort --target=arm64-apple-macos -Wl,-mllvm,-enable-machine-outliner=never -no-canonical-prefixes -Wl,-dead_strip -Wl,-no_data_in_code_info -Wl,-no_function_starts -nostdlib++ -isysroot ../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk -mmacos-version-min=10.15 -Wl,-ObjC -Wcrl,strip,-x,-S -Wl,--lto-O2 -Wl,-order_file -Wl,../../chrome/app/framework.order -Wl,-exported_symbols_list -Wl,../../chrome/app/framework.exports prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libstd.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/liballoc.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libcfg_if.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libcompiler_builtins.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libcore.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libgetopts.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libhashbrown.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/liblibc.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libpanic_abort.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libpanic_unwind.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/librustc_demangle.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libstd_detect.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libtest.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libunicode_width.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libunwind.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libaddr2line.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libadler.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libgimli.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libmemchr.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libminiz_oxide.rlib prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libobject.rlib -L/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk/usr/lib -o "obj/chrome/chrome_framework_shared_library/Chromium Framework" "@obj/chrome/chrome_framework_shared_library/Chromium Framework.rsp" obj/third_party/rust/cxx/v1/lib/libcxx_lib.rlib obj/skia/libskia_cbridge_urust_uside.rlib obj/third_party/rust/font_types/v0_4/lib/libfont_types_lib.rlib obj/third_party/rust/read_fonts/v0_15/lib/libread_fonts_lib.rlib obj/third_party/rust/skrifa/v0_15/lib/libskrifa_lib.rlib obj/build/rust/chromium_prelude/libchromium.rlib obj/third_party/blink/common/rust_crash/libthird_uparty_sblink_scommon_srust_ucrash_crs.rlib obj/components/qr_code_generator/libcomponents_sqr_ucode_ugenerator_cqr_ucode_ugenerator_uffi_uglue.rlib obj/third_party/rust/qr_code/v2/lib/libqr_code_lib.rlib && { /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/otool -l "obj/chrome/chrome_framework_shared_library/Chromium Framework" | grep LC_ID_DYLIB -A 5; /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm -gPp "obj/chrome/chrome_framework_shared_library/Chromium Framework" | cut -f1-2 -d' ' | grep -v U$$; true; } > "obj/chrome/chrome_framework_shared_library/Chromium Framework.tmp" && if ! cmp -s "obj/chrome/chrome_framework_shared_library/Chromium Framework.tmp" "obj/chrome/chrome_framework_shared_library/Chromium Framework.TOC"; then mv "obj/chrome/chrome_framework_shared_library/Chromium Framework.tmp" "obj/chrome/chrome_framework_shared_library/Chromium Framework.TOC" ; fi; fi
ld64.lld: error: undefined symbol: client_certificates::ClientCertificatesService::Create(client_certificates::CertificateProvisioningService*, std::__Cr::unique_ptr<net::ClientCertStore, std::__Cr::default_delete<net::ClientCertStore>>)
>>> referenced by tmpw4emt789/12942.arm64.lto.o:(symbol ProfileNetworkContextService::CreateClientCertStore()+0xa4)

ld64.lld: error: undefined symbol: client_certificates::CertificateProvisioningServiceFactory::GetForProfile(Profile*)
>>> referenced by tmpw4emt789/12942.arm64.lto.o:(symbol ProfileNetworkContextService::CreateClientCertStore()+0x90)

ld64.lld: error: undefined symbol: client_certificates::features::IsManagedClientCertificateForUserEnabled()
>>> referenced by tmpw4emt789/12942.arm64.lto.o:(symbol ProfileNetworkContextService::CreateClientCertStore()+0x84)
clang++: error: linker command failed with exit code 1 (use -v to see invocation)
Traceback (most recent call last):
  File "/Users/cubik65536/ungoogled-chromium-macos/build/src/out/Default/../../build/toolchain/apple/linker_driver.py", line 389, in <module>
    LinkerDriver(sys.argv).run()
  File "/Users/cubik65536/ungoogled-chromium-macos/build/src/out/Default/../../build/toolchain/apple/linker_driver.py", line 172, in run
    subprocess.check_call([self._driver_path] + compiler_driver_args,
  File "/opt/homebrew/Cellar/python@3.12/3.12.3/Frameworks/Python.framework/Versions/3.12/lib/python3.12/subprocess.py", line 413, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['../../third_party/llvm-build/Release+Asserts/bin/clang++', '-shared', '-compatibility_version', '6422.0.60', '-current_version', '6422.0.60', '-Wl,-install_name,@executable_path/../Frameworks/Chromium Framework.framework/Versions/125.0.6422.60/Chromium Framework', '-fuse-ld=lld', '-Wl,--icf=all', '-Wl,--color-diagnostics', '-Wl,-mllvm,-instcombine-lower-dbg-declare=0', '-Wl,-mllvm,-split-threshold-for-reg-with-hint=0', '-Wl,-cache_path_lto,thinlto-cache', '-Wl,--thinlto-cache-policy=cache_size=10%:cache_size_bytes=40g:cache_size_files=100000', '-flto=thin', '-Wl,--thinlto-jobs=all', '-Wl,-mllvm,-import-instr-limit=30', '-Wl,-mllvm,-disable-auto-upgrade-debug-info', '-fwhole-program-vtables', '-Wl,--strict-auto-link', '-Wl,--no-call-graph-profile-sort', '--target=arm64-apple-macos', '-Wl,-mllvm,-enable-machine-outliner=never', '-no-canonical-prefixes', '-Wl,-dead_strip', '-Wl,-no_data_in_code_info', '-Wl,-no_function_starts', '-nostdlib++', '-isysroot', '../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk', '-mmacos-version-min=10.15', '-Wl,-ObjC', '-Wl,--lto-O2', '-Wl,-order_file', '-Wl,../../chrome/app/framework.order', '-Wl,-exported_symbols_list', '-Wl,../../chrome/app/framework.exports', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libstd.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/liballoc.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libcfg_if.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libcompiler_builtins.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libcore.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libgetopts.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libhashbrown.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/liblibc.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libpanic_abort.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libpanic_unwind.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/librustc_demangle.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libstd_detect.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libtest.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libunicode_width.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libunwind.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libaddr2line.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libadler.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libgimli.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libmemchr.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libminiz_oxide.rlib', 'prebuilt_rustc_sysroot/lib/rustlib/aarch64-apple-darwin/lib/libobject.rlib', '-L/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk/usr/lib', '-o', 'obj/chrome/chrome_framework_shared_library/Chromium Framework', '@obj/chrome/chrome_framework_shared_library/Chromium Framework.rsp', 'obj/third_party/rust/cxx/v1/lib/libcxx_lib.rlib', 'obj/skia/libskia_cbridge_urust_uside.rlib', 'obj/third_party/rust/font_types/v0_4/lib/libfont_types_lib.rlib', 'obj/third_party/rust/read_fonts/v0_15/lib/libread_fonts_lib.rlib', 'obj/third_party/rust/skrifa/v0_15/lib/libskrifa_lib.rlib', 'obj/build/rust/chromium_prelude/libchromium.rlib', 'obj/third_party/blink/common/rust_crash/libthird_uparty_sblink_scommon_srust_ucrash_crs.rlib', 'obj/components/qr_code_generator/libcomponents_sqr_ucode_ugenerator_cqr_ucode_ugenerator_uffi_uglue.rlib', 'obj/third_party/rust/qr_code/v2/lib/libqr_code_lib.rlib', '-Wl,-object_path_lto,tmpw4emt789']' returned non-zero exit status 1.
ninja: build stopped: subcommand failed.
teeminus commented 1 month ago

That looks familiar. Have a look at the changes to the windows safebrowsing patch for this release and adapt it accordingly (the corresponding ifdef for Mac should be already visible in the windows patch).

teeminus commented 1 month ago

patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch