[packages/chromium-browser] - rediffed nacl-linkingfix,gnome3-volume-control patches, build patch obsolete

[qboosh]

commit cc39504aadcf005163f5a189672f587efcfedf7a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat May 22 17:24:11 2021 +0200

    - rediffed nacl-linkingfix,gnome3-volume-control patches, build patch obsolete

 chromium-browser-build.patch | 10 ----------
 chromium-browser.spec        |  2 --
 gnome3-volume-control.patch  |  8 ++++----
 nacl-linkingfix.patch        | 35 +++++++++++++++++------------------
 4 files changed, 21 insertions(+), 34 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 22b937b..69321a2 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -120,7 +120,6 @@ Patch31:	system-jinja.patch
 Patch32:	remove_bundled_libraries-stale.patch
 Patch35:	etc-dir.patch
 Patch36:	angle.patch
-Patch37:	%{name}-build.patch
 Patch38:	vaapi_include.patch
 Patch39:	libsecret.patch
 Patch40:	ffmpeg-generate-errors.patch
@@ -332,7 +331,6 @@ ln -s %{SOURCE7} .
 %patch32 -p1
 %patch35 -p1
 %patch36 -p1
-%patch37 -p1
 #%patch38 -p1 CHECK
 %patch39 -p1
 #%patch40 -p1 UPDATE
diff --git a/chromium-browser-build.patch b/chromium-browser-build.patch
deleted file mode 100644
index dc15fa4..0000000
--- a/chromium-browser-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- chromium-browser-38.0.2125.111/media/cast/logging/encoding_event_subscriber.cc~	2014-10-02 19:39:47.000000000 +0200
-+++ chromium-browser-38.0.2125.111/media/cast/logging/encoding_event_subscriber.cc	2014-11-05 06:35:45.611057986 +0100
-@@ -6,6 +6,7 @@
- 
- #include <cstring>
- #include <utility>
-+#include <algorithm>
- 
- #include "base/logging.h"
- #include "media/cast/logging/proto/proto_utils.h"
diff --git a/gnome3-volume-control.patch b/gnome3-volume-control.patch
index 66e7927..2588131 100644
--- a/gnome3-volume-control.patch
+++ b/gnome3-volume-control.patch
@@ -1,7 +1,7 @@
---- chromium-browser-33.0.1750.117/media/audio/alsa/audio_manager_alsa.cc~	2014-02-20 22:27:58.000000000 +0200
-+++ chromium-browser-33.0.1750.117/media/audio/alsa/audio_manager_alsa.cc	2014-02-23 10:24:29.610111342 +0200
-@@ -53,7 +53,8 @@
-   CommandLine command_line(CommandLine::NO_PROGRAM);
+--- chromium-browser-50.0.2661.102/media/audio/alsa/audio_manager_alsa.cc.orig	2021-05-22 17:02:40.236005735 +0200
++++ chromium-browser-50.0.2661.102/media/audio/alsa/audio_manager_alsa.cc	2021-05-22 17:07:10.666708626 +0200
+@@ -56,7 +56,8 @@ void AudioManagerAlsa::ShowLinuxAudioInp
+   base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
    switch (base::nix::GetDesktopEnvironment(env.get())) {
      case base::nix::DESKTOP_ENVIRONMENT_GNOME:
 -      command_line.SetProgram(base::FilePath("gnome-volume-control"));
diff --git a/nacl-linkingfix.patch b/nacl-linkingfix.patch
index 0e9f188..cb772fc 100644
--- a/nacl-linkingfix.patch
+++ b/nacl-linkingfix.patch
@@ -1,20 +1,19 @@
-diff -up chromium-9.0.600.0/native_client/src/trusted/service_runtime/service_runtime.gyp.linking-fix chromium-9.0.600.0/native_client/src/trusted/service_runtime/service_runtime.gyp
---- chromium-9.0.600.0/native_client/src/trusted/service_runtime/service_runtime.gyp.linking-fix	2010-12-03 06:56:29.000000000 -0500
-+++ chromium-9.0.600.0/native_client/src/trusted/service_runtime/service_runtime.gyp	2010-12-13 12:56:50.063551554 -0500
-@@ -187,6 +187,16 @@
-                     'linux/arm/sel_segments.c',
-                   ],
-                 }],
-+                ['target_arch=="ia32"', {
-+                  'sources': [
-+                    'linux/nacl_signal_32.c',
-+                  ],
-+                }],
-+                ['target_arch=="x64"', {
-+                  'sources': [
-+                    'linux/nacl_signal_64.c',
-+                  ],
-+                }],
+--- chromium-browser-50.0.2661.102/native_client/src/trusted/service_runtime/service_runtime.gyp.orig	2021-05-22 14:30:20.134879142 +0200
++++ chromium-browser-50.0.2661.102/native_client/src/trusted/service_runtime/service_runtime.gyp	2021-05-22 14:55:16.892591353 +0200
+@@ -113,6 +113,16 @@
+                 'win/thread_handle_map.c',
                ],
              }],
-             ['OS=="linux" or OS=="mac" or OS=="FreeBSD"', {
++            ['target_arch=="ia32"', {
++              'sources': [
++                'linux/nacl_signal_32.c',
++              ],
++            }],
++            ['target_arch=="x64"', {
++              'sources': [
++                'linux/nacl_signal_64.c',
++              ],
++            }],
+             # TODO(gregoryd): move arm-specific stuff into a separate gyp file.
+             ['target_arch=="arm"', {
+               'sources': [
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/cc39504aadcf005163f5a189672f587efcfedf7a