diff options
author | Stephan Hartmann <stha09@googlemail.com> | 2019-06-25 08:24:52 +0200 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2019-06-25 10:57:50 -0400 |
commit | 3eee04ec34c03a7fc6f374d9551d330262a65924 (patch) | |
tree | ffc3099d0d0c2ed9bda1ae41d69fe0133c2d0d9d | |
parent | www-client/chromium: fix build with -O3 (diff) | |
download | gentoo-3eee04ec.tar.gz gentoo-3eee04ec.tar.bz2 gentoo-3eee04ec.zip |
www-client/chromium: drop lss patch
Closes: https://github.com/gentoo/gentoo/pull/12324
Package-Manager: Portage-2.3.66, Repoman-2.3.11
Signed-off-by: Stephan Hartmann <stha09@googlemail.com>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-rw-r--r-- | www-client/chromium/chromium-75.0.3770.100.ebuild | 2 | ||||
-rw-r--r-- | www-client/chromium/chromium-76.0.3809.36.ebuild | 2 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-76-lss.patch | 39 |
3 files changed, 2 insertions, 41 deletions
diff --git a/www-client/chromium/chromium-75.0.3770.100.ebuild b/www-client/chromium/chromium-75.0.3770.100.ebuild index 5d8ef6d02682..20bf2709a39f 100644 --- a/www-client/chromium/chromium-75.0.3770.100.ebuild +++ b/www-client/chromium/chromium-75.0.3770.100.ebuild @@ -148,7 +148,6 @@ PATCHES=( "${FILESDIR}/chromium-75-fix-gn-gen.patch" "${FILESDIR}/chromium-75-gcc-angle-fix.patch" "${FILESDIR}/chromium-75-unique_ptr.patch" - "${FILESDIR}/chromium-75-lss.patch" "${FILESDIR}/chromium-75-noexcept.patch" "${FILESDIR}/chromium-75-llvm8.patch" "${FILESDIR}/chromium-75-pure-virtual.patch" @@ -252,6 +251,7 @@ src_prepare() { third_party/cld_3 third_party/closure_compiler third_party/crashpad + third_party/crashpad/crashpad/third_party/lss third_party/crashpad/crashpad/third_party/zlib third_party/crc32c third_party/cros_system_api diff --git a/www-client/chromium/chromium-76.0.3809.36.ebuild b/www-client/chromium/chromium-76.0.3809.36.ebuild index 2327e60f3cef..f785c3c3110e 100644 --- a/www-client/chromium/chromium-76.0.3809.36.ebuild +++ b/www-client/chromium/chromium-76.0.3809.36.ebuild @@ -146,7 +146,6 @@ PATCHES=( "${FILESDIR}/chromium-fix-char_traits.patch" "${FILESDIR}/chromium-angle-inline.patch" "${FILESDIR}/chromium-76-quiche.patch" - "${FILESDIR}/chromium-76-lss.patch" "${FILESDIR}/chromium-76-gcc-vulkan.patch" "${FILESDIR}/chromium-76-gcc-private.patch" "${FILESDIR}/chromium-76-gcc-noexcept.patch" @@ -262,6 +261,7 @@ src_prepare() { third_party/cld_3 third_party/closure_compiler third_party/crashpad + third_party/crashpad/crashpad/third_party/lss third_party/crashpad/crashpad/third_party/zlib third_party/crc32c third_party/cros_system_api diff --git a/www-client/chromium/files/chromium-76-lss.patch b/www-client/chromium/files/chromium-76-lss.patch deleted file mode 100644 index 4d475b539584..000000000000 --- a/www-client/chromium/files/chromium-76-lss.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc -index 008f858..69d0623 100644 ---- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc -+++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc -@@ -25,7 +25,7 @@ - #include "base/logging.h" - #include "base/strings/stringprintf.h" - #include "client/client_argv_handling.h" --#include "third_party/lss/lss.h" -+#include "third_party/lss/linux_syscall_support.h" - #include "util/file/file_io.h" - #include "util/linux/exception_handler_client.h" - #include "util/linux/exception_information.h" -diff --git a/third_party/crashpad/crashpad/util/linux/proc_task_reader_test.cc b/third_party/crashpad/crashpad/util/linux/proc_task_reader_test.cc -index 911f6d3..11c1ffa 100644 ---- a/third_party/crashpad/crashpad/util/linux/proc_task_reader_test.cc -+++ b/third_party/crashpad/crashpad/util/linux/proc_task_reader_test.cc -@@ -19,7 +19,7 @@ - #include "base/strings/stringprintf.h" - #include "gtest/gtest.h" - #include "test/multiprocess_exec.h" --#include "third_party/lss/lss.h" -+#include "third_party/lss/linux_syscall_support.h" - #include "util/synchronization/semaphore.h" - #include "util/thread/thread.h" - -diff --git a/third_party/crashpad/crashpad/util/linux/socket.cc b/third_party/crashpad/crashpad/util/linux/socket.cc -index 68efd57..d6e39f0 100644 ---- a/third_party/crashpad/crashpad/util/linux/socket.cc -+++ b/third_party/crashpad/crashpad/util/linux/socket.cc -@@ -18,7 +18,7 @@ - - #include "base/logging.h" - #include "base/posix/eintr_wrapper.h" --#include "third_party/lss/lss.h" -+#include "third_party/lss/linux_syscall_support.h" - - namespace crashpad { - |