commit: 36ef217b856a8f4e21f57875d12cd51246c35e7e Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Wed Aug 2 21:27:52 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Aug 2 21:28:02 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ef217b
www-client/chromium: fix conflicting usage of major/minor Some debug code defined these as local variables, which seems to cause a build failure against glibc-2.25. Bug: https://bugs.gentoo.org/626744 Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1 www-client/chromium/chromium-60.0.3112.78.ebuild | 1 + .../chromium/files/chromium-major-minor.patch | 97 ++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/www-client/chromium/chromium-60.0.3112.78.ebuild b/www-client/chromium/chromium-60.0.3112.78.ebuild index 68b83b6a24a..00e68336525 100644 --- a/www-client/chromium/chromium-60.0.3112.78.ebuild +++ b/www-client/chromium/chromium-60.0.3112.78.ebuild @@ -185,6 +185,7 @@ src_prepare() { "${FILESDIR}/${PN}-widevine-r1.patch" "${FILESDIR}/${PN}-FORTIFY_SOURCE-r1.patch" "${FILESDIR}/${PN}-gn-bootstrap-r8.patch" + "${FILESDIR}/${PN}-major-minor.patch" ) default diff --git a/www-client/chromium/files/chromium-major-minor.patch b/www-client/chromium/files/chromium-major-minor.patch new file mode 100644 index 00000000000..ab8a701c6c1 --- /dev/null +++ b/www-client/chromium/files/chromium-major-minor.patch @@ -0,0 +1,97 @@ +From 11e48b29d00fdd714c3ff3f8ebe0d51a2c4ce61c Mon Sep 17 00:00:00 2001 +From: Dongseong Hwang <[email protected]> +Date: Tue, 11 Jul 2017 17:20:06 +0000 +Subject: [PATCH] ozone: drm: Remove the debug details when dmabuf mmap fails. + +As we fixed mmap failure, remove the redundant crash reports. +The CL adding the info: crrev.com/2710183005 + +BUG=629521 + +Change-Id: I8de9f16a3fce4a42500fe9c5e2843615940e184e +Reviewed-on: https://chromium-review.googlesource.com/565805 +Reviewed-by: Daniele Castagna <[email protected]> +Reviewed-by: Robert Sesek <[email protected]> +Reviewed-by: Dongseong Hwang <[email protected]> +Commit-Queue: Dongseong Hwang <[email protected]> +Cr-Commit-Position: refs/heads/master@{#485662} +--- + chrome/common/crash_keys.cc | 5 ----- + ui/gfx/linux/client_native_pixmap_dmabuf.cc | 28 +++------------------------- + 2 files changed, 3 insertions(+), 30 deletions(-) + +diff --git a/chrome/common/crash_keys.cc b/chrome/common/crash_keys.cc +index c4b563e0309b..2f1efe6f2334 100644 +--- a/chrome/common/crash_keys.cc ++++ b/chrome/common/crash_keys.cc +@@ -153,11 +153,6 @@ size_t RegisterChromeCrashKeys() { + {kInputEventFilterSendFailure, kSmallSize}, + #if defined(OS_CHROMEOS) + {kNumberOfUsers, kSmallSize}, +- // Temporary for https://crbug.com/629521 +- {"mmap_params", kSmallSize}, +- {"buffer_size", kSmallSize}, +- {"errno", kSmallSize}, +- {"number_of_fds", kSmallSize}, + #endif + #if defined(OS_MACOSX) + {mac::kFirstNSException, kMediumSize}, +diff --git a/ui/gfx/linux/client_native_pixmap_dmabuf.cc b/ui/gfx/linux/client_native_pixmap_dmabuf.cc +index 4927daf3a61d..e532686a4f5b 100644 +--- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc ++++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc +@@ -11,11 +11,9 @@ + #include <sys/mman.h> + #include <xf86drm.h> + +-#include "base/debug/crash_logging.h" + #include "base/memory/ptr_util.h" + #include "base/posix/eintr_wrapper.h" + #include "base/process/memory.h" +-#include "base/process/process_metrics.h" + #include "base/strings/stringprintf.h" + #include "base/trace_event/trace_event.h" + +@@ -87,36 +85,16 @@ ClientNativePixmapDmaBuf::ClientNativePixmapDmaBuf( + if (mmap_error == ENOMEM) + base::TerminateBecauseOutOfMemory(map_size); + +- // TODO(dcastagna): Remove the following diagnostic information and the +- // associated crash keys once crbug.com/629521 is fixed. + bool fd_valid = fcntl(dmabuf_fd_.get(), F_GETFD) != -1 || + logging::GetLastSystemErrorCode() != EBADF; +- int minor = -1; +- int major = -1; +- struct stat buf; +- if (!fstat(dmabuf_fd_.get(), &buf)) { +- minor = minor(buf.st_dev); +- major = major(buf.st_dev); +- } +- + std::string mmap_params = base::StringPrintf( + "(addr=nullptr, length=%zu, prot=(PROT_READ | PROT_WRITE), " +- "flags=MAP_SHARED, fd=%d[valid=%d, minor=%d, major=%d], offset=0)", +- map_size, dmabuf_fd_.get(), fd_valid, minor, major); ++ "flags=MAP_SHARED, fd=%d[valid=%d], offset=0)", ++ map_size, dmabuf_fd_.get(), fd_valid); + std::string errno_str = logging::SystemErrorCodeToString(mmap_error); +- std::unique_ptr<base::ProcessMetrics> process_metrics( +- base::ProcessMetrics::CreateCurrentProcessMetrics()); +- std::string number_of_fds = +- base::StringPrintf("%d", process_metrics->GetOpenFdCount()); +- base::debug::ScopedCrashKey params_crash_key("mmap_params", mmap_params); +- base::debug::ScopedCrashKey size_crash_key("buffer_size", size.ToString()); +- base::debug::ScopedCrashKey errno_crash_key("errno", errno_str); +- base::debug::ScopedCrashKey number_of_fds_crash_key("number_of_fds", +- number_of_fds); + LOG(ERROR) << "Failed to mmap dmabuf; mmap_params: " << mmap_params + << ", buffer_size: (" << size.ToString() +- << "), errno: " << errno_str +- << " , number_of_fds: " << number_of_fds; ++ << "), errno: " << errno_str; + LOG(ERROR) << "NativePixmapHandle:"; + LOG(ERROR) << "Number of fds: " << handle.fds.size(); + LOG(ERROR) << "Number of planes: " << handle.planes.size(); +-- +2.13.3 +
