PF4Public / gentoo-overlay

Personal Gentoo overlay
74 stars 16 forks source link

dev-util/electron-19.1.4: cannot apply clang-15.patch #182

Closed darkbasic closed 1 year ago

darkbasic commented 1 year ago
>>> Emerging (2 of 2) dev-util/electron-19.1.4::pf4public
>>> Failed to emerge dev-util/electron-19.1.4, Log file:
>>>  '/var/tmp/portage/dev-util/electron-19.1.4/temp/build.log'
>>> Jobs: 1 of 2 complete, 1 failed                 Load avg: 1.35, 1.32, 0.75
 * Package:    dev-util/electron-19.1.4:19/1.4
 * Repository: pf4public
 * Maintainer: PF4Public@users.noreply.github.com
 * Upstream:   https://github.com/electron/electron/issues
 * USE:        clang cups elibc_glibc kernel_linux l10n_af l10n_am l10n_ar l10n_bg l10n_bn l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_en-GB l10n_es l10n_es-419 l10n_et l10n_fa l10n_fi l10n_fil l10n_fr l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_it l10n_ja l10n_kn l10n_ko l10n_lt l10n_lv l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_sw l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_ur l10n_vi l10n_zh-CN l10n_zh-TW ppc64 proprietary-codecs pulseaudio screencast system-ffmpeg system-harfbuzz system-icu system-jsoncpp system-libevent system-libusb system-openh264 system-png system-re2 system-snappy userland_GNU vaapi wayland
 * FEATURES:   network-sandbox preserve-libs sandbox userpriv usersandbox
 * Checking for at least 4 GiB RAM ...
 [ ok ]
 * Checking for at least 10 GiB disk space at "/var/tmp/portage/dev-util/electron-19.1.4/temp" ...
 [ ok ]
 * Determining the location of the kernel source code
 * Found kernel source directory:
 *     /usr/src/linux
 * Found sources for kernel version:
 *     6.0.6-gentoo-dist
 * Checking for suitable kernel configuration options ...
 [ ok ]
 * Checking whether python3_10 is suitable ...
 *   >=dev-lang/python-3.10.4:3.10[xml] ...
 [ ok ]
 *   python_check_deps ...
 [ ok ]
 * Using python3.10 to build (via PYTHON_COMPAT iteration)
 * Disabling dugite
 * Applying openssl_fips-r2.patch ...
 [ ok ]
 * Applying patches from /var/tmp/portage/dev-util/electron-19.1.4/work/patches ...
 *   chromium-102-compiler.patch ...
 [ ok ]
 *   chromium-102-fenced_frame_utils-include.patch ...
 [ ok ]
 *   chromium-102-regex_pattern-array.patch ...
 [ ok ]
 *   chromium-102-swiftshader-template-instantiation.patch ...
 [ ok ]
 *   chromium-102-symbolize-include.patch ...
 [ ok ]
 *   chromium-78-protobuf-RepeatedPtrField-export.patch ...
 [ ok ]
 * Applying chromium-93-InkDropHost-crash.patch ...
 [ ok ]
 * Applying chromium-97-arm-tflite-cast.patch ...
 [ ok ]
 * Applying chromium-98-EnumTable-crash.patch ...
 [ ok ]
 * Applying chromium-98-gtk4-build.patch ...
 [ ok ]
 * Applying chromium-101-libxml-unbundle.patch ...
 [ ok ]
 * Applying chromium-use-oauth2-client-switches-as-default.patch ...
 [ ok ]
 * Applying chromium-shim_headers.patch ...
 [ ok ]
 * Applying chromium-cross-compile.patch ...
 [ ok ]
 * Applying sql-VirtualCursor-standard-layout.patch ...
patching file sql/recover_module/btree.cc
Hunk #1 succeeded at 136 (offset 1 line).
patching file sql/recover_module/btree.h
Hunk #1 succeeded at 103 (offset 1 line).
Hunk #2 succeeded at 151 (offset 1 line).
Hunk #3 succeeded at 173 (offset 1 line).
patching file sql/recover_module/cursor.cc
Hunk #1 succeeded at 28 (offset 2 lines).
Hunk #2 succeeded at 38 (offset 2 lines).
Hunk #3 succeeded at 101 (offset 2 lines).
Hunk #4 succeeded at 115 (offset 2 lines).
patching file sql/recover_module/cursor.h
Hunk #1 succeeded at 130 (offset 1 line).
patching file sql/recover_module/pager.cc
patching file sql/recover_module/pager.h
Hunk #1 succeeded at 5 with fuzz 1.
Hunk #2 succeeded at 73 (offset 2 lines).
Hunk #3 succeeded at 140 with fuzz 1 (offset 2 lines).
 [ ok ]
 * Applying perfetto-system-zlib.patch ...
 [ ok ]
 * Applying gtk-fix-prefers-color-scheme-query.diff ...
