From d1e7da820ba0fcf84f26d329207a9044380e9749 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 12 Aug 2020 11:24:29 -0400 Subject: [PATCH] .125, re-enable remoting --- chromium-84.0.4147.125-remoting-cstring.patch | 56 +++++++++++++++++++ chromium.spec | 19 ++++++- sources | 2 +- 3 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 chromium-84.0.4147.125-remoting-cstring.patch diff --git a/chromium-84.0.4147.125-remoting-cstring.patch b/chromium-84.0.4147.125-remoting-cstring.patch new file mode 100644 index 00000000..c68eca6f --- /dev/null +++ b/chromium-84.0.4147.125-remoting-cstring.patch @@ -0,0 +1,56 @@ +diff -up chromium-84.0.4147.125/remoting/base/util.cc.remoting-cstring chromium-84.0.4147.125/remoting/base/util.cc +--- chromium-84.0.4147.125/remoting/base/util.cc.remoting-cstring 2020-08-11 22:03:35.508469920 -0400 ++++ chromium-84.0.4147.125/remoting/base/util.cc 2020-08-11 22:03:35.507469920 -0400 +@@ -4,6 +4,7 @@ + + #include "remoting/base/util.h" + ++#include + #include + + #include "base/logging.h" +diff -up chromium-84.0.4147.125/remoting/client/display/gl_helpers.cc.remoting-cstring chromium-84.0.4147.125/remoting/client/display/gl_helpers.cc +--- chromium-84.0.4147.125/remoting/client/display/gl_helpers.cc.remoting-cstring 2020-08-11 22:03:35.279469970 -0400 ++++ chromium-84.0.4147.125/remoting/client/display/gl_helpers.cc 2020-08-11 22:03:35.277469971 -0400 +@@ -5,6 +5,7 @@ + #include "remoting/client/display/gl_helpers.h" + + #include "base/logging.h" ++#include + + namespace remoting { + +diff -up chromium-84.0.4147.125/remoting/host/fake_mouse_cursor_monitor.cc.remoting-cstring chromium-84.0.4147.125/remoting/host/fake_mouse_cursor_monitor.cc +--- chromium-84.0.4147.125/remoting/host/fake_mouse_cursor_monitor.cc.remoting-cstring 2020-08-12 09:53:46.104504128 -0400 ++++ chromium-84.0.4147.125/remoting/host/fake_mouse_cursor_monitor.cc 2020-08-12 09:53:59.123476291 -0400 +@@ -4,6 +4,7 @@ + + #include "remoting/host/fake_mouse_cursor_monitor.h" + ++#include + #include + + #include "base/check.h" +diff -up chromium-84.0.4147.125/remoting/host/host_config_unittest.cc.remoting-cstring chromium-84.0.4147.125/remoting/host/host_config_unittest.cc +--- chromium-84.0.4147.125/remoting/host/host_config_unittest.cc.remoting-cstring 2020-08-11 22:03:35.083470013 -0400 ++++ chromium-84.0.4147.125/remoting/host/host_config_unittest.cc 2020-08-11 22:03:35.196469988 -0400 +@@ -10,6 +10,7 @@ + #include "base/memory/ref_counted.h" + #include "base/values.h" + #include "testing/gtest/include/gtest/gtest.h" ++#include + + namespace remoting { + +diff -up chromium-84.0.4147.125/remoting/host/host_secret.cc.remoting-cstring chromium-84.0.4147.125/remoting/host/host_secret.cc +--- chromium-84.0.4147.125/remoting/host/host_secret.cc.remoting-cstring 2020-08-11 22:03:35.079470014 -0400 ++++ chromium-84.0.4147.125/remoting/host/host_secret.cc 2020-08-11 22:03:35.029470025 -0400 +@@ -6,7 +6,7 @@ + + #include + +-#include ++#include + + #include "base/rand_util.h" + #include "base/strings/string_number_conversions.h" diff --git a/chromium.spec b/chromium.spec index 05ec0650..c653bcd7 100644 --- a/chromium.spec +++ b/chromium.spec @@ -16,7 +16,7 @@ %global build_headless 1 # This doesn't work and it doesn't even build as of Chromium 83 -%global build_remoting 0 +%global build_remoting 1 # We'd like to always have this on. %global use_vaapi 1 @@ -164,8 +164,8 @@ Name: chromium%{chromium_channel}%{nsuffix} %else Name: chromium%{chromium_channel} %endif -Version: %{majorversion}.0.4147.105 -Release: 2%{?dist} +Version: %{majorversion}.0.4147.125 +Release: 1%{?dist} %if %{?freeworld} %if %{?shared} # chromium-libs-media-freeworld @@ -289,6 +289,8 @@ Patch86: chromium-fix-char_traits.patch Patch87: chromium-quiche-invalid-offsetof.patch # Silence GCC warnings during gn compile Patch88: chromium-84.0.4147.105-gn-gcc-cleanup.patch +# Fix missing cstring in remoting code +Patch89: chromium-84.0.4147.125-remoting-cstring.patch # Use lstdc++ on EPEL7 only Patch101: chromium-75.0.3770.100-epel7-stdc++.patch @@ -767,6 +769,13 @@ Requires: minizip-compat%{_isa} %else Requires: minizip%{_isa} %endif +# -common doesn't have chrome-remote-desktop bits +# but we need to clean it up if it gets disabled again +# NOTE: Check obsoletes version to be sure it matches +%if ! %{build_remoting} +Provides: chrome-remote-desktop = %{version}-%{release} +Obsoletes: chrome-remote-desktop <= 81.0.4044.138 +%endif %description common %{summary}. @@ -900,6 +909,7 @@ udev. %patch86 -p1 -b .fix-char_traits %patch87 -p1 -b .quiche-invalid-offset %patch88 -p1 -b .gn-gcc-cleanup +%patch89 -p1 -b .remoting-cstring # Fedora branded user agent %if 0%{?fedora} @@ -1879,6 +1889,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Mon Aug 10 2020 Tom Callaway - 84.0.4147.125-1 +- update to 84.0.4147.125 + * Sat Aug 01 2020 Fedora Release Engineering - 84.0.4147.105-2 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index e9d2c5a8..f19f7d29 100644 --- a/sources +++ b/sources @@ -17,5 +17,5 @@ SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb874 SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd SHA512 (node-v10.15.3-linux-x64.tar.gz) = 5eb544ef706562981340a82acc79e2162c6a3e4049b4a95f69ce353ee5b0f929c60b1fc457e8249b3fb0696f82fc28c5f543f5947db19fae4e9d5c21b906bb20 SHA512 (xcb-proto-1.14.tar.xz) = de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690 -SHA512 (chromium-84.0.4147.105-clean.tar.xz) = 03760da4df6b15092f4cf6fb383bd33e27720a7d97d24bb937b2ba6c38d7bc95ea19a32f8dbcf921010d4aa9ee15cbd4cd13a2dc7d88fe7beab6a59c86941786 SHA512 (depot_tools.git-master.tar.gz) = dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708 +SHA512 (chromium-84.0.4147.125-clean.tar.xz) = 27ae5a6307e550f7cc431017e4336efea9e81808fd6e7ec2a1f3eada3c2eb84204ffb3ced11eb3fbf48e1d4407899aca9034da1e153609dd01ed57ab0e3fd448