From fdaa6344afdaff0c589497e6b5d86a9cf41b4d5a Mon Sep 17 00:00:00 2001 From: robert Date: Mon, 13 Oct 2014 14:20:28 +0000 Subject: [PATCH] add missing Aura patch --- www/chromium/Makefile | 4 +++- ..._shell_browser_shell_browser_main_parts_cc | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 www/chromium/patches/patch-content_shell_browser_shell_browser_main_parts_cc diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 4812035ff6a..c8f1f273dea 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.185 2014/10/13 06:49:19 robert Exp $ +# $OpenBSD: Makefile,v 1.186 2014/10/13 14:20:28 robert Exp $ ONLY_FOR_ARCHS= i386 amd64 DPB_PROPERTIES= parallel @@ -8,6 +8,8 @@ COMMENT= Chromium browser V= 38.0.2125.101 DISTNAME= chromium-${V} +REVISION= 0 + CATEGORIES= www HOMEPAGE= https://code.google.com/chromium/ diff --git a/www/chromium/patches/patch-content_shell_browser_shell_browser_main_parts_cc b/www/chromium/patches/patch-content_shell_browser_shell_browser_main_parts_cc new file mode 100644 index 00000000000..ad121745d16 --- /dev/null +++ b/www/chromium/patches/patch-content_shell_browser_shell_browser_main_parts_cc @@ -0,0 +1,21 @@ +$OpenBSD: patch-content_shell_browser_shell_browser_main_parts_cc,v 1.1 2014/10/13 14:20:28 robert Exp $ +--- content/shell/browser/shell_browser_main_parts.cc.orig.port Mon Oct 13 14:26:38 2014 ++++ content/shell/browser/shell_browser_main_parts.cc Mon Oct 13 14:27:18 2014 +@@ -42,7 +42,7 @@ + #if defined(USE_AURA) && defined(USE_X11) + #include "ui/events/x/touch_factory_x11.h" + #endif +-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) ++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) + #include "ui/base/ime/input_method_initializer.h" + #endif + +@@ -108,7 +108,7 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() + } + + void ShellBrowserMainParts::PreEarlyInitialization() { +-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) ++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) + ui::InitializeInputMethodForTesting(); + #endif + #if defined(OS_ANDROID)