| 1 |
commit: 3eee04ec34c03a7fc6f374d9551d330262a65924 |
| 2 |
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com> |
| 3 |
AuthorDate: Tue Jun 25 06:24:52 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 25 14:57:50 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eee04ec |
| 7 |
|
| 8 |
www-client/chromium: drop lss patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/12324 |
| 11 |
Package-Manager: Portage-2.3.66, Repoman-2.3.11 |
| 12 |
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com> |
| 13 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 14 |
|
| 15 |
www-client/chromium/chromium-75.0.3770.100.ebuild | 2 +- |
| 16 |
www-client/chromium/chromium-76.0.3809.36.ebuild | 2 +- |
| 17 |
www-client/chromium/files/chromium-76-lss.patch | 39 ----------------------- |
| 18 |
3 files changed, 2 insertions(+), 41 deletions(-) |
| 19 |
|
| 20 |
diff --git a/www-client/chromium/chromium-75.0.3770.100.ebuild b/www-client/chromium/chromium-75.0.3770.100.ebuild |
| 21 |
index 5d8ef6d0268..20bf2709a39 100644 |
| 22 |
--- a/www-client/chromium/chromium-75.0.3770.100.ebuild |
| 23 |
+++ b/www-client/chromium/chromium-75.0.3770.100.ebuild |
| 24 |
@@ -148,7 +148,6 @@ PATCHES=( |
| 25 |
"${FILESDIR}/chromium-75-fix-gn-gen.patch" |
| 26 |
"${FILESDIR}/chromium-75-gcc-angle-fix.patch" |
| 27 |
"${FILESDIR}/chromium-75-unique_ptr.patch" |
| 28 |
- "${FILESDIR}/chromium-75-lss.patch" |
| 29 |
"${FILESDIR}/chromium-75-noexcept.patch" |
| 30 |
"${FILESDIR}/chromium-75-llvm8.patch" |
| 31 |
"${FILESDIR}/chromium-75-pure-virtual.patch" |
| 32 |
@@ -252,6 +251,7 @@ src_prepare() { |
| 33 |
third_party/cld_3 |
| 34 |
third_party/closure_compiler |
| 35 |
third_party/crashpad |
| 36 |
+ third_party/crashpad/crashpad/third_party/lss |
| 37 |
third_party/crashpad/crashpad/third_party/zlib |
| 38 |
third_party/crc32c |
| 39 |
third_party/cros_system_api |
| 40 |
|
| 41 |
diff --git a/www-client/chromium/chromium-76.0.3809.36.ebuild b/www-client/chromium/chromium-76.0.3809.36.ebuild |
| 42 |
index 2327e60f3ce..f785c3c3110 100644 |
| 43 |
--- a/www-client/chromium/chromium-76.0.3809.36.ebuild |
| 44 |
+++ b/www-client/chromium/chromium-76.0.3809.36.ebuild |
| 45 |
@@ -146,7 +146,6 @@ PATCHES=( |
| 46 |
"${FILESDIR}/chromium-fix-char_traits.patch" |
| 47 |
"${FILESDIR}/chromium-angle-inline.patch" |
| 48 |
"${FILESDIR}/chromium-76-quiche.patch" |
| 49 |
- "${FILESDIR}/chromium-76-lss.patch" |
| 50 |
"${FILESDIR}/chromium-76-gcc-vulkan.patch" |
| 51 |
"${FILESDIR}/chromium-76-gcc-private.patch" |
| 52 |
"${FILESDIR}/chromium-76-gcc-noexcept.patch" |
| 53 |
@@ -262,6 +261,7 @@ src_prepare() { |
| 54 |
third_party/cld_3 |
| 55 |
third_party/closure_compiler |
| 56 |
third_party/crashpad |
| 57 |
+ third_party/crashpad/crashpad/third_party/lss |
| 58 |
third_party/crashpad/crashpad/third_party/zlib |
| 59 |
third_party/crc32c |
| 60 |
third_party/cros_system_api |
| 61 |
|
| 62 |
diff --git a/www-client/chromium/files/chromium-76-lss.patch b/www-client/chromium/files/chromium-76-lss.patch |
| 63 |
deleted file mode 100644 |
| 64 |
index 4d475b53958..00000000000 |
| 65 |
--- a/www-client/chromium/files/chromium-76-lss.patch |
| 66 |
+++ /dev/null |
| 67 |
@@ -1,39 +0,0 @@ |
| 68 |
-diff --git a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc |
| 69 |
-index 008f858..69d0623 100644 |
| 70 |
---- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc |
| 71 |
-+++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc |
| 72 |
-@@ -25,7 +25,7 @@ |
| 73 |
- #include "base/logging.h" |
| 74 |
- #include "base/strings/stringprintf.h" |
| 75 |
- #include "client/client_argv_handling.h" |
| 76 |
--#include "third_party/lss/lss.h" |
| 77 |
-+#include "third_party/lss/linux_syscall_support.h" |
| 78 |
- #include "util/file/file_io.h" |
| 79 |
- #include "util/linux/exception_handler_client.h" |
| 80 |
- #include "util/linux/exception_information.h" |
| 81 |
-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 |
| 82 |
-index 911f6d3..11c1ffa 100644 |
| 83 |
---- a/third_party/crashpad/crashpad/util/linux/proc_task_reader_test.cc |
| 84 |
-+++ b/third_party/crashpad/crashpad/util/linux/proc_task_reader_test.cc |
| 85 |
-@@ -19,7 +19,7 @@ |
| 86 |
- #include "base/strings/stringprintf.h" |
| 87 |
- #include "gtest/gtest.h" |
| 88 |
- #include "test/multiprocess_exec.h" |
| 89 |
--#include "third_party/lss/lss.h" |
| 90 |
-+#include "third_party/lss/linux_syscall_support.h" |
| 91 |
- #include "util/synchronization/semaphore.h" |
| 92 |
- #include "util/thread/thread.h" |
| 93 |
- |
| 94 |
-diff --git a/third_party/crashpad/crashpad/util/linux/socket.cc b/third_party/crashpad/crashpad/util/linux/socket.cc |
| 95 |
-index 68efd57..d6e39f0 100644 |
| 96 |
---- a/third_party/crashpad/crashpad/util/linux/socket.cc |
| 97 |
-+++ b/third_party/crashpad/crashpad/util/linux/socket.cc |
| 98 |
-@@ -18,7 +18,7 @@ |
| 99 |
- |
| 100 |
- #include "base/logging.h" |
| 101 |
- #include "base/posix/eintr_wrapper.h" |
| 102 |
--#include "third_party/lss/lss.h" |
| 103 |
-+#include "third_party/lss/linux_syscall_support.h" |
| 104 |
- |
| 105 |
- namespace crashpad { |
| 106 |
- |
Archives