chromium: Merge changes from the official Fedora package

This commit merges changes from commit 9d8ad7c, version 73.0.3683.75.

4 files changed, 37 insertions, 55 deletions

diff --git a/chromium/chromium/chromium-browser.appdata.xml b/chromium/chromium/chromium-browser.appdata.xml
deleted file mode 100644
index 71531d8..0000000
--- a/chromium/chromium/chromium-browser.appdata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2016 Richard Hughes <richard@hughsie.com> -->
-<component type="desktop">
-  <id>chromium-browser.desktop</id>
-  <update_contact>richard@hughsie.com</update_contact>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>BSD-3-Clause and LGPL-2.1+ and Apache-2.0 and IJG and MIT and GPL-2.0+ and ISC and OpenSSL and (MPL-1.1 or GPL-2.0 or LGPL-2.0)</project_license>
-  <name>Chromium</name>
-  <summary>Web Browser</summary>
-  <description>
-   <p>
-    Chromium is an open-source browser that aims to build a safer, faster, and
-    more stable way to experience the web.
-    We invite you to join us in our effort to build a powerful platform for
-    developing a new generation of web applications.
-   </p>
-   <p>
-    Chromium does not include the non-free AAC, H.264, MP3 or Adobe Flash code
-    that is found in Chrome, although it does support Vorbis, Theora, WebM and
-    HTML5 audio and video standards.
-   </p>
-  </description>
-  <url type="homepage">https://www.chromium.org/Home</url>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/chromium-browser/a.png</image>
-      <caption/>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/chromium-browser/b.png</image>
-      <caption/>
-    </screenshot>
-  </screenshots>
-  <translation>chromium-browser</translation>
-  <developer_name>Google</developer_name>
-  <url type="bugtracker">https://www.chromium.org/for-testers/bug-reporting-guidelines</url>
-  <url type="help">https://chromium.googlesource.com/chromium/src/+/master/docs/linux_debugging.md</url>
-</component>
diff --git a/chromium/chromium/chromium-webrtc-cstring.patch b/chromium/chromium/chromium-webrtc-cstring.patch
new file mode 100644
index 0000000..ce8b70b
--- /dev/null
+++ b/chromium/chromium/chromium-webrtc-cstring.patch
@@ -0,0 +1,11 @@
+diff -up chromium-73.0.3683.75/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.cstringfix chromium-73.0.3683.75/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
+--- chromium-73.0.3683.75/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.cstringfix	2019-03-13 13:04:25.290842447 -0400
++++ chromium-73.0.3683.75/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc	2019-03-13 13:05:13.234897441 -0400
+@@ -18,6 +18,7 @@
+ #include <spa/param/video/raw-utils.h>
+ #include <spa/support/type-map.h>
+ 
++#include <cstring>
+ #include <memory>
+ #include <utility>
+ 
diff --git a/chromium/chromium/chromium-webrtc-string.patch b/chromium/chromium/chromium-webrtc-string.patch
deleted file mode 100644
index 3a2a8b4..0000000
--- a/chromium/chromium/chromium-webrtc-string.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- chromium-72.0.3626.81/third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc.orig	2019-01-30 09:20:37.000000000 +0800
-+++ chromium-72.0.3626.81/third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc	2019-02-01 04:44:52.656360563 +0800
-@@ -14,6 +14,7 @@
- #include <X11/extensions/Xcomposite.h>
- #include <X11/extensions/Xrender.h>
- 
-+#include <string.h>
- #include <memory>
- #include <string>
- #include <utility>
diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec
index 43496cd..a3e933d 100644
--- a/chromium/chromium/chromium.spec
+++ b/chromium/chromium/chromium.spec
@@ -48,7 +48,7 @@
 
 Name:       chromium
 Version:    73.0.3683.86
-Release:    100%{?dist}
+Release:    101%{?dist}
 Summary:    A WebKit (Blink) powered web browser
 
 License:    BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -81,7 +81,6 @@ Source11:   chromium-browser.desktop
 # The following two source files are copied verbatim from
 # https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/
 Source12:   chromium-browser.xml
-Source13:   chromium-browser.appdata.xml
 
 # Disable non-free unrar
 Patch20:    chromium-disable-unrar.patch
@@ -105,6 +104,10 @@ Patch74:    chromium-gcc8-r631472.patch
 Patch75:    chromium-gcc8-r631962.patch
 Patch76:    chromium-gcc8-r632385.patch
 
+# Pull patches from Fedora
+# https://src.fedoraproject.org/rpms/chromium/c/9071ee2d2f996b84
+Patch80:    chromium-webrtc-cstring.patch
+
 # I don't have time to test whether it work on other architectures
 ExclusiveArch: x86_64
 
@@ -163,10 +166,11 @@ BuildRequires: re2-devel
 BuildRequires: snappy-devel
 BuildRequires: yasm
 BuildRequires: zlib-devel
-# use_*
+# *_use_*
 BuildRequires: pciutils-devel
 BuildRequires: speech-dispatcher-devel
 BuildRequires: pulseaudio-libs-devel
