diff --git a/chromium-90.0.4430.93-epel8-aarch64-libpng16-symbol-prefixes.patch b/chromium-90.0.4430.93-epel8-aarch64-libpng16-symbol-prefixes.patch new file mode 100644 index 00000000..fdde71ea --- /dev/null +++ b/chromium-90.0.4430.93-epel8-aarch64-libpng16-symbol-prefixes.patch @@ -0,0 +1,18 @@ +diff -up chromium-90.0.4430.93/third_party/llvm/lldb/test/API/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.aarch64 chromium-90.0.4430.93/third_party/llvm/lldb/test/API/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV +diff -up chromium-90.0.4430.93/third_party/llvm/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.aarch64 chromium-90.0.4430.93/third_party/llvm/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV +diff -up chromium-90.0.4430.93/third_party/llvm/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.aarch64 chromium-90.0.4430.93/third_party/llvm/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV +diff -up chromium-90.0.4430.93/third_party/pdfium/third_party/libpng16/pngprefix.h.aarch64 chromium-90.0.4430.93/third_party/pdfium/third_party/libpng16/pngprefix.h +--- chromium-90.0.4430.93/third_party/pdfium/third_party/libpng16/pngprefix.h.aarch64 2021-05-03 14:08:47.184438786 -0400 ++++ chromium-90.0.4430.93/third_party/pdfium/third_party/libpng16/pngprefix.h 2021-05-03 14:09:59.289797317 -0400 +@@ -458,4 +458,11 @@ + #define png_zlib_inflate PDFIUM_png_zlib_inflate + #define png_zstream_error PDFIUM_png_zstream_error + ++#if PNG_ARM_NEON_IMPLEMENTATION == 1 ++#define png_riffle_palette_neon PDFIUM_png_riffle_palette_neon ++#define png_do_expand_palette_rgba8_neon PDFIUM_png_do_expand_palette_rgba8_neon ++#define png_do_expand_palette_rgb8_neon PDFIUM_png_do_expand_palette_rgb8_neon ++#endif ++ ++ + #endif // PNGPREFIX_H diff --git a/chromium.spec b/chromium.spec index aaae6b32..9d57dac4 100644 --- a/chromium.spec +++ b/chromium.spec @@ -332,6 +332,10 @@ Patch108: chromium-85.0.4183.83-el7-old-libdrm.patch # 33 | property_name.erase(property_name.cbegin(), cur); # Not sure how this EVER worked anywhere, but it only seems to fail on EPEL-7. Patch109: chromium-90.0.4430.93-epel7-erase-fix.patch +# Again, not sure how epel8 is the only one to hit this... +# AARCH64 neon symbols need to be prefixed too to prevent multiple definition issue at linktime +Patch110: chromium-90.0.4430.93-epel8-aarch64-libpng16-symbol-prefixes.patch + # VAAPI # Upstream turned VAAPI on in Linux in 86 @@ -956,6 +960,7 @@ udev. %if 0%{?rhel} == 8 # %%patch107 -p1 -b .el8-arm-incompatible-ints +%patch110 -p1 -b .el8-aarch64-libpng16-symbol-prefixes %endif # Feature specific patches