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

diff --git a/chromium-browser-build.patch b/chromium-browser-build.patch
deleted file mode 100644 (file)
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/chromium-browser.spec b/chromium-browser.spec
index 22b937ba62a4743d9b399d2115fcf3cbb8b47a9a..69321a292413aca080897ac01a899b71229b2c4a 100644 (file)
--- 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/gnome3-volume-control.patch b/gnome3-volume-control.patch
index 66e79276688f4a13431e4fba20d94b5adbf9081a..25881316029f1000df6083f4667f7c0c94b6f724 100644 (file)
--- 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 0e9f188e52ebfafe8f00b1bb6a483863984b2a5b..cb772fc839d2e514e130f712a38ef60d0a8828c6 100644 (file)
--- 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': [