Date: Wed, 22 Oct 2014 07:38:08 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371347 - in branches/2014Q4/www/chromium: . files Message-ID: <201410220738.s9M7c8NT091875@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Wed Oct 22 07:38:07 2014 New Revision: 371347 URL: https://svnweb.freebsd.org/changeset/ports/371347 QAT: https://qat.redports.org/buildarchive/r371347/ Log: MFH: r371240 www/chromium: fix input of accented keys, bump PORTREVISION. PR: 193725 Submitted by: Miguel Clara <miguelmclara@gmail.com> Patch by: Tomek <tomek@apostata.org> Approved by: ports-secteam (rea) Added: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc - copied unchanged from r371240, head/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc branches/2014Q4/www/chromium/files/patch-ui__base__ime__input_method_factory.cc - copied unchanged from r371240, head/www/chromium/files/patch-ui__base__ime__input_method_factory.cc Modified: branches/2014Q4/www/chromium/Makefile branches/2014Q4/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/chromium/Makefile ============================================================================== --- branches/2014Q4/www/chromium/Makefile Wed Oct 22 07:37:01 2014 (r371346) +++ branches/2014Q4/www/chromium/Makefile Wed Oct 22 07:38:07 2014 (r371347) @@ -3,6 +3,7 @@ PORTNAME= chromium PORTVERSION= 38.0.2125.104 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Copied: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc (from r371240, head/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc Wed Oct 22 07:38:07 2014 (r371347, copy of r371240, head/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc) @@ -0,0 +1,20 @@ +--- chrome/browser/ui/browser_command_controller.cc.orig 2014-10-14 21:32:48.000000000 +0200 ++++ chrome/browser/ui/browser_command_controller.cc 2014-10-14 21:22:15.000000000 +0200 +@@ -67,7 +67,7 @@ + #include "chrome/browser/ui/browser_commands_chromeos.h" + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" + #endif + +@@ -279,7 +279,7 @@ + if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN) + return true; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + // If this key was registered by the user as a content editing hotkey, then + // it is not reserved. + ui::TextEditKeyBindingsDelegateAuraLinux* delegate = Modified: branches/2014Q4/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc Wed Oct 22 07:37:01 2014 (r371346) +++ branches/2014Q4/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc Wed Oct 22 07:38:07 2014 (r371347) @@ -1,5 +1,14 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2014-10-02 17:39:47 UTC -+++ content/browser/renderer_host/render_widget_host_view_aura.cc +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2014-10-02 19:39:47.000000000 +0200 ++++ content/browser/renderer_host/render_widget_host_view_aura.cc 2014-10-15 19:03:21.000000000 +0200 +@@ -88,7 +88,7 @@ + #include "ui/gfx/win/dpi.h" + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + #include "content/common/input_messages.h" + #include "ui/events/linux/text_edit_command_auralinux.h" + #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" @@ -653,7 +653,7 @@ if (host) return reinterpret_cast<gfx::NativeViewId>(host->GetAcceleratedWidget()); @@ -9,3 +18,12 @@ } gfx::NativeViewAccessible RenderWidgetHostViewAura::GetNativeViewAccessible() { +@@ -2418,7 +2418,7 @@ + + void RenderWidgetHostViewAura::ForwardKeyboardEvent( + const NativeWebKeyboardEvent& event) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate = + ui::GetTextEditKeyBindingsDelegate(); + std::vector<ui::TextEditCommandAuraLinux> commands; Copied: branches/2014Q4/www/chromium/files/patch-ui__base__ime__input_method_factory.cc (from r371240, head/www/chromium/files/patch-ui__base__ime__input_method_factory.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-ui__base__ime__input_method_factory.cc Wed Oct 22 07:38:07 2014 (r371347, copy of r371240, head/www/chromium/files/patch-ui__base__ime__input_method_factory.cc) @@ -0,0 +1,20 @@ +--- ui/base/ime/input_method_factory.cc.orig 2014-10-14 21:31:49.000000000 +0200 ++++ ui/base/ime/input_method_factory.cc 2014-10-14 21:26:34.000000000 +0200 +@@ -14,7 +14,7 @@ + #include "ui/base/ime/remote_input_method_win.h" + #elif defined(OS_MACOSX) + #include "ui/base/ime/input_method_mac.h" +-#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + #include "ui/base/ime/input_method_auralinux.h" + #else + #include "ui/base/ime/input_method_minimal.h" +@@ -47,7 +47,7 @@ + return scoped_ptr<InputMethod>(new InputMethodWin(delegate, widget)); + #elif defined(OS_MACOSX) + return scoped_ptr<InputMethod>(new InputMethodMac(delegate)); +-#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + return scoped_ptr<InputMethod>(new InputMethodAuraLinux(delegate)); + #else + return scoped_ptr<InputMethod>(new InputMethodMinimal(delegate));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410220738.s9M7c8NT091875>