patching file ui/gtk/native_theme_gtk.cc
Hunk #1 succeeded at 120 with fuzz 2 (offset 4 lines).
patching file ui/gtk/native_theme_gtk.h
Hunk #1 succeeded at 88 with fuzz 1 (offset -5 lines).
 [ ok ]
 * Applying restore-x86.patch ...
 [ ok ]
 * Applying 0001-linux-seccomp-bpf-ppc64-glibc-workaround-in-SIGSYS-h.patch ...
 [ ok ]
 * Applying 0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch ...
 [ ok ]
 * Applying 0001-services-service_manager-sandbox-linux-Fix-TCGETS-de.patch ...
 [ ok ]
 * Applying 0001-sandbox-linux-bpf_dsl-Update-syscall-ranges-for-ppc6.patch ...
 [ ok ]
 * Applying 0001-sandbox-linux-Implement-partial-support-for-ppc64-sy.patch ...
 [ ok ]
 * Applying 0001-sandbox-linux-Update-IsSyscallAllowed-in-broker_proc.patch ...
 [ ok ]
 * Applying 0001-sandbox-linux-Update-syscall-helpers-lists-for-ppc64.patch ...
 [ ok ]
 * Applying 0002-sandbox-linux-bpf_dsl-Modify-seccomp_macros-to-add-s.patch ...
 [ ok ]
 * Applying 0003-sandbox-linux-system_headers-Update-linux-seccomp-he.patch ...
 [ ok ]
 * Applying 0004-sandbox-linux-system_headers-Update-linux-signal-hea.patch ...
 [ ok ]
 * Applying 0005-sandbox-linux-seccomp-bpf-Add-ppc64-syscall-stub.patch ...
 [ ok ]
 * Applying 0005-sandbox-linux-update-unit-test-for-ppc64.patch ...
 [ ok ]
 * Applying 0006-sandbox-linux-disable-timedwait-time64-ppc64.patch ...
 [ ok ]
 * Applying 0007-sandbox-linux-add-ppc64-stat.patch ...
 [ ok ]
 * Applying Sandbox-linux-services-credentials.cc-PPC.patch ...
 [ ok ]
 * Applying 0008-sandbox-fix-ppc64le-glibc234.patch ...
 [ ok ]
 * Applying 0001-third_party-angle-Include-missing-header-cstddef-in-.patch ...
 [ ok ]
 * Applying 0001-third_party-boringssl-Properly-detect-ppc64le-in-BUI.patch ...
 [ ok ]
 * Applying 0001-third_party-libvpx-Properly-generate-gni-on-ppc64.patch ...
 [ ok ]
 * Applying 0001-third_party-lss-Don-t-look-for-mmap2-on-ppc64.patch ...
 [ ok ]
 * Applying 0001-third_party-pffft-Include-altivec.h-on-ppc64-with-SI.patch ...
 [ ok ]
 * Applying 0002-third_party-libvpx-Add-ppc64-sources-to-gni.patch ...
 [ ok ]
 * Applying 0002-third_party-lss-kernel-structs.patch ...
 [ ok ]
 * Applying 0001-Enable-third-party-libgav1-parser.patch ...
 [ ok ]
 * Applying Modules-desktop_capture-differ_block.cc-PPC.patch ...
 [ ok ]
 * Applying Rtc_base-system-arch.h-PPC.patch ...
 [ ok ]
 * Applying 0002-Include-cstddef-to-fix-build.patch ...
 [ ok ]
 * Applying 0004-third_party-crashpad-port-curl-transport-ppc64.patch ...
 [ ok ]
 * Applying HACK-third_party-libvpx-use-generic-gnu.patch ...
 [ ok ]
 * Applying 0001-Add-ppc64-target-to-libaom.patch ...
 [ ok ]
 * Applying 0001-Add-pregenerated-config-for-libaom-on-ppc64.patch ...
 [ ok ]
 * Applying 0003-third_party-libvpx-Add-ppc64-generated-config.patch ...
 [ ok ]
 * Applying 0003-third_party-ffmpeg-Add-ppc64-generated-config.patch ...
 [ ok ]
 * Applying 0004-third_party-libvpx-work-around-ambiguous-vsx.patch ...
 [ ok ]
 * Applying 0001-Add-support-for-ppc64.patch ...
 [ ok ]
 * Applying 0001-Implement-support-for-ppc64-on-Linux.patch ...
 [ ok ]
 * Applying 0001-Implement-support-for-PPC64-on-Linux.patch ...
 [ ok ]
 * Applying 0001-Properly-detect-little-endian-PPC64-systems.patch ...
 [ ok ]
 * Applying 0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch ...
 [ ok ]
 * Applying fix-breakpad-compile.patch ...
 [ ok ]
 * Applying 0002-Add-ppc64-trap-instructions.patch ...
 [ ok ]
 * Applying 0001-Add-PPC64-support-for-libdav1d.patch ...
 [ ok ]
 * Applying 0001-Fix-libdav1d-compilation-on-clang-ppc.patch ...
 [ ok ]
 * Applying fix-ppc64-linux-syscalls-headers.patch ...
 [ ok ]
 * Applying 0003-thirdparty-fix-dav1d-gn.patch ...
 [ ok ]
 * Applying use-sysconf-page-size-on-ppc64.patch ...
 [ ok ]
 * Applying libpng-pdfium-compile-98.patch ...
 [ ok ]
 * Applying fix-swiftshader-compile.patch ...
 [ ok ]
 * Applying chromium-99-opus.patch ...
