83.0.4103.97

chromium-83-gcc-ozone-wayland.patch

@@ -0,0 +1,12 @@
+diff -up chromium-83.0.4103.61/ui/ozone/platform/wayland/host/xdg_surface_wrapper_impl.h.gcc-ozone-wayland chromium-83.0.4103.61/ui/ozone/platform/wayland/host/xdg_surface_wrapper_impl.h
+--- chromium-83.0.4103.61/ui/ozone/platform/wayland/host/xdg_surface_wrapper_impl.h.gcc-ozone-wayland	2020-06-05 09:16:08.903282140 -0400
++++ chromium-83.0.4103.61/ui/ozone/platform/wayland/host/xdg_surface_wrapper_impl.h	2020-06-05 09:16:31.131863653 -0400
+@@ -68,7 +68,7 @@ class XDGSurfaceWrapperImpl : public She
+   static void CloseTopLevelV6(void* data,
+                               struct zxdg_toplevel_v6* zxdg_toplevel_v6);
+ 
+-  xdg_surface* xdg_surface() const;
++  struct xdg_surface* xdg_surface() const;
+   zxdg_surface_v6* zxdg_surface() const;
+ 
+  private:

chromium.spec

@@ -17,6 +17,9 @@
 # We usually want this.
 %global build_headless 1
 
+# This doesn't work and it doesn't even build as of Chromium 83
+%global build_remoting 0
+
 # We'd like to always have this on.
 %global use_vaapi 1
 
@@ -163,7 +166,7 @@ Name:		chromium%{chromium_channel}%{nsuffix}
 %else
 Name:		chromium%{chromium_channel}
 %endif
-Version:	%{majorversion}.0.4103.61
+Version:	%{majorversion}.0.4103.97
 Release:	1%{?dist}
 %if %{?freeworld}
 %if %{?shared}
@@ -260,6 +263,9 @@ Patch85:	chromium-83-gcc-permissive.patch
 Patch86:	chromium-83-gcc-iterator.patch
 # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-83-gcc-serviceworker.patch
 Patch87:	chromium-83-gcc-serviceworker.patch
+# https://chromium.googlesource.com/chromium/src/+/0d3ef4b1247f766eed37c546571a2c872fde2bf2%5E%21/#F0
+Patch88:	chromium-83-gcc-ozone-wayland.patch
+
 
 # Use lstdc++ on EPEL7 only
 Patch101:	chromium-75.0.3770.100-epel7-stdc++.patch
@@ -744,6 +750,7 @@ Shared libraries used by the chromium media subsystem.
 %endif
 %endif
 
+%if %{build_remoting}
 %package -n chrome-remote-desktop
 Requires(pre): shadow-utils
 Requires(post): systemd
@@ -760,6 +767,7 @@ Summary: Remote desktop support for google-chrome & chromium
 
 %description -n chrome-remote-desktop
 Remote desktop support for google-chrome & chromium.
+%endif
 
 %package -n chromedriver
 Summary:	WebDriver for Google Chrome/Chromium
@@ -833,6 +841,7 @@ udev.
 %patch85 -p1 -b .gcc-permissive
 %patch86 -p1 -b .gcc-iterator2
 %patch87 -p1 -b .gcc-serviceworker
+%patch88 -p1 -b .gcc-ozone-wayland
 
 # Fedora branded user agent
 %if 0%{?fedora}
@@ -944,7 +953,7 @@ CHROMIUM_CORE_GN_DEFINES+=' is_debug=false'
 CHROMIUM_CORE_GN_DEFINES+=' system_libdir="lib64"'
 %endif
 CHROMIUM_CORE_GN_DEFINES+=' google_api_key="%{api_key}" google_default_client_id="%{default_client_id}" google_default_client_secret="%{default_client_secret}"'
-CHROMIUM_CORE_GN_DEFINES+=' is_clang=false use_sysroot=false use_gold=false fieldtrial_testing_like_official_build=true use_lld=false rtc_enable_symbol_export=true'
+CHROMIUM_CORE_GN_DEFINES+=' is_clang=false use_sysroot=false use_gold=false fieldtrial_testing_like_official_build=true use_lld=false use_ozone=true rtc_enable_symbol_export=true'
 %if %{freeworld}
 CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true'
 %else
@@ -974,6 +983,7 @@ CHROMIUM_BROWSER_GN_DEFINES+=' is_component_ffmpeg=false is_component_build=fals
 CHROMIUM_BROWSER_GN_DEFINES+=' blink_symbol_level=0 enable_hangout_services_extension=true'
 CHROMIUM_BROWSER_GN_DEFINES+=' use_aura=true'
 CHROMIUM_BROWSER_GN_DEFINES+=' enable_widevine=true'