+BuildRequires: pkgconfig(libpipewire-0.2)
 # install desktop files
 BuildRequires: desktop-file-utils
 # install AppData files
@@ -471,6 +475,7 @@ gn_args=(
     use_cups=true
     use_gnome_keyring=true
     use_gio=true
+    use_jumbo_build=true
     use_kerberos=true
     use_libpci=true
     use_pulseaudio=true
@@ -478,6 +483,8 @@ gn_args=(
 %if %{with system_harfbuzz}
     use_system_harfbuzz=true
 %endif
+    rtc_use_pipewire=true
+    rtc_link_pipewire=true
     enable_hangout_services_extension=false
     enable_nacl=true
     fatal_linker_warnings=false
@@ -529,18 +536,21 @@ ninja -v %{_smp_mflags} -C out/Release chrome chrome_sandbox chromedriver
 %install
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{chromiumdir}/locales
+mkdir -p %{buildroot}%{chromiumdir}/MEIPreload
 mkdir -p %{buildroot}%{chromiumdir}/swiftshader
 mkdir -p %{buildroot}%{_mandir}/man1
-mkdir -p %{buildroot}%{_datadir}/appdata
 mkdir -p %{buildroot}%{_datadir}/applications
 mkdir -p %{buildroot}%{_datadir}/gnome-control-center/default-apps
+mkdir -p %{buildroot}%{_datadir}/metainfo
 sed -e "s|@@CHROMIUMDIR@@|%{chromiumdir}|" -e "s|@@BUILDTARGET@@|`cat /etc/redhat-release`|" \
     %{SOURCE10} > chromium-browser.sh
 install -m 755 chromium-browser.sh %{buildroot}%{_bindir}/chromium-browser
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE11}
 install -m 644 %{SOURCE12} %{buildroot}%{_datadir}/gnome-control-center/default-apps/
-appstream-util validate-relax --nonet %{SOURCE13}
-install -m 644 %{SOURCE13} %{buildroot}%{_datadir}/appdata/
+install -m 644 chrome/installer/linux/common/chromium-browser/chromium-browser.appdata.xml \
+    %{buildroot}%{_datadir}/metainfo/
+appstream-util validate-relax --nonet \
+    %{buildroot}%{_datadir}/metainfo/chromium-browser.appdata.xml
 sed -e "s|@@MENUNAME@@|Chromium|g" -e "s|@@PACKAGE@@|chromium|g" \
     chrome/app/resources/manpage.1.in > chrome.1
 install -m 644 chrome.1 %{buildroot}%{_mandir}/man1/chromium-browser.1
@@ -557,6 +567,7 @@ install -m 644 out/Release/natives_blob.bin %{buildroot}%{chromiumdir}/
 install -m 644 out/Release/v8_context_snapshot.bin %{buildroot}%{chromiumdir}/
 install -m 644 out/Release/*.pak %{buildroot}%{chromiumdir}/
 install -m 644 out/Release/locales/*.pak %{buildroot}%{chromiumdir}/locales/
+install -m 644 out/Release/MEIPreload/* %{buildroot}%{chromiumdir}/MEIPreload/
 install -m 755 out/Release/swiftshader/*.so %{buildroot}%{chromiumdir}/swiftshader/
 for i in 16 32; do
     mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
@@ -591,7 +602,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %license LICENSE
 %doc AUTHORS README.md
 %{_bindir}/chromium-browser
-%{_datadir}/appdata/chromium-browser.appdata.xml
 %{_datadir}/applications/chromium-browser.desktop
 %{_datadir}/gnome-control-center/default-apps/chromium-browser.xml
 %{_datadir}/icons/hicolor/16x16/apps/chromium-browser.png
@@ -603,6 +613,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/64x64/apps/chromium-browser.png
 %{_datadir}/icons/hicolor/128x128/apps/chromium-browser.png
 %{_datadir}/icons/hicolor/256x256/apps/chromium-browser.png
+%{_datadir}/metainfo/chromium-browser.appdata.xml
 %{_mandir}/man1/chromium-browser.1.gz
 %dir %{chromiumdir}
 %{chromiumdir}/chromium-browser
@@ -619,6 +630,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{chromiumdir}/*.pak
 %dir %{chromiumdir}/locales
 %{chromiumdir}/locales/*.pak
+%dir %{chromiumdir}/MEIPreload
+%{chromiumdir}/MEIPreload/manifest.json
+%{chromiumdir}/MEIPreload/preloaded_data.pb
 %dir %{chromiumdir}/swiftshader
 %{chromiumdir}/swiftshader/libEGL.so
 %{chromiumdir}/swiftshader/libGLESv2.so
@@ -626,6 +640,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Mar 23 2019 - Ting-Wei Lan <lantw44@gmail.com> - 73.0.3683.86-101
+- Enable jumbo build
+- Install MEIPreload
+- Use upstream AppStream data file and move to metainfo
+
 * Thu Mar 21 2019 - Ting-Wei Lan <lantw44@gmail.com> - 73.0.3683.86-100
 - Update to 73.0.3683.86