commit:     599be358f257098e7ba29196f6fce498b0a8d208
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Mar 13 12:53:36 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 21:19:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=599be358

www-client/chromium: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/7444

 www-client/chromium/files/chromium-angle-r0.patch  | 89 ----------------------
 www-client/chromium/files/chromium-cups-r0.patch   | 45 -----------
 www-client/chromium/files/chromium-ffmpeg-r0.patch | 21 -----
 3 files changed, 155 deletions(-)

diff --git a/www-client/chromium/files/chromium-angle-r0.patch 
b/www-client/chromium/files/chromium-angle-r0.patch
deleted file mode 100644
index 462b8ae4443..00000000000
--- a/www-client/chromium/files/chromium-angle-r0.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 030017a4855c7b6e7f2ff8d9566c146f31eb301b Mon Sep 17 00:00:00 2001
-From: Kai Ninomiya <kain...@chromium.org>
-Date: Wed, 06 Dec 2017 14:06:53 -0800
-Subject: [PATCH] Mark StaticType related functions as constexpr
-
-Fixes compilation on some versions of GCC and probably Clang.
-
-Follow-up to http://crrev.com/c/786317
-
-Bug: angleproject:1432
-Change-Id: I3fc3ad0f65492f9543eb27fcdce6ca29a9ad06e5
-Reviewed-on: https://chromium-review.googlesource.com/812220
-Reviewed-by: Jamie Madill <jmad...@chromium.org>
-Commit-Queue: Kai Ninomiya <kain...@chromium.org>
----
-
-diff --git a/third_party/angle/src/compiler/translator/StaticType.h 
b/third_party/angle/src/compiler/translator/StaticType.h
-index e26e5ff..30b391a 100644
---- a/third_party/angle/src/compiler/translator/StaticType.h
-+++ b/third_party/angle/src/compiler/translator/StaticType.h
-@@ -160,7 +160,7 @@
-           TPrecision precision,
-           TQualifier qualifier,
-           unsigned char secondarySize>
--const TType *GetForVecMatHelper(unsigned char primarySize)
-+constexpr const TType *GetForVecMatHelper(unsigned char primarySize)
- {
-     static_assert(basicType == EbtFloat || basicType == EbtInt || basicType 
== EbtUInt ||
-                       basicType == EbtBool,
-@@ -186,7 +186,7 @@
- template <TBasicType basicType,
-           TPrecision precision = EbpUndefined,
-           TQualifier qualifier = EvqGlobal>
--const TType *GetForVecMat(unsigned char primarySize, unsigned char 
secondarySize = 1)
-+constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char 
secondarySize = 1)
- {
-     static_assert(basicType == EbtFloat || basicType == EbtInt || basicType 
== EbtUInt ||
-                       basicType == EbtBool,
-@@ -208,7 +208,7 @@
- }
- 
- template <TBasicType basicType, TPrecision precision = EbpUndefined>
--const TType *GetForVec(TQualifier qualifier, unsigned char size)
-+constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size)
- {
-     switch (qualifier)
-     {
-diff --git a/third_party/angle/src/compiler/translator/SymbolTable.cpp 
b/third_party/angle/src/compiler/translator/SymbolTable.cpp
-index adf1e4e..90d4c15 100644
---- a/third_party/angle/src/compiler/translator/SymbolTable.cpp
-+++ b/third_party/angle/src/compiler/translator/SymbolTable.cpp
-@@ -236,7 +236,7 @@
-         pop();
- }
- 
--bool IsGenType(const TType *type)
-+constexpr bool IsGenType(const TType *type)
- {
-     if (type)
-     {
-@@ -248,7 +248,7 @@
-     return false;
- }
- 
--bool IsVecType(const TType *type)
-+constexpr bool IsVecType(const TType *type)
- {
-     if (type)
-     {
-diff --git a/third_party/angle/src/compiler/translator/Types.h 
b/third_party/angle/src/compiler/translator/Types.h
-index 04f46f1..a54d447 100644
---- a/third_party/angle/src/compiler/translator/Types.h
-+++ b/third_party/angle/src/compiler/translator/Types.h
-@@ -142,13 +142,13 @@
-     {
-     }
- 
--    TBasicType getBasicType() const { return type; }
-+    constexpr TBasicType getBasicType() const { return type; }
-     void setBasicType(TBasicType t);
- 
-     TPrecision getPrecision() const { return precision; }
-     void setPrecision(TPrecision p) { precision = p; }
- 
--    TQualifier getQualifier() const { return qualifier; }
-+    constexpr TQualifier getQualifier() const { return qualifier; }
-     void setQualifier(TQualifier q) { qualifier = q; }
- 
-     bool isInvariant() const { return invariant; }

diff --git a/www-client/chromium/files/chromium-cups-r0.patch 
b/www-client/chromium/files/chromium-cups-r0.patch
deleted file mode 100644
index 88ea78a81eb..00000000000
--- a/www-client/chromium/files/chromium-cups-r0.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 3cf91d8d674a496d533aa106723a632b68ab26ba Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasander...@chromium.org>
-Date: Tue, 12 Dec 2017 23:31:56 +0000
-Subject: [PATCH] Fix use_cups=false build
-
-BUG=793801
-R=thes...@chromium.org
-
-Change-Id: I60ee6ec48d2686d0b42ca25311a9b76009ce9768
-Reviewed-on: https://chromium-review.googlesource.com/823245
-Reviewed-by: Lei Zhang <thes...@chromium.org>
-Commit-Queue: Thomas Anderson <thomasander...@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#523602}
----
- chrome/service/cloud_print/print_system.cc | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/chrome/service/cloud_print/print_system.cc 
b/chrome/service/cloud_print/print_system.cc
-index ac94c804f9..4ceba96919 100644
---- a/chrome/service/cloud_print/print_system.cc
-+++ b/chrome/service/cloud_print/print_system.cc
-@@ -5,6 +5,7 @@
- #include "chrome/service/cloud_print/print_system.h"
- 
- #include "base/guid.h"
-+#include "build/build_config.h"
- 
- namespace cloud_print {
- 
-@@ -35,5 +36,11 @@ std::string PrintSystem::GenerateProxyId() {
-   return base::GenerateGUID();
- }
- 
--}  // namespace cloud_print
-+#if defined(OS_LINUX) && !defined(USE_CUPS)
-+scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
-+    const base::DictionaryValue*) {
-+  return nullptr;
-+}
-+#endif
- 
-+}  // namespace cloud_print
--- 
-2.15.1
-

diff --git a/www-client/chromium/files/chromium-ffmpeg-r0.patch 
b/www-client/chromium/files/chromium-ffmpeg-r0.patch
deleted file mode 100644
index 40632235bab..00000000000
--- a/www-client/chromium/files/chromium-ffmpeg-r0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
-+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
-@@ -632,18 +632,8 @@
-   if 'win' not in target_os:
-     configure_flags['Common'].extend([
-         '--enable-pic',
--        '--cc=clang',
--        '--cxx=clang++',
--        '--ld=clang',
-     ])
- 
--    # Clang Linux will use the first 'ld' it finds on the path, which will
--    # typically be the system one, so explicitly configure use of Clang's
--    # ld.lld, to ensure that things like cross-compilation and LTO work.
--    # This does not work for arm64, ia32 and is always used on mac.
--    if target_arch not in ['arm64', 'ia32'] and target_os != 'mac':
--      configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld')
--
-   # Should be run on Mac.
-   if target_os == 'mac':
-     if host_os != 'mac':

Reply via email to