mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-24 00:45:52 +00:00
www/chromium: fix input of accented keys, bump PORTREVISION.
PR: 193725 Submitted by: Miguel Clara <miguelmclara@gmail.com> Patch by: Tomek <tomek@apostata.org> MFH: 2014Q4
This commit is contained in:
parent
f31e703dca
commit
8da4559259
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=371240
@ -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}
|
||||
|
@ -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 =
|
@ -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;
|
||||
|
@ -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));
|
Loading…
Reference in New Issue
Block a user