update to 20.0.1132.47
This commit is contained in:
parent
a700373bff
commit
50dcc346db
@ -1,14 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.96 2012/06/15 08:32:18 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.97 2012/07/10 09:22:34 robert Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= i386 amd64
|
||||
|
||||
COMMENT= Chromium browser
|
||||
|
||||
V= 18.0.1025.168
|
||||
V= 20.0.1132.47
|
||||
DISTNAME= chromium-${V}
|
||||
|
||||
REVISION= 1
|
||||
|
||||
CATEGORIES= www
|
||||
|
||||
HOMEPAGE= http://code.google.com/chromium/
|
||||
@ -36,10 +34,11 @@ MODPY_RUNDEP= No
|
||||
|
||||
WANTLIB += X11 Xext Xfixes Xrender Xss bz2 c cairo cups dbus-1 event
|
||||
WANTLIB += execinfo expat fontconfig freetype gconf-2 gcrypt gdk-x11-2.0
|
||||
WANTLIB += gdk_pixbuf-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
|
||||
WANTLIB += gdk_pixbuf-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
|
||||
WANTLIB += jpeg m nspr4 nss3 nssutil3 pango-1.0 pangocairo-1.0
|
||||
WANTLIB += plc4 png pthread pthread-stubs smime3 speex estdc++
|
||||
WANTLIB += xml2 xslt
|
||||
WANTLIB += xml2 xslt z
|
||||
WANTLIB += Xcomposite atk-1.0 usb-1.0
|
||||
|
||||
RUN_DEPENDS= devel/xdg-utils \
|
||||
devel/desktop-file-utils \
|
||||
@ -56,6 +55,7 @@ BUILD_DEPENDS= archivers/bzip2 \
|
||||
x11/gnome/libgnome-keyring
|
||||
LIB_DEPENDS= devel/libexecinfo \
|
||||
archivers/bzip2 \
|
||||
devel/libusb1 \
|
||||
security/nss \
|
||||
devel/gconf2 \
|
||||
textproc/libxslt \
|
||||
@ -101,6 +101,10 @@ GYP_DEFS= -Duse_system_bzip2=1 \
|
||||
|
||||
pre-configure:
|
||||
@ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
|
||||
.for _arch in x64 ia32
|
||||
@cp -pR ${WRKSRC}/third_party/ffmpeg/chromium/config/Chromium/linux/${_arch}/libavcodec \
|
||||
${WRKSRC}/third_party/ffmpeg/chromium/config/Chromium/openbsd/${_arch}/libavcodec
|
||||
.endfor
|
||||
@cp -R ${WRKSRC}/third_party/libvpx/source/config/linux \
|
||||
${WRKSRC}/third_party/libvpx/source/config/openbsd
|
||||
|
||||
@ -118,8 +122,9 @@ do-install:
|
||||
${FILESDIR}/chrome ${PREFIX}/bin/chrome
|
||||
chmod ${BINMODE} ${PREFIX}/bin/chrome
|
||||
${INSTALL_MAN} ${BUILDDIR}/chrome.1 ${PREFIX}/man/man1
|
||||
${INSTALL_DATA} ${BUILDDIR}/chrome.pak ${PREFIX}/chrome
|
||||
${INSTALL_DATA} ${BUILDDIR}/resources.pak ${PREFIX}/chrome
|
||||
.for p in chrome content_resources resources theme_resources_standard ui_resources_standard
|
||||
${INSTALL_DATA} ${BUILDDIR}/${p}.pak ${PREFIX}/chrome
|
||||
.endfor
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/chrome/locales
|
||||
${INSTALL_DATA} ${BUILDDIR}/locales/* ${PREFIX}/chrome/locales
|
||||
${INSTALL_DATA} ${BUILDDIR}/*.png ${PREFIX}/chrome
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (chromium-18.0.1025.168.tar.bz2) = cB/h3XqccAm71f7WYH47Jg==
|
||||
RMD160 (chromium-18.0.1025.168.tar.bz2) = RjfwlQga6AXwbqaTfANEXqbVtbE=
|
||||
SHA1 (chromium-18.0.1025.168.tar.bz2) = Ndsn/lDFLvfPfTGWpmqjRBmSmJM=
|
||||
SHA256 (chromium-18.0.1025.168.tar.bz2) = Hx/HvYBmg1hEpGX51gxJwhFz/1WcQOXRE/6cRif8GLk=
|
||||
SIZE (chromium-18.0.1025.168.tar.bz2) = 174835030
|
||||
MD5 (chromium-20.0.1132.47.tar.bz2) = PJ4tz+VenK+E2Bi5DCFTGA==
|
||||
RMD160 (chromium-20.0.1132.47.tar.bz2) = h6bwzm563LmkgiFA9ruIq4fDjyI=
|
||||
SHA1 (chromium-20.0.1132.47.tar.bz2) = sD6nCkqIEar/xyCd9wSbNAQ4GHk=
|
||||
SHA256 (chromium-20.0.1132.47.tar.bz2) = o06HrpFsEUa1BgkNMKyQHb+oilXbkPiyJQ6ynqyjoeU=
|
||||
SIZE (chromium-20.0.1132.47.tar.bz2) = 185068200
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-base_base_gyp,v 1.11 2012/04/03 13:59:35 robert Exp $
|
||||
--- base/base.gyp.orig Tue Mar 27 03:02:03 2012
|
||||
+++ base/base.gyp Sun Apr 1 20:04:42 2012
|
||||
@@ -349,6 +349,13 @@
|
||||
$OpenBSD: patch-base_base_gyp,v 1.12 2012/07/10 09:22:34 robert Exp $
|
||||
--- base/base.gyp.orig Thu Jun 28 15:01:49 2012
|
||||
+++ base/base.gyp Sat Jul 7 09:50:22 2012
|
||||
@@ -386,6 +386,13 @@
|
||||
],
|
||||
}],
|
||||
],
|
||||
|
19
www/chromium/patches/patch-base_base_gypi
Normal file
19
www/chromium/patches/patch-base_base_gypi
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-base_base_gypi,v 1.12 2012/07/10 09:22:34 robert Exp $
|
||||
--- base/base.gypi.orig Thu Jun 28 15:01:49 2012
|
||||
+++ base/base.gypi Sat Jul 7 09:50:22 2012
|
||||
@@ -130,7 +130,6 @@
|
||||
'file_version_info_win.h',
|
||||
'files/file_path_watcher.cc',
|
||||
'files/file_path_watcher.h',
|
||||
- 'files/file_path_watcher_kqueue.cc',
|
||||
'files/file_path_watcher_linux.cc',
|
||||
'files/file_path_watcher_stub.cc',
|
||||
'files/file_path_watcher_win.cc',
|
||||
@@ -565,7 +564,6 @@
|
||||
[ 'os_bsd==1', {
|
||||
'sources/': [
|
||||
['exclude', '^files/file_path_watcher_linux\\.cc$'],
|
||||
- ['exclude', '^files/file_path_watcher_stub\\.cc$'],
|
||||
['exclude', '^file_util_linux\\.cc$'],
|
||||
['exclude', '^process_linux\\.cc$'],
|
||||
['exclude', '^process_util_linux\\.cc$'],
|
15
www/chromium/patches/patch-base_debug_stack_trace_posix_cc
Normal file
15
www/chromium/patches/patch-base_debug_stack_trace_posix_cc
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.5 2012/07/10 09:22:34 robert Exp $
|
||||
--- base/debug/stack_trace_posix.cc.orig Tue Jul 10 10:37:42 2012
|
||||
+++ base/debug/stack_trace_posix.cc Tue Jul 10 10:42:08 2012
|
||||
@@ -153,6 +153,11 @@ StackTrace::StackTrace() {
|
||||
count_ = 0;
|
||||
return;
|
||||
}
|
||||
+#elif defined(OS_BSD)
|
||||
+ // Disable backtrace for now, libexecinfo crashes in getframeaddr
|
||||
+ // in release build / i386.
|
||||
+ count_ = 0;
|
||||
+ return;
|
||||
#endif
|
||||
// Though the backtrace API man page does not list any possible negative
|
||||
// return values, we take no chance.
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-base_threading_worker_pool_posix_cc,v 1.5 2012/02/17 10:19:50 robert Exp $
|
||||
--- base/threading/worker_pool_posix.cc.orig Fri Jan 27 09:02:06 2012
|
||||
+++ base/threading/worker_pool_posix.cc Thu Feb 9 09:31:06 2012
|
||||
@@ -24,7 +24,7 @@ namespace {
|
||||
$OpenBSD: patch-base_threading_worker_pool_posix_cc,v 1.6 2012/07/10 09:22:34 robert Exp $
|
||||
--- base/threading/worker_pool_posix.cc.orig Thu Jun 28 15:01:48 2012
|
||||
+++ base/threading/worker_pool_posix.cc Sat Jul 7 09:50:22 2012
|
||||
@@ -28,7 +28,7 @@ base::LazyInstance<ThreadLocalBoolean>::Leaky
|
||||
const int kIdleSecondsBeforeExit = 10 * 60;
|
||||
// A stack size of 64 KB is too small for the CERT_PKIXVerifyCert
|
||||
// function of NSS because of NSS bug 439169.
|
||||
|
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.1 2012/07/10 09:22:34 robert Exp $
|
||||
--- chrome/app/chrome_main_delegate.cc.orig Tue Jul 10 09:32:23 2012
|
||||
+++ chrome/app/chrome_main_delegate.cc Tue Jul 10 09:32:54 2012
|
||||
@@ -285,7 +285,7 @@ bool SubprocessNeedsResourceBundle(const std::string&
|
||||
// Mac needs them for the plugin process name.
|
||||
process_type == switches::kPluginProcess ||
|
||||
#endif
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
// The zygote process opens the resources for the renderers.
|
||||
process_type == switches::kZygoteProcess ||
|
||||
#endif
|
@ -1,21 +1,12 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.2 2012/02/17 10:19:50 robert Exp $
|
||||
--- chrome/browser/chrome_browser_main_posix.cc.orig Fri Jan 27 09:02:34 2012
|
||||
+++ chrome/browser/chrome_browser_main_posix.cc Wed Feb 15 16:42:39 2012
|
||||
@@ -210,7 +210,7 @@ void ChromeBrowserMainPartsPosix::PreEarlyInitializati
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.3 2012/07/10 09:22:34 robert Exp $
|
||||
--- chrome/browser/chrome_browser_main_posix.cc.orig Fri Jun 1 06:14:35 2012
|
||||
+++ chrome/browser/chrome_browser_main_posix.cc Fri Jun 1 06:14:42 2012
|
||||
@@ -216,7 +216,7 @@ void ChromeBrowserMainPartsPosix::PreEarlyInitializati
|
||||
if (!fd_limit_string.empty()) {
|
||||
base::StringToInt(fd_limit_string, &fd_limit);
|
||||
}
|
||||
-#if defined(OS_MACOSX)
|
||||
+#if defined(OS_MACOSX) || defined(OS_OPENBSD)
|
||||
+#if defined(OS_BSD)
|
||||
// We use quite a few file descriptors for our IPC, and the default limit on
|
||||
// the Mac is low (256), so bump it up if there is no explicit override.
|
||||
if (fd_limit == 0) {
|
||||
@@ -231,7 +231,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
|
||||
} else {
|
||||
g_shutdown_pipe_read_fd = pipefd[0];
|
||||
g_shutdown_pipe_write_fd = pipefd[1];
|
||||
- const size_t kShutdownDetectorThreadStackSize = 4096;
|
||||
+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN;
|
||||
// TODO(viettrungluu,willchan): crbug.com/29675 - This currently leaks, so
|
||||
// if you change this, you'll probably need to change the suppression.
|
||||
if (!base::PlatformThread::CreateNonJoinable(
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_component_updater_component_updater_configurator_cc,v 1.2 2012/02/17 10:19:50 robert Exp $
|
||||
--- chrome/browser/component_updater/component_updater_configurator.cc.orig Fri Jan 27 09:02:15 2012
|
||||
+++ chrome/browser/component_updater/component_updater_configurator.cc Thu Feb 9 09:31:06 2012
|
||||
@@ -81,6 +81,12 @@ const char kExtraInfo[] =
|
||||
$OpenBSD: patch-chrome_browser_component_updater_component_updater_configurator_cc,v 1.3 2012/07/10 09:22:34 robert Exp $
|
||||
--- chrome/browser/component_updater/component_updater_configurator.cc.orig Wed May 23 03:50:22 2012
|
||||
+++ chrome/browser/component_updater/component_updater_configurator.cc Fri Jun 1 06:13:04 2012
|
||||
@@ -89,6 +89,12 @@ const char kExtraInfo[] =
|
||||
#else
|
||||
"os=openbsd&arch=unknown";
|
||||
#endif
|
||||
|
@ -1,30 +1,30 @@
|
||||
$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.8 2012/04/03 13:59:35 robert Exp $
|
||||
--- chrome/browser/memory_details.cc.orig Tue Mar 27 03:02:19 2012
|
||||
+++ chrome/browser/memory_details.cc Sun Apr 1 20:04:42 2012
|
||||
$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.9 2012/07/10 09:22:34 robert Exp $
|
||||
--- chrome/browser/memory_details.cc.orig Thu Jun 28 15:02:04 2012
|
||||
+++ chrome/browser/memory_details.cc Sat Jul 7 09:50:22 2012
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "grit/generated_resources.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
#include "content/browser/renderer_host/render_sandbox_host_linux.h"
|
||||
#include "content/browser/zygote_host_linux.h"
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
#include "content/public/browser/zygote_host_linux.h"
|
||||
#endif
|
||||
@@ -156,7 +156,7 @@ void MemoryDetails::CollectChildInfoOnIOThread() {
|
||||
|
||||
@@ -195,7 +195,7 @@ void MemoryDetails::CollectChildInfoOnIOThread() {
|
||||
void MemoryDetails::CollectChildInfoOnUIThread() {
|
||||
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
const pid_t zygote_pid = ZygoteHost::GetInstance()->pid();
|
||||
const pid_t sandbox_helper_pid = RenderSandboxHostLinux::GetInstance()->pid();
|
||||
#endif
|
||||
@@ -304,7 +304,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid();
|
||||
const pid_t sandbox_helper_pid =
|
||||
content::ZygoteHost::GetInstance()->GetSandboxHelperPid();
|
||||
@@ -341,7 +341,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
|
||||
}
|
||||
}
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
if (process.pid == zygote_pid) {
|
||||
process.type = content::PROCESS_TYPE_ZYGOTE;
|
||||
} else if (process.pid == sandbox_helper_pid) {
|
||||
|
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-chrome_browser_memory_details_linux_cc,v 1.2 2012/04/03 13:59:35 robert Exp $
|
||||
--- chrome/browser/memory_details_linux.cc.orig Tue Mar 27 03:02:19 2012
|
||||
+++ chrome/browser/memory_details_linux.cc Sun Apr 1 20:04:42 2012
|
||||
@@ -239,7 +239,7 @@ void MemoryDetails::CollectProcessData(
|
||||
$OpenBSD: patch-chrome_browser_memory_details_linux_cc,v 1.3 2012/07/10 09:22:34 robert Exp $
|
||||
--- chrome/browser/memory_details_linux.cc.orig Fri Jun 1 06:15:30 2012
|
||||
+++ chrome/browser/memory_details_linux.cc Fri Jun 1 06:16:12 2012
|
||||
@@ -240,7 +240,7 @@ void MemoryDetails::CollectProcessData(
|
||||
}
|
||||
|
||||
std::vector<pid_t> current_browser_processes;
|
||||
- const pid_t zygote = ZygoteHost::GetInstance()->pid();
|
||||
- const pid_t zygote = content::ZygoteHost::GetInstance()->GetPid();
|
||||
+ const pid_t zygote = 0;
|
||||
GetAllChildren(processes, getpid(), zygote, ¤t_browser_processes);
|
||||
ProcessData current_browser;
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-chrome_browser_memory_purger_cc,v 1.7 2012/02/17 10:19:50 robert Exp $
|
||||
--- chrome/browser/memory_purger.cc.orig Fri Jan 27 09:02:34 2012
|
||||
+++ chrome/browser/memory_purger.cc Thu Feb 9 09:31:06 2012
|
||||
@@ -130,7 +130,7 @@ void MemoryPurger::PurgeBrowser() {
|
||||
// * Purge AppCache memory. Not yet implemented sufficiently.
|
||||
// * Browser-side DatabaseTracker. Not implemented sufficiently.
|
||||
|
||||
-#if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
|
||||
+#if !defined(OS_MACOSX) && !defined(OS_OPENBSD) && defined(USE_TCMALLOC)
|
||||
// Tell tcmalloc to release any free pages it's still holding.
|
||||
//
|
||||
// TODO(pkasting): A lot of the above calls kick off actions on other threads.
|
@ -1,20 +1,20 @@
|
||||
$OpenBSD: patch-chrome_browser_shell_integration_linux_cc,v 1.7 2012/04/03 13:59:35 robert Exp $
|
||||
--- chrome/browser/shell_integration_linux.cc.orig Tue Mar 27 03:02:19 2012
|
||||
+++ chrome/browser/shell_integration_linux.cc Sun Apr 1 20:04:43 2012
|
||||
@@ -123,6 +123,8 @@ void CreateShortcutOnDesktop(const FilePath& shortcut_
|
||||
$OpenBSD: patch-chrome_browser_shell_integration_linux_cc,v 1.8 2012/07/10 09:22:34 robert Exp $
|
||||
--- chrome/browser/shell_integration_linux.cc.orig Sat Jul 7 15:52:44 2012
|
||||
+++ chrome/browser/shell_integration_linux.cc Sat Jul 7 15:58:16 2012
|
||||
@@ -122,6 +122,8 @@ bool CreateShortcutOnDesktop(const FilePath& shortcut_
|
||||
if (!PathService::Get(chrome::DIR_USER_DESKTOP, &desktop_path))
|
||||
return;
|
||||
return false;
|
||||
|
||||
+#if !defined(OS_OPENBSD)
|
||||
+// BSD: Linux-specific calls like openat are used so defined out for BSD.
|
||||
int desktop_fd = open(desktop_path.value().c_str(), O_RDONLY | O_DIRECTORY);
|
||||
if (desktop_fd < 0)
|
||||
return;
|
||||
@@ -151,6 +153,7 @@ void CreateShortcutOnDesktop(const FilePath& shortcut_
|
||||
return false;
|
||||
@@ -150,6 +152,7 @@ bool CreateShortcutOnDesktop(const FilePath& shortcut_
|
||||
|
||||
if (HANDLE_EINTR(close(desktop_fd)) < 0)
|
||||
PLOG(ERROR) << "close";
|
||||
+#endif // !defined(OS_OPENBSD)
|
||||
}
|
||||
+#endif
|
||||
|
||||
void CreateShortcutInApplicationsMenu(const FilePath& shortcut_filename,
|
||||
return true;
|
||||
}
|
||||
|
@ -1,16 +1,16 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.2 2012/04/03 13:59:35 robert Exp $
|
||||
--- chrome/browser/ui/webui/about_ui.cc.orig Tue Mar 27 03:02:15 2012
|
||||
+++ chrome/browser/ui/webui/about_ui.cc Sun Apr 1 20:04:43 2012
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.3 2012/07/10 09:22:34 robert Exp $
|
||||
--- chrome/browser/ui/webui/about_ui.cc.orig Thu Jun 28 15:02:01 2012
|
||||
+++ chrome/browser/ui/webui/about_ui.cc Sat Jul 7 09:50:22 2012
|
||||
@@ -83,7 +83,7 @@
|
||||
#include "chrome/browser/chromeos/version_loader.h"
|
||||
#include "chrome/browser/oom_priority_manager.h"
|
||||
#include "content/browser/zygote_host_linux.h"
|
||||
#include "chromeos/dbus/cryptohome_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "content/public/browser/zygote_host_linux.h"
|
||||
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
|
||||
+#elif defined(OS_LINUX)
|
||||
#include "content/browser/zygote_host_linux.h"
|
||||
#include "content/public/browser/zygote_host_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -940,6 +940,7 @@ std::string AboutLinuxProxyConfig() {
|
||||
@@ -1018,6 +1018,7 @@ std::string AboutLinuxProxyConfig() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.2 2012/04/03 13:59:35 ro
|
||||
void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id,
|
||||
bool good) {
|
||||
data->append("<tr><td>");
|
||||
@@ -996,6 +997,7 @@ std::string AboutSandbox() {
|
||||
@@ -1074,6 +1075,7 @@ std::string AboutSandbox() {
|
||||
return data;
|
||||
}
|
||||
#endif
|
||||
@ -26,7 +26,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.2 2012/04/03 13:59:35 ro
|
||||
|
||||
std::string AboutVersionStaticContent(const std::string& query) {
|
||||
return ResourceBundle::GetSharedInstance().GetRawDataResource(
|
||||
@@ -1334,7 +1336,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::st
|
||||
@@ -1413,7 +1415,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::st
|
||||
response = ResourceBundle::GetSharedInstance().GetRawDataResource(
|
||||
IDR_OS_CREDITS_HTML).as_string();
|
||||
#endif
|
||||
|
29
www/chromium/patches/patch-chrome_chrome_browser_gypi
Normal file
29
www/chromium/patches/patch-chrome_chrome_browser_gypi
Normal file
@ -0,0 +1,29 @@
|
||||
$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.12 2012/07/10 09:22:34 robert Exp $
|
||||
--- chrome/chrome_browser.gypi.orig Sat Jul 7 10:28:20 2012
|
||||
+++ chrome/chrome_browser.gypi Sat Jul 7 17:35:13 2012
|
||||
@@ -1327,8 +1327,6 @@
|
||||
'browser/media/media_stream_capture_indicator.h',
|
||||
'browser/media/media_stream_devices_menu_model.cc',
|
||||
'browser/media/media_stream_devices_menu_model.h',
|
||||
- 'browser/media_gallery/media_device_notifications_linux.cc',
|
||||
- 'browser/media_gallery/media_device_notifications_linux.h',
|
||||
'browser/media_gallery/media_device_notifications_window_win.cc',
|
||||
'browser/media_gallery/media_device_notifications_window_win.h',
|
||||
'browser/media_gallery/media_gallery_database.cc',
|
||||
@@ -4541,10 +4539,15 @@
|
||||
['exclude', '^browser/usb/'],
|
||||
],
|
||||
}],
|
||||
- ['OS!="android"', {
|
||||
+ ['OS!="android" and os_bsd!=1', {
|
||||
'dependencies': [
|
||||
'../third_party/libusb/libusb.gyp:libusb',
|
||||
],
|
||||
+ },{
|
||||
+ 'link_settings': {
|
||||
+ 'libraries': [
|
||||
+ '-lusb',
|
||||
+ ]},
|
||||
}],
|
||||
['OS=="mac"', {
|
||||
'sources!': [
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_chrome_gyp,v 1.12 2012/04/03 13:59:35 robert Exp $
|
||||
--- chrome/chrome.gyp.orig Tue Mar 27 03:02:39 2012
|
||||
+++ chrome/chrome.gyp Sun Apr 1 20:04:43 2012
|
||||
@@ -141,7 +141,6 @@
|
||||
$OpenBSD: patch-chrome_chrome_gyp,v 1.13 2012/07/10 09:22:34 robert Exp $
|
||||
--- chrome/chrome.gyp.orig Wed May 23 03:50:48 2012
|
||||
+++ chrome/chrome.gyp Fri Jun 1 06:13:04 2012
|
||||
@@ -147,7 +147,6 @@
|
||||
'chrome_renderer.gypi',
|
||||
'chrome_tests.gypi',
|
||||
'common_constants.gypi',
|
||||
|
12
www/chromium/patches/patch-chrome_common_chrome_paths_cc
Normal file
12
www/chromium/patches/patch-chrome_common_chrome_paths_cc
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.8 2012/07/10 09:22:34 robert Exp $
|
||||
--- chrome/common/chrome_paths.cc.orig Thu Jun 28 15:02:23 2012
|
||||
+++ chrome/common/chrome_paths.cc Sat Jul 7 09:50:22 2012
|
||||
@@ -341,7 +341,7 @@ bool PathProvider(int key, FilePath* result) {
|
||||
if (!file_util::PathExists(cur)) // We don't want to create this
|
||||
return false;
|
||||
break;
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
case chrome::DIR_POLICY_FILES: {
|
||||
#if defined(GOOGLE_CHROME_BUILD)
|
||||
cur = FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_test_automation_proxy_launcher_cc,v 1.3 2012/02/17 10:19:51 robert Exp $
|
||||
--- chrome/test/automation/proxy_launcher.cc.orig Fri Jan 27 09:02:35 2012
|
||||
+++ chrome/test/automation/proxy_launcher.cc Thu Feb 9 09:31:06 2012
|
||||
@@ -33,6 +33,10 @@
|
||||
$OpenBSD: patch-chrome_test_automation_proxy_launcher_cc,v 1.4 2012/07/10 09:22:34 robert Exp $
|
||||
--- chrome/test/automation/proxy_launcher.cc.orig Wed May 23 03:50:30 2012
|
||||
+++ chrome/test/automation/proxy_launcher.cc Fri Jun 1 06:13:04 2012
|
||||
@@ -35,6 +35,10 @@
|
||||
#include <signal.h>
|
||||
#endif
|
||||
|
||||
|
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-content_app_content_main_cc,v 1.5 2012/04/03 13:59:35 robert Exp $
|
||||
--- content/app/content_main.cc.orig Tue Mar 27 03:01:20 2012
|
||||
+++ content/app/content_main.cc Sun Apr 1 20:04:43 2012
|
||||
@@ -68,7 +68,7 @@ extern int PpapiBrokerMain(const content::MainFunction
|
||||
extern int RendererMain(const content::MainFunctionParams&);
|
||||
extern int WorkerMain(const content::MainFunctionParams&);
|
||||
extern int UtilityMain(const content::MainFunctionParams&);
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
extern int ZygoteMain(const content::MainFunctionParams&,
|
||||
content::ZygoteForkDelegate* forkdelegate);
|
||||
#endif
|
||||
@@ -181,7 +181,7 @@ struct MainFunction {
|
||||
int (*function)(const content::MainFunctionParams&);
|
||||
};
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
// On platforms that use the zygote, we have a special subset of
|
||||
// subprocesses that are launched via the zygote. This function
|
||||
// fills in some process-launching bits around ZygoteMain().
|
||||
@@ -264,7 +264,7 @@ int RunNamedProcessTypeMain(
|
||||
return kMainFunctions[i].function(main_function_params);
|
||||
}
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
// Zygote startup is special -- see RunZygote comments above
|
||||
// for why we don't use ZygoteMain directly.
|
||||
if (process_type == switches::kZygoteProcess)
|
@ -0,0 +1,39 @@
|
||||
$OpenBSD: patch-content_app_content_main_runner_cc,v 1.1 2012/07/10 09:22:34 robert Exp $
|
||||
--- content/app/content_main_runner.cc.orig Thu Jun 28 15:01:24 2012
|
||||
+++ content/app/content_main_runner.cc Sat Jul 7 09:50:22 2012
|
||||
@@ -79,7 +79,7 @@ extern int PpapiBrokerMain(const content::MainFunction
|
||||
extern int RendererMain(const content::MainFunctionParams&);
|
||||
extern int WorkerMain(const content::MainFunctionParams&);
|
||||
extern int UtilityMain(const content::MainFunctionParams&);
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
extern int ZygoteMain(const content::MainFunctionParams&,
|
||||
content::ZygoteForkDelegate* forkdelegate);
|
||||
#endif
|
||||
@@ -192,7 +192,7 @@ struct MainFunction {
|
||||
int (*function)(const content::MainFunctionParams&);
|
||||
};
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
// On platforms that use the zygote, we have a special subset of
|
||||
// subprocesses that are launched via the zygote. This function
|
||||
// fills in some process-launching bits around ZygoteMain().
|
||||
@@ -291,7 +291,7 @@ int RunNamedProcessTypeMain(
|
||||
}
|
||||
}
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
// Zygote startup is special -- see RunZygote comments above
|
||||
// for why we don't use ZygoteMain directly.
|
||||
if (process_type == switches::kZygoteProcess)
|
||||
@@ -376,7 +376,7 @@ static void ReleaseFreeMemoryThunk() {
|
||||
base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetInstance();
|
||||
g_fds->Set(kPrimaryIPCChannel,
|
||||
kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor);
|
||||
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
|
||||
+#if defined(OS_LINUX)
|
||||
g_fds->Set(kCrashDumpSignal,
|
||||
kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor);
|
||||
#endif
|
@ -1,39 +1,30 @@
|
||||
$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.2 2012/04/03 13:59:35 robert Exp $
|
||||
--- content/browser/browser_main_loop.cc.orig Tue Mar 27 03:01:21 2012
|
||||
+++ content/browser/browser_main_loop.cc Sun Apr 1 20:04:43 2012
|
||||
@@ -56,7 +56,7 @@
|
||||
$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.3 2012/07/10 09:22:34 robert Exp $
|
||||
--- content/browser/browser_main_loop.cc.orig Sat Jul 7 15:53:15 2012
|
||||
+++ content/browser/browser_main_loop.cc Sat Jul 7 15:53:48 2012
|
||||
@@ -67,7 +67,7 @@
|
||||
#include "ui/gfx/gtk_util.h"
|
||||
#endif
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
#include <sys/stat.h>
|
||||
#include "content/browser/renderer_host/render_sandbox_host_linux.h"
|
||||
#include "content/browser/zygote_host_linux.h"
|
||||
@@ -68,7 +68,7 @@
|
||||
#include "content/browser/zygote_host_impl_linux.h"
|
||||
@@ -86,7 +86,7 @@ using content::TraceControllerImpl;
|
||||
|
||||
namespace {
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
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.
|
||||
@@ -175,7 +175,7 @@ class BrowserShutdownImpl {
|
||||
// At this point the message loop is still running yet we've shut everything
|
||||
// down. If any messages are processed we'll likely crash. Exit now.
|
||||
ExitProcess(content::RESULT_CODE_NORMAL_EXIT);
|
||||
-#elif defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
_exit(content::RESULT_CODE_NORMAL_EXIT);
|
||||
#else
|
||||
NOTIMPLEMENTED();
|
||||
@@ -252,7 +252,7 @@ void BrowserMainLoop::EarlyInitialization() {
|
||||
@@ -267,7 +267,7 @@ void BrowserMainLoop::EarlyInitialization() {
|
||||
}
|
||||
#endif // !defined(USE_OPENSSL)
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
SetupSandbox(parsed_command_line_);
|
||||
#endif
|
||||
|
||||
|
@ -1,101 +1,101 @@
|
||||
$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.4 2012/03/20 20:52:44 robert Exp $
|
||||
--- content/browser/child_process_launcher.cc.orig Tue Mar 20 12:51:45 2012
|
||||
+++ content/browser/child_process_launcher.cc Tue Mar 20 12:57:28 2012
|
||||
@@ -50,7 +50,7 @@ class ChildProcessLauncher::Context
|
||||
$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.5 2012/07/10 09:22:34 robert Exp $
|
||||
--- content/browser/child_process_launcher.cc.orig Sat Jul 7 15:53:55 2012
|
||||
+++ content/browser/child_process_launcher.cc Sat Jul 7 15:54:36 2012
|
||||
@@ -49,7 +49,7 @@ class ChildProcessLauncher::Context
|
||||
termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION),
|
||||
exit_code_(content::RESULT_CODE_NORMAL_EXIT),
|
||||
starting_(true),
|
||||
terminate_child_on_shutdown_(true)
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
starting_(true)
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
, zygote_(false)
|
||||
#endif
|
||||
{
|
||||
@@ -127,7 +127,7 @@ class ChildProcessLauncher::Context
|
||||
@@ -132,7 +132,7 @@ class ChildProcessLauncher::Context
|
||||
// to reliably detect child termination.
|
||||
file_util::ScopedFD ipcfd_closer(&ipcfd);
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
// On Linux, we need to add some extra file descriptors for crash handling.
|
||||
std::string process_type =
|
||||
cmd_line->GetSwitchValueASCII(switches::kProcessType);
|
||||
@@ -152,7 +152,7 @@ class ChildProcessLauncher::Context
|
||||
@@ -157,7 +157,7 @@ class ChildProcessLauncher::Context
|
||||
ipcfd,
|
||||
kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
if (crash_signal_fd >= 0) {
|
||||
fds_to_map.push_back(std::make_pair(
|
||||
crash_signal_fd,
|
||||
@@ -209,14 +209,14 @@ class ChildProcessLauncher::Context
|
||||
@@ -214,14 +214,14 @@ class ChildProcessLauncher::Context
|
||||
base::Bind(
|
||||
&Context::Notify,
|
||||
this_object.get(),
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
use_zygote,
|
||||
#endif
|
||||
handle));
|
||||
}
|
||||
|
||||
void Notify(
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
bool zygote,
|
||||
#endif
|
||||
base::ProcessHandle handle) {
|
||||
@@ -225,7 +225,7 @@ class ChildProcessLauncher::Context
|
||||
@@ -230,7 +230,7 @@ class ChildProcessLauncher::Context
|
||||
if (!handle)
|
||||
LOG(ERROR) << "Failed to launch child process";
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
zygote_ = zygote;
|
||||
#endif
|
||||
if (client_) {
|
||||
@@ -248,7 +248,7 @@ class ChildProcessLauncher::Context
|
||||
@@ -253,7 +253,7 @@ class ChildProcessLauncher::Context
|
||||
BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
|
||||
base::Bind(
|
||||
&Context::TerminateInternal,
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
zygote_,
|
||||
#endif
|
||||
process_.handle()));
|
||||
@@ -262,7 +262,7 @@ class ChildProcessLauncher::Context
|
||||
@@ -267,7 +267,7 @@ class ChildProcessLauncher::Context
|
||||
}
|
||||
|
||||
static void TerminateInternal(
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
bool zygote,
|
||||
#endif
|
||||
base::ProcessHandle handle) {
|
||||
@@ -272,7 +272,7 @@ class ChildProcessLauncher::Context
|
||||
@@ -277,7 +277,7 @@ class ChildProcessLauncher::Context
|
||||
process.Terminate(content::RESULT_CODE_NORMAL_EXIT);
|
||||
// On POSIX, we must additionally reap the child.
|
||||
#if defined(OS_POSIX)
|
||||
-#if !defined(OS_MACOSX)
|
||||
+#if !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
if (zygote) {
|
||||
// If the renderer was created via a zygote, we have to proxy the reaping
|
||||
// through the zygote process.
|
||||
@@ -296,7 +296,7 @@ class ChildProcessLauncher::Context
|
||||
@@ -301,7 +301,7 @@ class ChildProcessLauncher::Context
|
||||
// shutdown. Default behavior is to terminate the child.
|
||||
bool terminate_child_on_shutdown_;
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
bool zygote_;
|
||||
#endif
|
||||
};
|
||||
@@ -347,7 +347,7 @@ base::TerminationStatus ChildProcessLauncher::GetChild
|
||||
@@ -352,7 +352,7 @@ base::TerminationStatus ChildProcessLauncher::GetChild
|
||||
*exit_code = context_->exit_code_;
|
||||
return context_->termination_status_;
|
||||
}
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
if (context_->zygote_) {
|
||||
context_->termination_status_ = ZygoteHost::GetInstance()->
|
||||
context_->termination_status_ = ZygoteHostImpl::GetInstance()->
|
||||
GetTerminationStatus(handle, &context_->exit_code_);
|
||||
|
@ -1,13 +1,21 @@
|
||||
$OpenBSD: patch-content_content_browser_gypi,v 1.9 2012/04/03 13:59:35 robert Exp $
|
||||
--- content/content_browser.gypi.orig Sun Apr 1 20:05:38 2012
|
||||
+++ content/content_browser.gypi Sun Apr 1 20:05:43 2012
|
||||
@@ -668,9 +668,6 @@
|
||||
$OpenBSD: patch-content_content_browser_gypi,v 1.10 2012/07/10 09:22:34 robert Exp $
|
||||
--- content/content_browser.gypi.orig Sat Jul 7 15:54:47 2012
|
||||
+++ content/content_browser.gypi Sat Jul 7 15:54:59 2012
|
||||
@@ -160,7 +160,6 @@
|
||||
'public/browser/web_ui_message_handler.h',
|
||||
'public/browser/worker_service.h',
|
||||
'public/browser/worker_service_observer.h',
|
||||
- 'public/browser/zygote_host_linux.h',
|
||||
'browser/accessibility/browser_accessibility.cc',
|
||||
'browser/accessibility/browser_accessibility.h',
|
||||
'browser/accessibility/browser_accessibility_cocoa.h',
|
||||
@@ -713,9 +712,6 @@
|
||||
'browser/worker_host/worker_process_host.h',
|
||||
'browser/worker_host/worker_service_impl.cc',
|
||||
'browser/worker_host/worker_service_impl.h',
|
||||
- 'browser/zygote_host_linux.cc',
|
||||
- 'browser/zygote_host_linux.h',
|
||||
- 'browser/zygote_host_impl_linux.cc',
|
||||
- 'browser/zygote_host_impl_linux.h',
|
||||
- 'browser/zygote_main_linux.cc',
|
||||
'<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources.h',
|
||||
'<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources_map.cc',
|
||||
'<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources_map.h',
|
||||
# TODO: These should be moved to test_support (see below), but
|
||||
# are currently used by production code in automation_provider.cc.
|
||||
'test/net/url_request_failed_job.cc',
|
||||
|
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-content_content_renderer_gypi,v 1.1 2012/04/03 13:59:35 robert Exp $
|
||||
--- content/content_renderer.gypi.orig Mon Apr 2 09:17:47 2012
|
||||
+++ content/content_renderer.gypi Mon Apr 2 09:27:48 2012
|
||||
@@ -284,11 +284,6 @@
|
||||
'renderer/media/webrtc_audio_device_impl.cc',
|
||||
'renderer/media/webrtc_audio_device_impl.h',
|
||||
],
|
||||
- }, {
|
||||
- 'sources': [
|
||||
- 'renderer/media/media_stream_dependency_factory_stub.cc',
|
||||
- 'renderer/media/media_stream_impl_stub.cc',
|
||||
- ],
|
||||
}],
|
||||
['java_bridge==1', {
|
||||
'defines': [
|
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-content_public_browser_content_browser_client_h,v 1.1 2012/07/10 09:22:34 robert Exp $
|
||||
--- content/public/browser/content_browser_client.h.orig Fri Jun 1 16:11:06 2012
|
||||
+++ content/public/browser/content_browser_client.h Fri Jun 1 16:10:56 2012
|
||||
@@ -409,7 +409,7 @@ class ContentBrowserClient {
|
||||
virtual bool AllowSocketAPI(BrowserContext* browser_context,
|
||||
const GURL& url) = 0;
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
// Can return an optional fd for crash handling, otherwise returns -1. The
|
||||
// passed |command_line| will be used to start the process in question.
|
||||
virtual int GetCrashSignalFD(const CommandLine& command_line) = 0;
|
@ -1,19 +0,0 @@
|
||||
$OpenBSD: patch-content_renderer_render_view_impl_cc,v 1.2 2012/04/15 10:40:44 robert Exp $
|
||||
--- content/renderer/render_view_impl.cc.orig Mon Apr 9 21:01:24 2012
|
||||
+++ content/renderer/render_view_impl.cc Fri Apr 13 18:46:36 2012
|
||||
@@ -3096,6 +3096,7 @@ void RenderViewImpl::EnsureMediaStreamImpl() {
|
||||
p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
|
||||
#endif
|
||||
|
||||
+#if defined(ENABLE_WEBRTC)
|
||||
if (!media_stream_dispatcher_)
|
||||
media_stream_dispatcher_ = new MediaStreamDispatcher(this);
|
||||
|
||||
@@ -3107,6 +3108,7 @@ void RenderViewImpl::EnsureMediaStreamImpl() {
|
||||
RenderThreadImpl::current()->video_capture_impl_manager(),
|
||||
factory);
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
void RenderViewImpl::didChangeContentsSize(WebFrame* frame,
|
@ -0,0 +1,13 @@
|
||||
$OpenBSD: patch-content_renderer_renderer_main_platform_delegate_linux_cc,v 1.4 2012/07/10 09:22:34 robert Exp $
|
||||
--- content/renderer/renderer_main_platform_delegate_linux.cc.orig Sat Jul 7 17:27:38 2012
|
||||
+++ content/renderer/renderer_main_platform_delegate_linux.cc Sat Jul 7 17:27:45 2012
|
||||
@@ -41,8 +41,8 @@ bool RendererMainPlatformDelegate::EnableSandbox() {
|
||||
// a file descriptor for "/proc".
|
||||
if (SeccompSandboxEnabled() && SupportsSeccompSandbox(-1))
|
||||
StartSeccompSandbox();
|
||||
-#endif
|
||||
content::InitializeSandbox();
|
||||
+#endif
|
||||
return true;
|
||||
}
|
||||
|
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-content_shell_shell_content_browser_client_cc,v 1.3 2012/04/03 13:59:35 robert Exp $
|
||||
--- content/shell/shell_content_browser_client.cc.orig Tue Mar 27 03:01:22 2012
|
||||
+++ content/shell/shell_content_browser_client.cc Sun Apr 1 20:04:44 2012
|
||||
@@ -316,7 +316,7 @@ bool ShellContentBrowserClient::AllowSocketAPI(const G
|
||||
$OpenBSD: patch-content_shell_shell_content_browser_client_cc,v 1.4 2012/07/10 09:22:34 robert Exp $
|
||||
--- content/shell/shell_content_browser_client.cc.orig Thu Jun 28 15:01:27 2012
|
||||
+++ content/shell/shell_content_browser_client.cc Sat Jul 7 09:50:26 2012
|
||||
@@ -334,7 +334,7 @@ bool ShellContentBrowserClient::AllowSocketAPI(Browser
|
||||
return false;
|
||||
}
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
int ShellContentBrowserClient::GetCrashSignalFD(
|
||||
const CommandLine& command_line) {
|
||||
return -1;
|
||||
|
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-content_shell_shell_content_browser_client_h,v 1.1 2012/07/10 09:22:34 robert Exp $
|
||||
--- content/shell/shell_content_browser_client.h.orig Thu Jun 28 15:01:27 2012
|
||||
+++ content/shell/shell_content_browser_client.h Sat Jul 7 09:50:27 2012
|
||||
@@ -170,7 +170,7 @@ class ShellContentBrowserClient : public ContentBrowse
|
||||
virtual bool AllowSocketAPI(BrowserContext* browser_context,
|
||||
const GURL& url) OVERRIDE;
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
virtual int GetCrashSignalFD(const CommandLine& command_line) OVERRIDE;
|
||||
#endif
|
||||
|
@ -1,67 +1,34 @@
|
||||
$OpenBSD: patch-media_audio_openbsd_audio_manager_openbsd_cc,v 1.9 2012/04/03 13:59:35 robert Exp $
|
||||
--- media/audio/openbsd/audio_manager_openbsd.cc.orig Sun Apr 1 22:50:49 2012
|
||||
+++ media/audio/openbsd/audio_manager_openbsd.cc Sun Apr 1 22:56:04 2012
|
||||
@@ -51,20 +51,17 @@ AudioOutputStream* AudioManagerOpenBSD::MakeAudioOutpu
|
||||
return FakeAudioOutputStream::MakeFakeStream(params);
|
||||
}
|
||||
$OpenBSD: patch-media_audio_openbsd_audio_manager_openbsd_cc,v 1.10 2012/07/10 09:22:34 robert Exp $
|
||||
--- media/audio/openbsd/audio_manager_openbsd.cc.orig Thu Jun 28 15:01:10 2012
|
||||
+++ media/audio/openbsd/audio_manager_openbsd.cc Sat Jul 7 09:50:30 2012
|
||||
@@ -65,26 +65,26 @@ void AudioManagerOpenBSD::UnMuteAll() {
|
||||
|
||||
- if (!initialized()) {
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
// Don't allow opening more than |kMaxOutputStreams| streams.
|
||||
- if (active_streams_.size() >= kMaxOutputStreams) {
|
||||
+ if (active_output_stream_count_ >= kMaxOutputStreams) {
|
||||
return NULL;
|
||||
}
|
||||
AudioOutputStream* AudioManagerOpenBSD::MakeLinearOutputStream(
|
||||
const AudioParameters& params) {
|
||||
- DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format);
|
||||
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
|
||||
return MakeOutputStream(params);
|
||||
}
|
||||
|
||||
- AudioOutputStream* stream;
|
||||
#if defined(USE_PULSEAUDIO)
|
||||
+ AudioOutputStream* stream;
|
||||
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePulseAudio)) {
|
||||
stream = new PulseAudioOutputStream(params, this);
|
||||
- active_streams_.insert(stream);
|
||||
+ ++active_output_stream_count_;
|
||||
+ DCHECK(stream);
|
||||
return stream;
|
||||
}
|
||||
#endif
|
||||
@@ -79,23 +76,12 @@ AudioInputStream* AudioManagerOpenBSD::MakeAudioInputS
|
||||
AudioOutputStream* AudioManagerOpenBSD::MakeLowLatencyOutputStream(
|
||||
const AudioParameters& params) {
|
||||
- DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format);
|
||||
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
|
||||
return MakeOutputStream(params);
|
||||
}
|
||||
|
||||
AudioInputStream* AudioManagerOpenBSD::MakeLinearInputStream(
|
||||
const AudioParameters& params, const std::string& device_id) {
|
||||
- DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format);
|
||||
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
|
||||
NOTIMPLEMENTED();
|
||||
return NULL;
|
||||
}
|
||||
|
||||
-AudioManagerOpenBSD::AudioManagerOpenBSD() {
|
||||
-}
|
||||
+AudioManagerOpenBSD::AudioManagerOpenBSD() : active_output_stream_count_(0U) {}
|
||||
|
||||
AudioManagerOpenBSD::~AudioManagerOpenBSD() {
|
||||
- // Make sure we stop the thread first. If we allow the default destructor to
|
||||
- // destroy the members, we may destroy audio streams before stopping the
|
||||
- // thread, resulting an unexpected behavior.
|
||||
- // This way we make sure activities of the audio streams are all stopped
|
||||
- // before we destroy them.
|
||||
- audio_thread_.Stop();
|
||||
-
|
||||
- // Free output dispatchers, closing all remaining open streams.
|
||||
- output_dispatchers_.clear();
|
||||
-
|
||||
- // Delete all the streams. Have to do it manually, we don't have ScopedSet<>,
|
||||
- // and we are not using ScopedVector<> because search there is slow.
|
||||
- STLDeleteElements(&active_streams_);
|
||||
+ Shutdown();
|
||||
+ // All the streams should have been deleted on the audio thread via Shutdown.
|
||||
+ CHECK_EQ(active_output_stream_count_, 0U);
|
||||
AudioInputStream* AudioManagerOpenBSD::MakeLowLatencyInputStream(
|
||||
const AudioParameters& params, const std::string& device_id) {
|
||||
- DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format);
|
||||
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
|
||||
NOTIMPLEMENTED();
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void AudioManagerOpenBSD::Init() {
|
||||
@@ -112,8 +98,9 @@ void AudioManagerOpenBSD::UnMuteAll() {
|
||||
|
||||
void AudioManagerOpenBSD::ReleaseOutputStream(AudioOutputStream* stream) {
|
||||
if (stream) {
|
||||
- active_streams_.erase(stream);
|
||||
delete stream;
|
||||
+ --active_output_stream_count_;
|
||||
+ DCHECK_GE(active_output_stream_count_, 0U);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-media_audio_openbsd_audio_manager_openbsd_h,v 1.9 2012/04/03 13:59:35 robert Exp $
|
||||
--- media/audio/openbsd/audio_manager_openbsd.h.orig Sun Apr 1 22:57:39 2012
|
||||
+++ media/audio/openbsd/audio_manager_openbsd.h Sun Apr 1 22:57:49 2012
|
||||
@@ -34,7 +34,7 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioM
|
||||
virtual ~AudioManagerOpenBSD();
|
||||
|
||||
private:
|
||||
- std::set<AudioOutputStream*> active_streams_;
|
||||
+ size_t active_output_stream_count_;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD);
|
||||
};
|
11
www/chromium/patches/patch-media_media_gyp
Normal file
11
www/chromium/patches/patch-media_media_gyp
Normal file
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-media_media_gyp,v 1.12 2012/07/10 09:22:34 robert Exp $
|
||||
--- media/media.gyp.orig Thu Jun 28 15:01:11 2012
|
||||
+++ media/media.gyp Sat Jul 7 09:50:30 2012
|
||||
@@ -347,6 +347,7 @@
|
||||
}],
|
||||
['OS=="openbsd"', {
|
||||
'sources/': [ ['exclude', '/alsa_' ],
|
||||
+ ['exclude', '/cras_' ],
|
||||
['exclude', '/audio_manager_linux' ] ],
|
||||
'link_settings': {
|
||||
'libraries': [
|
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-net_base_listen_socket_unittest_h,v 1.1 2011/02/08 09:43:02 espie Exp $
|
||||
--- net/base/listen_socket_unittest.h.orig Wed Feb 2 10:54:58 2011
|
||||
+++ net/base/listen_socket_unittest.h Wed Feb 2 10:55:08 2011
|
||||
@@ -11,6 +11,7 @@
|
||||
#if defined(OS_WIN)
|
||||
#include <winsock2.h>
|
||||
#elif defined(OS_POSIX)
|
||||
+#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <errno.h>
|
||||
#include <arpa/inet.h>
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-net_base_network_change_notifier_cc,v 1.4 2011/12/14 16:58:19 robert Exp $
|
||||
--- net/base/network_change_notifier.cc.orig Wed Dec 7 09:01:30 2011
|
||||
+++ net/base/network_change_notifier.cc Tue Dec 13 21:23:12 2011
|
||||
@@ -64,7 +64,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create()
|
||||
$OpenBSD: patch-net_base_network_change_notifier_cc,v 1.5 2012/07/10 09:22:34 robert Exp $
|
||||
--- net/base/network_change_notifier.cc.orig Thu Jun 28 15:01:30 2012
|
||||
+++ net/base/network_change_notifier.cc Sat Jul 7 09:50:30 2012
|
||||
@@ -69,7 +69,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create()
|
||||
#elif defined(OS_MACOSX)
|
||||
return new NetworkChangeNotifierMac();
|
||||
#else
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-printing_printing_gyp,v 1.10 2012/02/17 10:19:51 robert Exp $
|
||||
--- printing/printing.gyp.orig Fri Jan 27 09:01:11 2012
|
||||
+++ printing/printing.gyp Thu Feb 9 09:31:06 2012
|
||||
@@ -259,6 +259,11 @@
|
||||
$OpenBSD: patch-printing_printing_gyp,v 1.11 2012/07/10 09:22:34 robert Exp $
|
||||
--- printing/printing.gyp.orig Thu Jun 28 15:01:16 2012
|
||||
+++ printing/printing.gyp Sat Jul 7 09:50:31 2012
|
||||
@@ -261,6 +261,11 @@
|
||||
'<!@(python cups_config_helper.py --cflags)',
|
||||
],
|
||||
}],
|
||||
|
56
www/chromium/patches/patch-skia_skia_gyp
Normal file
56
www/chromium/patches/patch-skia_skia_gyp
Normal file
@ -0,0 +1,56 @@
|
||||
$OpenBSD: patch-skia_skia_gyp,v 1.3 2012/07/10 09:22:34 robert Exp $
|
||||
--- skia/skia.gyp.orig Thu Jun 28 15:01:31 2012
|
||||
+++ skia/skia.gyp Sat Jul 7 09:50:31 2012
|
||||
@@ -820,7 +820,7 @@
|
||||
'__ARM_HAVE_NEON',
|
||||
],
|
||||
}],
|
||||
- [ 'target_arch == "arm"', {
|
||||
+ [ 'target_arch == "arm" or disable_sse2 == 1', {
|
||||
'sources!': [
|
||||
'../third_party/skia/src/opts/opts_check_SSE2.cpp'
|
||||
],
|
||||
@@ -1091,7 +1091,7 @@
|
||||
'SK_BUILD_FOR_ANDROID_NDK',
|
||||
],
|
||||
}],
|
||||
- [ 'target_arch != "arm"', {
|
||||
+ [ 'target_arch != "arm" and disable_sse2 != 1', {
|
||||
'sources': [
|
||||
'../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp',
|
||||
'../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp',
|
||||
@@ -1106,8 +1106,14 @@
|
||||
],
|
||||
}],
|
||||
],
|
||||
- },
|
||||
- { # arm
|
||||
+ },{ #disable_sse2 == 1
|
||||
+ 'sources': [
|
||||
+ '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
|
||||
+ '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
|
||||
+ '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
|
||||
+ ],
|
||||
+ }],
|
||||
+ [ 'target_arch == "arm"', {
|
||||
'conditions': [
|
||||
[ 'armv7 == 1', {
|
||||
'defines': [
|
||||
@@ -1182,7 +1188,7 @@
|
||||
'../third_party/skia/src/core',
|
||||
],
|
||||
'conditions': [
|
||||
- [ 'OS in ["linux", "freebsd", "openbsd", "solaris"]', {
|
||||
+ [ 'OS in ["linux", "freebsd", "solaris"]', {
|
||||
'cflags': [
|
||||
'-mssse3',
|
||||
],
|
||||
@@ -1202,7 +1208,7 @@
|
||||
],
|
||||
},
|
||||
}],
|
||||
- [ 'target_arch != "arm"', {
|
||||
+ [ 'target_arch != "arm" and OS != "openbsd"', {
|
||||
'sources': [
|
||||
'../third_party/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp',
|
||||
],
|
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-third_party_WebKit_Source_JavaScriptCore_wtf_NumberOfCores_cpp,v 1.1 2012/04/03 13:59:35 robert Exp $
|
||||
--- third_party/WebKit/Source/JavaScriptCore/wtf/NumberOfCores.cpp.orig Sun Apr 1 23:35:57 2012
|
||||
+++ third_party/WebKit/Source/JavaScriptCore/wtf/NumberOfCores.cpp Sun Apr 1 23:36:05 2012
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "NumberOfCores.h"
|
||||
|
||||
#if OS(DARWIN) || OS(OPENBSD) || OS(NETBSD) || OS(FREEBSD)
|
||||
+#include <sys/param.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/types.h>
|
||||
#elif OS(LINUX) || OS(AIX) || OS(SOLARIS)
|
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-third_party_WebKit_Source_WTF_wtf_NumberOfCores_cpp,v 1.1 2012/07/10 09:22:34 robert Exp $
|
||||
--- third_party/WebKit/Source/WTF/wtf/NumberOfCores.cpp.orig Thu Jun 28 15:06:16 2012
|
||||
+++ third_party/WebKit/Source/WTF/wtf/NumberOfCores.cpp Sat Jul 7 09:50:31 2012
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <sys/param.h>
|
||||
// sys/types.h must come before sys/sysctl.h because the latter uses
|
||||
// data types defined in the former. See sysctl(3) and style(9).
|
||||
+#include <sys/param.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/sysctl.h>
|
||||
#elif OS(LINUX) || OS(AIX) || OS(SOLARIS)
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-third_party_WebKit_Source_WebCore_bindings_v8_custom_V8InspectorFrontendHostCustom_cpp,v 1.4 2011/09/19 08:55:26 robert Exp $
|
||||
--- third_party/WebKit/Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp.orig Tue Aug 23 10:34:21 2011
|
||||
+++ third_party/WebKit/Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp Wed Aug 24 10:54:23 2011
|
||||
@@ -60,6 +60,8 @@ v8::Handle<v8::Value> V8InspectorFrontendHost::platfor
|
||||
$OpenBSD: patch-third_party_WebKit_Source_WebCore_bindings_v8_custom_V8InspectorFrontendHostCustom_cpp,v 1.5 2012/07/10 09:22:34 robert Exp $
|
||||
--- third_party/WebKit/Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp.orig Thu Jun 28 15:05:33 2012
|
||||
+++ third_party/WebKit/Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp Sat Jul 7 09:50:33 2012
|
||||
@@ -58,6 +58,8 @@ v8::Handle<v8::Value> V8InspectorFrontendHost::platfor
|
||||
return v8String("solaris");
|
||||
#elif defined(OS_WIN)
|
||||
return v8String("windows");
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-third_party_ffmpeg_libavcodec_pthread_c,v 1.1 2012/07/10 09:22:34 robert Exp $
|
||||
--- third_party/ffmpeg/libavcodec/pthread.c.orig Fri Jun 1 11:50:08 2012
|
||||
+++ third_party/ffmpeg/libavcodec/pthread.c Fri Jun 1 12:04:36 2012
|
||||
@@ -39,9 +39,7 @@
|
||||
#include <windows.h>
|
||||
#endif
|
||||
#if HAVE_SYSCTL
|
||||
-#if HAVE_SYS_PARAM_H
|
||||
-#include <sys/param.h>
|
||||
-#endif
|
||||
+#define _BSD_SOURCE
|
||||
#include <sys/types.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/sysctl.h>
|
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-third_party_webrtc_build_common_gypi,v 1.3 2012/07/10 09:22:34 robert Exp $
|
||||
--- third_party/webrtc/build/common.gypi.orig Sun Jul 8 20:31:50 2012
|
||||
+++ third_party/webrtc/build/common.gypi Sun Jul 8 20:32:02 2012
|
||||
@@ -98,7 +98,7 @@
|
||||
'defines': [
|
||||
# TODO(leozwang): Most of team use git-svn, need to add
|
||||
# git-svn support as well.
|
||||
- 'WEBRTC_SVNREVISION="<!(svnversion -n)"',
|
||||
+ 'WEBRTC_SVNREVISION="<!(svnversion -n 2>/dev/null || echo -n 0)"',
|
||||
],
|
||||
'conditions': [
|
||||
['build_with_chromium==1', {
|
@ -0,0 +1,9 @@
|
||||
$OpenBSD: patch-tools_clang_scripts_plugin_flags_sh,v 1.1 2012/07/10 09:22:34 robert Exp $
|
||||
--- tools/clang/scripts/plugin_flags.sh.orig Sat Jul 7 09:51:07 2012
|
||||
+++ tools/clang/scripts/plugin_flags.sh Sat Jul 7 09:51:22 2012
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#!/usr/bin/env bash
|
||||
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.9 2012/04/03 13:59:35 robert Exp $
|
||||
--- tools/gyp/pylib/gyp/generator/make.py.orig Tue Mar 27 03:04:33 2012
|
||||
+++ tools/gyp/pylib/gyp/generator/make.py Sun Apr 1 20:04:45 2012
|
||||
@@ -269,13 +269,13 @@ ARFLAGS.target ?= %(ARFLAGS.target)s
|
||||
$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.10 2012/07/10 09:22:34 robert Exp $
|
||||
--- tools/gyp/pylib/gyp/generator/make.py.orig Wed May 23 03:52:36 2012
|
||||
+++ tools/gyp/pylib/gyp/generator/make.py Fri Jun 1 06:13:04 2012
|
||||
@@ -266,13 +266,13 @@ ARFLAGS.target ?= %(ARFLAGS.target)s
|
||||
# in gyp's make.py where ARFLAGS.host etc. is computed.
|
||||
# TODO(evan): move all cross-compilation logic to gyp-time so we don't need
|
||||
# to replicate this environment fallback in make as well.
|
||||
|
@ -1,15 +1,21 @@
|
||||
$OpenBSD: patch-ui_base_l10n_l10n_util_cc,v 1.4 2012/03/23 13:28:25 ajacoutot Exp $
|
||||
|
||||
error: #error "Only <glib.h> can be included directly."
|
||||
|
||||
--- ui/base/l10n/l10n_util.cc.orig Tue Mar 20 12:03:16 2012
|
||||
+++ ui/base/l10n/l10n_util.cc Tue Mar 20 12:03:31 2012
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
||||
#if defined(USE_X11)
|
||||
-#include <glib/gutils.h>
|
||||
+#include <glib.h>
|
||||
$OpenBSD: patch-ui_base_l10n_l10n_util_cc,v 1.5 2012/07/10 09:22:34 robert Exp $
|
||||
--- ui/base/l10n/l10n_util.cc.orig Sat Jul 7 12:46:25 2012
|
||||
+++ ui/base/l10n/l10n_util.cc Sat Jul 7 13:01:04 2012
|
||||
@@ -33,7 +33,7 @@
|
||||
#include "base/android/locale_utils.h"
|
||||
#endif
|
||||
|
||||
#include <algorithm>
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
#include <glib.h>
|
||||
#endif
|
||||
|
||||
@@ -417,7 +417,7 @@ std::string GetApplicationLocale(const std::string& pr
|
||||
if (!pref_locale.empty())
|
||||
candidates.push_back(pref_locale);
|
||||
|
||||
-#elif defined(OS_LINUX)
|
||||
+#elif defined(OS_LINUX) || defined(OS_BSD)
|
||||
// If we're on a different Linux system, we have glib.
|
||||
|
||||
// GLib implements correct environment variable parsing with
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-v8_src_platform_h,v 1.5 2011/12/14 16:58:19 robert Exp $
|
||||
--- v8/src/platform.h.orig Wed Dec 7 09:04:42 2011
|
||||
+++ v8/src/platform.h Tue Dec 13 21:23:12 2011
|
||||
@@ -88,7 +88,11 @@ namespace internal {
|
||||
$OpenBSD: patch-v8_src_platform_h,v 1.6 2012/07/10 09:22:34 robert Exp $
|
||||
--- v8/src/platform.h.orig Wed May 23 03:52:53 2012
|
||||
+++ v8/src/platform.h Fri Jun 1 06:13:04 2012
|
||||
@@ -89,7 +89,11 @@ namespace internal {
|
||||
|
||||
// Use AtomicWord for a machine-sized pointer. It is assumed that
|
||||
// reads and writes of naturally aligned values of this type are atomic.
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-webkit_glue_webcursor_gtk_cc,v 1.1 2012/04/03 18:53:28 robert Exp $
|
||||
--- webkit/glue/webcursor_gtk.cc.orig Tue Apr 3 09:12:54 2012
|
||||
+++ webkit/glue/webcursor_gtk.cc Tue Apr 3 09:13:22 2012
|
||||
@@ -182,7 +182,7 @@ GdkCursor* WebCursor::GetCustomCursor() {
|
||||
hotspot_.x(),
|
||||
hotspot_.y());
|
||||
|
||||
- gdk_pixbuf_unref(pixbuf);
|
||||
+ g_object_unref(pixbuf);
|
||||
|
||||
if (unref_)
|
||||
gdk_cursor_unref(unref_);
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.9 2012/04/03 13:59:35 robert Exp $
|
||||
--- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig Tue Mar 27 03:01:11 2012
|
||||
+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc Sun Apr 1 20:04:46 2012
|
||||
@@ -1417,7 +1417,7 @@ bool PluginInstance::PrintPDFOutput(PP_Resource print_
|
||||
$OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.10 2012/07/10 09:22:34 robert Exp $
|
||||
--- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig Thu Jun 28 15:01:13 2012
|
||||
+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc Sat Jul 7 09:50:39 2012
|
||||
@@ -1419,7 +1419,7 @@ bool PluginInstance::PrintPDFOutput(PP_Resource print_
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
bool ret = false;
|
||||
|
@ -1,8 +1,9 @@
|
||||
@comment $OpenBSD: PLIST,v 1.17 2012/06/15 08:32:18 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.18 2012/07/10 09:22:34 robert Exp $
|
||||
bin/chrome
|
||||
chrome/
|
||||
@bin chrome/chrome
|
||||
chrome/chrome.pak
|
||||
chrome/content_resources.pak
|
||||
chrome/libffmpegsumo.so
|
||||
chrome/locales/
|
||||
chrome/locales/am.pak
|
||||
@ -106,7 +107,12 @@ chrome/resources/inspector/Images/glossyHeaderSelectedPressed.png
|
||||
chrome/resources/inspector/Images/goArrow.png
|
||||
chrome/resources/inspector/Images/graphLabelCalloutLeft.png
|
||||
chrome/resources/inspector/Images/graphLabelCalloutRight.png
|
||||
chrome/resources/inspector/Images/indexedDB.png
|
||||
chrome/resources/inspector/Images/indexedDBIndex.png
|
||||
chrome/resources/inspector/Images/indexedDBObjectStore.png
|
||||
chrome/resources/inspector/Images/localStorage.png
|
||||
chrome/resources/inspector/Images/navigatorPinButton.png
|
||||
chrome/resources/inspector/Images/navigatorShowHideButton.png
|
||||
chrome/resources/inspector/Images/paneAddButtons.png
|
||||
chrome/resources/inspector/Images/paneBottomGrow.png
|
||||
chrome/resources/inspector/Images/paneBottomGrowActive.png
|
||||
@ -132,6 +138,8 @@ chrome/resources/inspector/Images/resourcePlainIconSmall.png
|
||||
chrome/resources/inspector/Images/resourcesSizeGraphIcon.png
|
||||
chrome/resources/inspector/Images/resourcesTimeGraphIcon.png
|
||||
chrome/resources/inspector/Images/scriptsSilhouette.png
|
||||
chrome/resources/inspector/Images/searchNext.png
|
||||
chrome/resources/inspector/Images/searchPrev.png
|
||||
chrome/resources/inspector/Images/searchSmallBlue.png
|
||||
chrome/resources/inspector/Images/searchSmallBrightBlue.png
|
||||
chrome/resources/inspector/Images/searchSmallGray.png
|
||||
@ -225,7 +233,9 @@ chrome/resources/inspector/devtools_extension_api.js
|
||||
chrome/resources/inspector/elementsPanel.css
|
||||
chrome/resources/inspector/filteredItemSelectionDialog.css
|
||||
chrome/resources/inspector/heapProfiler.css
|
||||
chrome/resources/inspector/indexedDBViews.css
|
||||
chrome/resources/inspector/inspectorCommon.css
|
||||
chrome/resources/inspector/navigatorView.css
|
||||
chrome/resources/inspector/networkLogView.css
|
||||
chrome/resources/inspector/networkPanel.css
|
||||
chrome/resources/inspector/panelEnablerView.css
|
||||
@ -238,6 +248,8 @@ chrome/resources/inspector/tabbedPane.css
|
||||
chrome/resources/inspector/textPrompt.css
|
||||
chrome/resources/inspector/textViewer.css
|
||||
chrome/resources/inspector/timelinePanel.css
|
||||
chrome/theme_resources_standard.pak
|
||||
chrome/ui_resources_standard.pak
|
||||
@man man/man1/chrome.1
|
||||
share/applications/chrome.desktop
|
||||
share/icons/hicolor/128x128/apps/chrome.png
|
||||
|
Loading…
Reference in New Issue
Block a user