summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content__browser__browser_main_loop.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2013-05-14 21:10:15 +0000
committerRene Ladan <rene@FreeBSD.org>2013-05-14 21:10:15 +0000
commit217593e8de3b3015393d2afaade0aa1ccea49b7a (patch)
treeab81e2a78d66721e46b691bea9c0bea13db968b4 /www/chromium/files/patch-content__browser__browser_main_loop.cc
parent- Convert to optionsNG (diff)
Update to 27.0.1453.81
Note that this is still a beta version, and that the sysctl kern.ipc.shm_allow_removed must be set to 1 for correct operation. Port changes: - add dependency on accessibility/speech-dispatcher for libspeechd - use internal libvpx - update disk space requirements - add pkg-message for the above sysctl Submitted by: George Liaskos Security: http://vuxml.org/freebsd/bdd48858-9656-11e2-a9a8-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-content__browser__browser_main_loop.cc')
-rw-r--r--www/chromium/files/patch-content__browser__browser_main_loop.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/www/chromium/files/patch-content__browser__browser_main_loop.cc b/www/chromium/files/patch-content__browser__browser_main_loop.cc
index 545501f3d347..d36a31c1bb4c 100644
--- a/www/chromium/files/patch-content__browser__browser_main_loop.cc
+++ b/www/chromium/files/patch-content__browser__browser_main_loop.cc
@@ -1,6 +1,6 @@
---- content/browser/browser_main_loop.cc.orig 2012-10-31 21:01:35.000000000 +0200
-+++ content/browser/browser_main_loop.cc 2012-11-07 15:40:53.000000000 +0200
-@@ -61,7 +61,7 @@
+--- content/browser/browser_main_loop.cc.orig 2013-02-28 10:14:31.000000000 +0200
++++ content/browser/browser_main_loop.cc 2013-03-06 21:28:00.000000000 +0200
+@@ -73,7 +73,7 @@
#include "net/base/winsock_init.h"
#endif
@@ -9,7 +9,7 @@
#include <glib-object.h>
#endif
-@@ -79,7 +79,7 @@
+@@ -87,7 +87,7 @@
#include "ui/gfx/gtk_util.h"
#endif
@@ -18,8 +18,8 @@
#include <sys/stat.h>
#include "base/process_util.h"
-@@ -100,7 +100,7 @@
-
+@@ -111,7 +111,7 @@
+ namespace content {
namespace {
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
@@ -27,7 +27,7 @@
void SetupSandbox(const CommandLine& parsed_command_line) {
// TODO(evanm): move this into SandboxWrapper; I'm just trying to move this
// code en masse out of chrome_main for now.
-@@ -128,7 +128,7 @@
+@@ -139,7 +139,7 @@
}
#endif
@@ -36,8 +36,8 @@
static void GLibLogHandler(const gchar* log_domain,
GLogLevelFlags log_level,
const gchar* message,
-@@ -286,7 +286,7 @@
- }
+@@ -311,7 +311,7 @@
+ crypto::EnsureNSPRInit();
#endif // !defined(USE_OPENSSL)
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
@@ -45,12 +45,12 @@
SetupSandbox(parsed_command_line_);
#endif
-@@ -681,7 +681,7 @@
+@@ -758,7 +758,7 @@
// are no #else branches on any #ifs.
// TODO(stevenjb): Move platform specific code into platform specific Parts
// (Need to add InitializeToolkit stage to BrowserParts).
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
- // Glib type system initialization. Needed at least for gconf,
- // used in net/proxy/proxy_config_service_linux.cc. Most likely
- // this is superfluous as gtk_init() ought to do this. It's
+ // g_type_init will be deprecated in 2.36. 2.35 is the development
+ // version for 2.36, hence do not call g_type_init starting 2.35.
+ // http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init