+CHROMIUM_BROWSER_GN_DEFINES+=' ozone_platform="x11" ozone_platform_x11=true'
 %if %{use_vaapi}
 %if 0%{?fedora} >= 28
 CHROMIUM_BROWSER_GN_DEFINES+=' use_vaapi=true'
@@ -985,11 +995,11 @@ CHROMIUM_BROWSER_GN_DEFINES+=' rtc_use_pipewire=true rtc_link_pipewire=true'
 export CHROMIUM_BROWSER_GN_DEFINES
 
 CHROMIUM_HEADLESS_GN_DEFINES=""
-CHROMIUM_HEADLESS_GN_DEFINES+=' use_ozone=true ozone_auto_platforms=false ozone_platform="headless" ozone_platform_headless=true'
+CHROMIUM_HEADLESS_GN_DEFINES+=' ozone_auto_platforms=false ozone_platform="headless" ozone_platform_headless=true'
 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'
+CHROMIUM_HEADLESS_GN_DEFINES+=' use_pulseaudio=false use_udev=false use_gtk=false'
 export CHROMIUM_HEADLESS_GN_DEFINES
 
 %if 0%{?rhel} == 7
@@ -1081,6 +1091,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
 	'third_party/devtools-frontend/src/third_party/axe-core' \
 	'third_party/devtools-frontend/src/third_party/typescript' \
 	'third_party/devtools-frontend/src/front_end/third_party/fabricjs' \
+	'third_party/devtools-frontend/src/front_end/third_party/lighthouse' \
 	'third_party/devtools-frontend/src/front_end/third_party/wasmparser' \
 	'third_party/dom_distiller_js' \
 	'third_party/emoji-segmenter' \
@@ -1134,6 +1145,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
 	'third_party/libyuv' \
 	'third_party/lss' \
 	'third_party/lzma_sdk' \
+	'third_party/mako' \
 %if 0%{?bundlepylibs}
 	'third_party/markupsafe' \
 %endif
@@ -1176,6 +1188,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
 %endif
 	'third_party/rnnoise' \
 	'third_party/s2cellid' \
+	'third_party/schema_org' \
 	'third_party/simplejson' \
 	'third_party/sinonjs' \
 	'third_party/skia' \
@@ -1190,6 +1203,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
 	'third_party/SPIRV-Tools' \
 	'third_party/sqlite' \
 	'third_party/swiftshader' \
+	'third_party/swiftshader/third_party/astc-encoder' \
 	'third_party/swiftshader/third_party/llvm-subzero' \
 	'third_party/swiftshader/third_party/llvm-7.0' \
 	'third_party/swiftshader/third_party/marl' \
@@ -1200,6 +1214,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
         'third_party/usb_ids' \
 	'third_party/usrsctp' \
 	'third_party/vulkan' \
+	'third_party/wayland' \
 	'third_party/web-animations-js' \
 	'third_party/webdriver' \
 	'third_party/webrtc' \
@@ -1327,7 +1342,9 @@ tools/gn/bootstrap/bootstrap.py -v --no-clean --gn-gen-args="$CHROMIUM_CORE_GN_D
 %endif
 %endif
 
+%if %{build_remoting}
 %{builddir}/gn --script-executable=/usr/bin/python2 gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{remotingbuilddir}
+%endif
 
 %if %{bundlelibusbx}
 # no hackity hack hack
@@ -1373,10 +1390,12 @@ echo
 %build_target %{builddir} clear_key_cdm
 %build_target %{builddir} policy_templates
 
+%if %{build_remoting}
 # remote client
 # ../../depot_tools/ninja -C ../%{builddir} -vvv remoting_me2me_host remoting_start_host remoting_it2me_native_messaging_host remoting_me2me_native_messaging_host remoting_native_messaging_manifests remoting_resources
 %build_target %{remotingbuilddir} remoting_all
 %endif
+%endif
 
 %install
 rm -rf %{buildroot}
@@ -1415,10 +1434,6 @@ mkdir -p %{buildroot}%{_mandir}/man1/
 
 	pushd %{builddir}
 		cp -a *.pak locales resources icudtl.dat %{buildroot}%{chromium_path}
-# Reasonably sure we don't need this anymore. Chrome doesn't include it.
-%if 0
-cp -a protoc pyproto %{buildroot}%{chromium_path}
-%endif
 		%ifarch x86_64 i686 aarch64
 			cp -a swiftshader %{buildroot}%{chromium_path}
 		%endif
@@ -1446,6 +1461,7 @@ cp -p %{buildroot}%{chromium_path}/libmedia.so.TOC{,.%{lsuffix}}
 		cp -a chromedriver %{buildroot}%{chromium_path}/chromedriver
 		ln -s %{chromium_path}/chromedriver %{buildroot}%{_bindir}/chromedriver
 