patching file media/audio/audio_opus_encoder.h
Hunk #1 succeeded at 13 with fuzz 2.
 [ ok ]
 * Applying chromium-93-ffmpeg-4.4.patch ...
 [ ok ]
 * Applying unbundle-ffmpeg-av_stream_get_first_dts.patch ...
 [ ok ]
 * Applying reverse-roll-src-third_party-ffmpeg.patch ...
 [ ok ]
 * Applying clang-15.patch ...
 [ ok ]
 * - electron/patches/devtools_frontend
 * - electron/patches/node
 * - electron/patches/boringssl
 * - electron/patches/v8
 * - electron/patches/perfetto
 * - electron/patches/webrtc
 * - electron/patches/chromium
error: patch failed: gpu/command_buffer/service/dawn_service_memory_transfer_service.cc:30
error: gpu/command_buffer/service/dawn_service_memory_transfer_service.cc: patch does not apply
 * ERROR: dev-util/electron-19.1.4::pf4public failed (prepare phase):
 *   (no error message)
 * 
 * Call stack:
 *     ebuild.sh, line 122:  Called src_prepare
 *   environment, line 6011:  Called die
 * The specific snippet of code:
 *               git apply --exclude="*/web_tests/*" --exclude="*/test-list/*" --exclude="*/uv/test/*" --exclude="*.rst" -p1 < "${S}/${patch_folder}/$i" || die;
 * 
 * If you need support, post the output of `emerge --info '=dev-util/electron-19.1.4::pf4public'`,
 * the complete build log and the output of `emerge -pqv '=dev-util/electron-19.1.4::pf4public'`.
 * The complete build log is located at '/var/tmp/portage/dev-util/electron-19.1.4/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/dev-util/electron-19.1.4/temp/environment'.
 * Working directory: '/var/tmp/portage/dev-util/electron-19.1.4/work/chromium-102.0.5005.115'
 * S: '/var/tmp/portage/dev-util/electron-19.1.4/work/chromium-102.0.5005.115'

 * Messages for package dev-util/electron-19.1.4:

 * 
 * Chromium 102.0.5005.115 will be used instead of the required one
 * 

 * Messages for package dev-util/electron-19.1.4:

 * ERROR: dev-util/electron-19.1.4::pf4public failed (prepare phase):
 *   (no error message)
 * 
 * Call stack:
 *     ebuild.sh, line 122:  Called src_prepare
 *   environment, line 6011:  Called die
 * The specific snippet of code:
 *               git apply --exclude="*/web_tests/*" --exclude="*/test-list/*" --exclude="*/uv/test/*" --exclude="*.rst" -p1 < "${S}/${patch_folder}/$i" || die;
 * 
 * If you need support, post the output of `emerge --info '=dev-util/electron-19.1.4::pf4public'`,
 * the complete build log and the output of `emerge -pqv '=dev-util/electron-19.1.4::pf4public'`.
 * The complete build log is located at '/var/tmp/portage/dev-util/electron-19.1.4/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/dev-util/electron-19.1.4/temp/environment'.
 * Working directory: '/var/tmp/portage/dev-util/electron-19.1.4/work/chromium-102.0.5005.115'
 * S: '/var/tmp/portage/dev-util/electron-19.1.4/work/chromium-102.0.5005.115'
 * 
 * The following package has failed to build, install, or execute postinst:
 * 
 *  (dev-util/electron-19.1.4:19/1.4::pf4public, ebuild scheduled for merge), Log file:
 *   '/var/tmp/portage/dev-util/electron-19.1.4/temp/build.log'
 *

9.1.3 applies and compiles fine. Not sure if this is ppc64 specifc, can you please check if it applies on amd64?

PF4Public commented 1 year ago

No, it does not, I just didn't have the time to look into it.

You can infer that based on the fact that it wasn't marked stable on amd64 yet and you might be curious to inspect whether tests are passing. :)

I have established some automation when I got bored doing version bumps manually, so sometimes this needs some more attention.

darkbasic commented 1 year ago

@madscientist159 do you know how we could add some kind of CI for ppc64 as well? Right now I'm basically doing it manually myself every time a new version gets released.

PF4Public commented 1 year ago

@darkbasic I hope it is fixed now. Let me know how it goes.

darkbasic commented 1 year ago

@PF4Public yep compiles flawleslly, thanks.