[arch-commits] Commit in electron18/trunk (PKGBUILD std-vector-non-const.patch)
Bruno Pagani
archange at gemini.archlinux.org
Wed Jul 6 15:30:37 UTC 2022
Date: Wednesday, July 6, 2022 @ 15:30:37
Author: archange
Revision: 1246724
upgpkg: electron18 18.3.5-1
Modified:
electron18/trunk/PKGBUILD
electron18/trunk/std-vector-non-const.patch
----------------------------+
PKGBUILD | 6 +-
std-vector-non-const.patch | 98 +++++++++++++++++--------------------------
2 files changed, 42 insertions(+), 62 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-07-06 13:57:20 UTC (rev 1246723)
+++ PKGBUILD 2022-07-06 15:30:37 UTC (rev 1246724)
@@ -1,8 +1,8 @@
# Maintainer: Nicola Squartini <tensor5 at gmail.com>
_use_suffix=1
-pkgver=18.2.4
-_commit=f4ba63536a3558f814a81015ecbfaf3451be5694
+pkgver=18.3.5
+_commit=6165f6afc9af6f9ab4e32f4a7a8b0818f11e766a
_chromiumver=100.0.4896.160
_gcc_patchset=4
# shellcheck disable=SC2034
@@ -70,7 +70,7 @@
'4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae'
'dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4'
'55dbe71dbc1f3ab60bf1fa79f7aea7ef1fe76436b1d7df48728a1f8227d2134e'
- '880abb38ea94058ad553eaec9989cb33aa3b10c54b44afcfddacef3e975152de'
+ '76b969e1534e8c355b8b524a686cbf3b24136eaa6bd40b0c09fdd9866049f159'
'c70652a8b24c237bcfd27469de32797a2cb46d9f0d63d897bb6418314a25644c'
'064daaa2b9d95b96ec04d8ddebf4af441f92263d123365b58fe73966866080af'
'88b2c8d9c6c1917f6632453f18aad7a3fd94d605eecb6c77ae2394ac5856ba95'
Modified: std-vector-non-const.patch
===================================================================
--- std-vector-non-const.patch 2022-07-06 13:57:20 UTC (rev 1246723)
+++ std-vector-non-const.patch 2022-07-06 15:30:37 UTC (rev 1246724)
@@ -1,15 +1,15 @@
---- a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
-+++ b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
-@@ -46,7 +46,7 @@
- base::RepeatingCallback<bool(const base::CommandLine& command_line,
+--- a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
++++ b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
+@@ -32,7 +32,7 @@ index 5a64220aaf1309832dc0ad543e353de67fe0a779..e75c4f0d7cf1cac2e5862eb858800359
- const base::FilePath& current_directory)>;
+ + base::RepeatingCallback<bool(const base::CommandLine& command_line,
+ const base::FilePath& current_directory,
--+ const std::vector<const uint8_t> additional_data,
-++ const std::vector<uint8_t> additional_data,
- + const NotificationAckCallback& ack_callback)>;
+-+ const std::vector<const uint8_t> additional_data)>;
+++ const std::vector<uint8_t> additional_data)>;
#if BUILDFLAG(IS_WIN)
-@@ -112,7 +112,7 @@
+ ProcessSingleton(const std::string& program_name,
+@@ -73,7 +73,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768
// |reader| is for sending back ACK message.
void HandleMessage(const std::string& current_dir,
const std::vector<std::string>& argv,
@@ -18,7 +18,7 @@
SocketReader* reader);
private:
-@@ -133,7 +133,7 @@
+@@ -84,7 +84,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768
- const std::string& current_dir, const std::vector<std::string>& argv,
+ const std::string& current_dir,
+ const std::vector<std::string>& argv,
@@ -27,7 +27,7 @@
SocketReader* reader) {
DCHECK(ui_task_runner_->BelongsToCurrentThread());
DCHECK(reader);
-@@ -195,7 +195,7 @@
+@@ -114,7 +114,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768
+ base::StringToSizeT(tokens[0], &num_args);
+ std::vector<std::string> command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args);
+
@@ -36,25 +36,16 @@
+ if (tokens.size() >= 3 + num_args) {
+ size_t additional_data_size;
+ base::StringToSizeT(tokens[1 + num_args], &additional_data_size);
-@@ -204,7 +204,7 @@
+@@ -123,7 +123,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768
+ std::string(1, kTokenDelimiter));
+ const uint8_t* additional_data_bits =
+ reinterpret_cast<const uint8_t*>(remaining_args.c_str());
--+ additional_data = std::vector<const uint8_t>(additional_data_bits,
-++ additional_data = std::vector<uint8_t>(additional_data_bits,
- + additional_data_bits + additional_data_size);
+-+ additional_data = std::vector<const uint8_t>(
+++ additional_data = std::vector<uint8_t>(
+ + additional_data_bits, additional_data_bits + additional_data_size);
+ }
+
-@@ -301,7 +301,7 @@
- +const DWORD kPipeTimeout = 10000;
- +const DWORD kMaxMessageLength = 32 * 1024;
- +
--+std::unique_ptr<std::vector<const uint8_t>> g_ack_data;
-++std::unique_ptr<std::vector<uint8_t>> g_ack_data;
- +base::OneShotTimer g_ack_timer;
- +HANDLE g_write_ack_pipe;
- +bool g_write_ack_callback_called = false;
-@@ -314,7 +314,7 @@
+@@ -189,7 +189,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f
base::CommandLine* parsed_command_line,
- base::FilePath* current_directory) {
+ base::FilePath* current_directory,
@@ -63,7 +54,7 @@
// We should have enough room for the shortest command (min_message_size)
// and also be a multiple of wchar_t bytes. The shortest command
- // possible is L"START\0\0" (empty current directory and command line).
-@@ -355,7 +355,7 @@
+@@ -230,7 +230,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f
+ msg.substr(fourth_null + 1, fifth_null - fourth_null);
+ const uint8_t* additional_data_bytes =
+ reinterpret_cast<const uint8_t*>(additional_data.c_str());
@@ -72,58 +63,47 @@
+ additional_data_bytes + additional_data_length);
+
return true;
-@@ -365,7 +365,7 @@
-
- +void StoreAck(const base::span<const uint8_t>* ack_data) {
- + if (ack_data) {
--+ g_ack_data = std::make_unique<std::vector<const uint8_t>>(ack_data->begin(),
-++ g_ack_data = std::make_unique<std::vector<uint8_t>>(ack_data->begin(),
- + ack_data->end());
- + } else {
- + g_ack_data = nullptr;
-@@ -414,7 +414,7 @@
+@@ -241,7 +241,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f
base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM);
base::FilePath current_directory;
- if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory)) {
-+ std::vector<const uint8_t> additional_data;
++ std::vector<uint8_t> additional_data;
- + if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory,
- + &additional_data)) {
+ + if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory, &additional_data)) {
*result = TRUE;
+ return true;
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
-@@ -519,12 +519,12 @@
+@@ -519,10 +519,10 @@ bool NotificationCallbackWrapper(
const base::RepeatingCallback<
void(const base::CommandLine& command_line,
const base::FilePath& current_directory,
-- const std::vector<const uint8_t> additional_data,
-+ const std::vector<uint8_t> additional_data,
- const ProcessSingleton::NotificationAckCallback& ack_callback)>&
- callback,
+- const std::vector<const uint8_t> additional_data)>& callback,
++ const std::vector<uint8_t> additional_data)>& callback,
const base::CommandLine& cmd,
const base::FilePath& cwd,
-- const std::vector<const uint8_t> additional_data,
-+ const std::vector<uint8_t> additional_data,
- const ProcessSingleton::NotificationAckCallback& ack_callback) {
+- const std::vector<const uint8_t> additional_data) {
++ const std::vector<uint8_t> additional_data) {
// Make sure the callback is called after app gets ready.
if (Browser::Get()->is_ready()) {
-@@ -1118,7 +1118,7 @@
- void App::OnSecondInstance(
- const base::CommandLine& cmd,
- const base::FilePath& cwd,
-- const std::vector<const uint8_t> additional_data,
-+ const std::vector<uint8_t> additional_data,
- const ProcessSingleton::NotificationAckCallback& ack_callback) {
+ callback.Run(cmd, cwd, std::move(additional_data));
+@@ -1083,7 +1083,7 @@ std::string App::GetLocaleCountryCode() {
+
+ void App::OnSecondInstance(const base::CommandLine& cmd,
+ const base::FilePath& cwd,
+- const std::vector<const uint8_t> additional_data) {
++ const std::vector<uint8_t> additional_data) {
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::Locker locker(isolate);
+ v8::HandleScope handle_scope(isolate);
--- a/shell/browser/api/electron_api_app.h
+++ b/shell/browser/api/electron_api_app.h
-@@ -197,7 +197,7 @@
- void OnSecondInstance(
- const base::CommandLine& cmd,
- const base::FilePath& cwd,
-- const std::vector<const uint8_t> additional_data,
-+ const std::vector<uint8_t> additional_data,
- const ProcessSingleton::NotificationAckCallback& ack_callback);
+@@ -195,7 +195,7 @@ class App : public ElectronBrowserClient::Delegate,
+ std::string GetLocaleCountryCode();
+ void OnSecondInstance(const base::CommandLine& cmd,
+ const base::FilePath& cwd,
+- const std::vector<const uint8_t> additional_data);
++ const std::vector<uint8_t> additional_data);
bool HasSingleInstanceLock() const;
bool RequestSingleInstanceLock(gin::Arguments* args);
+ void ReleaseSingleInstanceLock();
More information about the arch-commits
mailing list