From c5a5cbe948f09d7c55a096534c327a5ceea06b15 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Thu, 16 Jul 2020 10:57:18 -0400
Subject: [PATCH] more fixes

---
 chromium-84.0.4147.89-nss3.patch | 12 ++++++++++++
 chromium.spec                    |  6 +++++-
 clean_ffmpeg.sh                  |  3 +++
 sources                          |  2 +-
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 chromium-84.0.4147.89-nss3.patch

diff --git a/chromium-84.0.4147.89-nss3.patch b/chromium-84.0.4147.89-nss3.patch
new file mode 100644
index 00000000..44e7381b
--- /dev/null
+++ b/chromium-84.0.4147.89-nss3.patch
@@ -0,0 +1,12 @@
+diff -up chromium-84.0.4147.89/crypto/scoped_nss_types.h.nss3 chromium-84.0.4147.89/crypto/scoped_nss_types.h
+--- chromium-84.0.4147.89/crypto/scoped_nss_types.h.nss3	2020-07-15 17:18:08.086512250 -0400
++++ chromium-84.0.4147.89/crypto/scoped_nss_types.h	2020-07-15 17:18:15.980396748 -0400
+@@ -7,7 +7,7 @@
+ 
+ #include <keyhi.h>
+ #include <nss.h>
+-#include <nss/certt.h>
++#include <nss3/certt.h>
+ #include <pk11pub.h>
+ #include <plarena.h>
+ 
diff --git a/chromium.spec b/chromium.spec
index b585299b..49ede7bc 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -205,6 +205,9 @@ Patch10:	chromium-79.0.3945.56-widevine-other-locations.patch
 Patch11:	chromium-71.0.3578.98-py2-bootstrap.patch
 # Add "Fedora" to the user agent string
 Patch12:	chromium-79.0.3945.56-fedora-user-agent.patch
+# Find nss include files under nss3
+Patch13:	chromium-84.0.4147.89-nss3.patch
+
 # rename function to avoid conflict with rawhide glibc "gettid()"
 Patch50:	chromium-75.0.3770.80-grpc-gettid-fix.patch
 # Needs to be submitted..
@@ -835,6 +838,7 @@ udev.
 %patch9 -p1 -b .gcc9
 %patch10 -p1 -b .widevine-other-locations
 %patch11 -p1 -b .py2
+%patch13 -p1 -b .nss3
 
 # Short term fixes (usually gcc and backports)
 %patch50 -p1 -b .gettid-fix
@@ -1034,7 +1038,7 @@ CHROMIUM_HEADLESS_GN_DEFINES+=' use_ozone=true ozone_auto_platforms=false ozone_
 CHROMIUM_HEADLESS_GN_DEFINES+=' headless_use_embedded_resources=true icu_use_data_file=false v8_use_external_startup_data=false'
 CHROMIUM_HEADLESS_GN_DEFINES+=' enable_nacl=false enable_print_preview=false enable_remoting=false use_alsa=false'
 CHROMIUM_HEADLESS_GN_DEFINES+=' use_cups=false use_dbus=false use_gio=false use_kerberos=false use_libpci=false'
-CHROMIUM_HEADLESS_GN_DEFINES+=' use_pulseaudio=false use_udev=false use_gtk=false use_atk=false'
+CHROMIUM_HEADLESS_GN_DEFINES+=' use_pulseaudio=false use_udev=false use_gtk=false use_glib=false'
 export CHROMIUM_HEADLESS_GN_DEFINES
 
 %if 0%{?rhel} == 7
diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh
index 1c006e62..b2209cfc 100755
--- a/clean_ffmpeg.sh
+++ b/clean_ffmpeg.sh
@@ -74,6 +74,7 @@ header_files="	libavcodec/x86/inline_asm.h \
 		libavcodec/bytestream.h \
 		libavcodec/cbrt_data.h \
 		libavcodec/cbrt_tablegen.h \
+		libavcodec/codec_id.h \
 		libavcodec/dct.h \
 		libavcodec/dct32.h \
 		libavcodec/error_resilience.h \
@@ -89,6 +90,7 @@ header_files="	libavcodec/x86/inline_asm.h \
 		libavcodec/h264chroma.h \
 		libavcodec/hpeldsp.h \
 		libavcodec/hwaccels.h \
+		libavcodec/hwconfig.h \
 		libavcodec/idctdsp.h \
 		libavcodec/internal.h \
 		libavcodec/kbdwin.h \
@@ -117,6 +119,7 @@ header_files="	libavcodec/x86/inline_asm.h \
 		libavcodec/opus_celt.h \
 		libavcodec/opus_pvq.h \
 		libavcodec/opus_rc.h \
+		libavcodec/packet.h \
 		libavcodec/pcm_tablegen.h \
 		libavcodec/pixblockdsp.h \
 		libavcodec/pixels.h \
diff --git a/sources b/sources
index 81b7cf1f..828c4994 100644
--- a/sources
+++ b/sources
@@ -17,4 +17,4 @@ SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0
 SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
 SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd
 SHA512 (node-v10.15.3-linux-x64.tar.gz) = 5eb544ef706562981340a82acc79e2162c6a3e4049b4a95f69ce353ee5b0f929c60b1fc457e8249b3fb0696f82fc28c5f543f5947db19fae4e9d5c21b906bb20
-SHA512 (chromium-84.0.4147.89-clean.tar.xz) = a0373964bca0dbade9fde3c5f00e4470ba609b1d7ceab19db19cde27fea54a6e049965aaedfbeff82af04ce899e4617d3443a4bc7fc482fef8604386c9682a52
+SHA512 (chromium-84.0.4147.89-clean.tar.xz) = 4daa866c086142c496a924d6630da202195d7db2853987b2e81c828ffccfe281499cf85562d2ea48f1304f2f4de2fef0a385e7979e6ad46323b4ab34fa2f3f8b