+		%if %{build_remoting}
 			# Remote desktop bits
 			mkdir -p %{buildroot}%{crd_path}
 
@@ -1457,8 +1473,9 @@ for i in ../chromium-browser%{?chromium_channel}/lib*.so; do
 					done
 				popd
 			%endif
+		%endif
 	popd
-
+	%if %{build_remoting}
 		pushd %{remotingbuilddir}
 
 			# See remoting/host/installer/linux/Makefile for logic
@@ -1493,7 +1510,7 @@ touch %{buildroot}/var/lib/chrome-remote-desktop/hashes
 		mkdir -p %{buildroot}%{_sysconfdir}/pam.d/
 		pushd %{buildroot}%{_sysconfdir}/pam.d/
 		ln -s system-auth chrome-remote-desktop
-popd
+	%endif
 
 	%if %{build_headless}
 		pushd %{headlessbuilddir}
@@ -1501,12 +1518,14 @@ cp -a headless_lib.pak headless_shell %{buildroot}%{chromium_path}
 		popd
 	%endif
 
+	%if %{build_remoting}
 		cp -a remoting/host/linux/linux_me2me_host.py %{buildroot}%{crd_path}/chrome-remote-desktop
 		cp -a remoting/host/installer/linux/is-remoting-session %{buildroot}%{crd_path}/
 
 		mkdir -p %{buildroot}%{_unitdir}
 		cp -a %{SOURCE11} %{buildroot}%{_unitdir}/
 		sed -i 's|@@CRD_PATH@@|%{crd_path}|g' %{buildroot}%{_unitdir}/chrome-remote-desktop@.service
+	%endif
 
 	# Add directories for policy management
 	mkdir -p %{buildroot}%{_sysconfdir}/chromium/policies/managed
@@ -1554,12 +1573,14 @@ if selinuxenabled; then
 	restorecon -R -v %{chromium_path}/%{chromium_browser_channel} &>/dev/null || :
 fi
 
+%if %{build_remoting}
 %pretrans -n chrome-remote-desktop -p <lua> 
 path = "/etc/opt/chrome/native-messaging-hosts"
 st = posix.stat(path)
 if st and st.type == "link" then
   os.remove(path)
 end
+%endif
 
 %if %{shared}
 %if %{freeworld}
@@ -1599,6 +1620,7 @@ fi
 %endif
 %endif
 
+%if %{build_remoting}
 %pre -n chrome-remote-desktop
 getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-desktop
 
@@ -1610,6 +1632,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 
 %postun -n chrome-remote-desktop
 %systemd_postun_with_restart chrome-remote-desktop@.service
+%endif
 
 %if 0%{freeworld}
 # We only build libs-media-freeworld.
@@ -1731,6 +1754,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %{chromium_path}/lib*.so*
 %endif
 
+%if %{build_remoting}
 %files -n chrome-remote-desktop
 %{crd_path}/chrome-remote-desktop
 %{crd_path}/chrome-remote-desktop-host
@@ -1748,6 +1772,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %{crd_path}/user-session
 %{_unitdir}/chrome-remote-desktop@.service
 /var/lib/chrome-remote-desktop/
+%endif
 
 %files -n chromedriver
 %doc AUTHORS
@@ -1771,8 +1796,12 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 
 
 %changelog
+* Sun Jun  7 2020 Tom Callaway <spot@fedoraproject.org> - 83.0.4103.97-1
+- update to 83.0.4103.97
+
 * Tue Jun  2 2020 Tom Callaway <spot@fedoraproject.org> - 83.0.4103.61-1
 - update to 83.0.4103.61
+- conditionalize and disable remoting
 
 * Thu May  7 2020 Tom Callaway <spot@fedoraproject.org> - 81.0.4044.138-1
 - update to 81.0.4044.138

sources

@@ -17,5 +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-81.0.4044.138-clean.tar.xz) = 24c52a2b5973896ff823e989e92747fb3d71fed74a38eb970efd74492d1f980c9135334ec2c74cdafb1edc91d66d7195e66bb6ac38cb201cb3e08386e26665eb
+SHA512 (chromium-83.0.4103.97-clean.tar.xz) = 00abd69dd041613e5cd3ad6c41f51013b05405b6f19e6b1acfc9709d738ac8c2adcfc67b64801f6583270a58849e2690e91b2ebcaf3b82a25b381b580426c1a4
-SHA512 (chromium-83.0.4103.61-clean.tar.xz) = 8a7c31e5de0dae571b402afac81eaa8ed21886f20a4f463ea2ed6e1007a6e80aa8334e001370f7245d46e94839dd249fc4bebab055b1e315bf98d26f57191d03