mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

Update to 27.0.1453.81

Browse Source 
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
This commit is contained in:
Rene Ladan 2013-05-14 21:10:15 +00:00
parent 27cdbbe186
commit 217593e8de
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=318200
34 changed files with 343 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
www/chromium/Makefile
View File

@ -3,8 +3,7 @@
PORTNAME= chromium
DISTVERSIONPREFIX= courgette-redacted-
DISTVERSION= 25.0.1364.172
PORTREVISION= 1
DISTVERSION= 27.0.1453.81
CATEGORIES= www
MASTER_SITES= http://download.goodking.org/downloads/ \
ftp://rene-ladan.nl/pub/distfiles/ \
@ -34,8 +33,8 @@ LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \
gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
cups:${PORTSDIR}/print/cups-client \
event-1:${PORTSDIR}/devel/libevent \
vpx:${PORTSDIR}/multimedia/libvpx \
gcrypt:${PORTSDIR}/security/libgcrypt \
speechd:${PORTSDIR}/accessibility/speech-dispatcher \
pci:${PORTSDIR}/devel/libpci
RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \
@ -63,10 +62,12 @@ GYP_DEFINES+= use_cups=1 \
use_system_ffmpeg=0 \
use_system_libusb=1 \
use_system_libevent=1 \
use_system_libvpx=1 \
use_system_libvpx=0 \
linux_breakpad=0 \
linux_strip_binary=1 \
linux_use_tcmalloc=0 \
linux_use_heapchecker=0 \
linux_link_libspeechd=1 \
clang_use_chrome_plugins=0 \
disable_nacl=1 \
enable_webrtc=0 \
@ -149,7 +150,7 @@ pre-everything::
.if ${PORT_OPTIONS:MDEBUG}
@${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)."
.else
@${ECHO_MSG} "and a fair amount of free diskspace (~ 2.2GB)."
@${ECHO_MSG} "and a fair amount of free diskspace (~ 2.4GB)."
.endif
@${ECHO_MSG}
@ -164,6 +165,17 @@ post-patch:
${WRKSRC}/v8/build/common.gypi
@${REINPLACE_CMD} -e "s|linux|freebsd|" \
${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py
@${REINPLACE_CMD} -e "s|is_linux|(is_linux or is_bsd)|" \
${WRKSRC}/chrome/browser/browser_resources.grd \
${WRKSRC}/chrome/app/theme/theme_resources.grd \
${WRKSRC}/chrome/browser/resources/task_manager/defines.js \
${WRKSRC}/tools/grit/grit/xtb_reader_unittest.py \
${WRKSRC}/ui/base/strings/app_locale_settings.grd \
${WRKSRC}/ui/base/strings/app_locale_settings_bn.xtb \
${WRKSRC}/ui/base/strings/app_locale_settings_ja.xtb \
${WRKSRC}/ui/base/strings/app_locale_settings_ko.xtb \
${WRKSRC}/ui/base/strings/app_locale_settings_ml.xtb \
${WRKSRC}/ui/base/strings/app_locale_settings_th.xtb
do-configure:
cd ${WRKSRC} && \
@ -187,9 +199,6 @@ do-install:
${LN} -sf ${DATADIR}/chrome ${PREFIX}/bin
post-install:
@${ECHO_MSG} "========================================================"
@${ECHO_MSG} "For best performance please enable shared memory support"
@${ECHO_MSG} "in chromium by setting kern.ipc.shm_allow_removed=1"
@${ECHO_MSG} "========================================================"
${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>

4
www/chromium/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (chromium-courgette-redacted-25.0.1364.172.tar.xz) = 523b7b3657e9dd2b85fff696a7d3fbdf4d8dc8b48e700f00bee1be7597719401
SIZE (chromium-courgette-redacted-25.0.1364.172.tar.xz) = 149946296
SHA256 (chromium-courgette-redacted-27.0.1453.81.tar.xz) = cd34825817dc87f83c22d68b162b92faf94a96ca473019c2f2469eb67537fca3
SIZE (chromium-courgette-redacted-27.0.1453.81.tar.xz) = 153077772

10
www/chromium/files/extra-patch-gcc
View File

@ -18,16 +18,6 @@
#include "talk/base/basictypes.h"
#include "talk/base/criticalsection.h"
#include "talk/base/logging.h"
--- base/debug/trace_event.h.orig 2011-04-01 22:22:50.326752296 +0300
+++ base/debug/trace_event.h 2011-04-01 22:23:12.004715315 +0300
@@ -29,6 +29,7 @@
#include "base/debug/trace_event_win.h"
#else // defined(OS_WIN)
+#include <stdio.h>
#include <string>
#include "base/scoped_ptr.h"
--- media/filters/file_data_source.h.orig 2011-09-14 10:01:06.000000000 +0200
+++ media/filters/file_data_source.h 2011-09-26 19:08:17.000000000 +0200
@@ -5,6 +5,7 @@

11
www/chromium/files/patch-base__process_util_freebsd.cc Normal file
View File

@ -0,0 +1,11 @@
--- base/process_util_freebsd.cc.orig 2013-03-06 22:18:54.000000000 +0200
+++ base/process_util_freebsd.cc 2013-03-06 22:19:07.000000000 +0200
@@ -19,7 +19,7 @@
#include "base/file_util.h"
#include "base/logging.h"
-#include "base/string_tokenizer.h"
+#include "base/strings/string_tokenizer.h"
#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"

18
www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
View File

@ -1,16 +1,22 @@
--- chrome/browser/chrome_browser_main_posix.cc.orig 2012-05-30 10:01:59.000000000 +0300
+++ chrome/browser/chrome_browser_main_posix.cc 2012-06-05 21:35:31.000000000 +0300
@@ -238,7 +238,13 @@
--- chrome/browser/chrome_browser_main_posix.cc.orig 2013-02-28 10:15:23.000000000 +0200
+++ chrome/browser/chrome_browser_main_posix.cc 2013-03-06 20:31:24.000000000 +0200
@@ -310,6 +310,11 @@
g_pipe_pid = getpid();
g_shutdown_pipe_read_fd = pipefd[0];
g_shutdown_pipe_write_fd = pipefd[1];
#if !defined(ADDRESS_SANITIZER)
+#if defined(OS_FREEBSD)
+ // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD,
+ // we request the default pthread stack size by specifying 0 here.
+ const size_t kShutdownDetectorThreadStackSize = 0;
+#else
#if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN;
+#endif
#else
// ASan instrumentation bloats the stack, so we need to increase the stack
@@ -318,6 +323,7 @@
// size to avoid hitting the guard page.
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
#endif
+#endif // OS_FREEBSD
// 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(

17
www/chromium/files/patch-chrome__browser__component_updater__component_updater_configurator.cc
View File

@ -1,17 +0,0 @@
--- chrome/browser/component_updater/component_updater_configurator.cc.orig 2011-11-22 01:09:14.000000000 +0200
+++ chrome/browser/component_updater/component_updater_configurator.cc 2011-11-22 01:17:26.000000000 +0200
@@ -63,6 +63,14 @@
#else
"os=linux&arch=unknown&prod=chrome&prodversion=";
#endif
+#elif defined(OS_FREEBSD)
+ #if defined(__amd64__)
+ "os=freebsd&arch=x64&prod=chrome&prodversion=";
+ #elif defined(__i386__)
+ "os=freebsd&arch=x86&prod=chrome&prodversion=";
+ #else
+ "os=freebsd&arch=unknown&prod=chrome&prodversion=";
+ #endif
#elif defined(OS_CHROMEOS)
#if defined(__i386__)
"os=cros&arch=x86&prod=chrome&prodversion=";

11
www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc Normal file
View File

@ -0,0 +1,11 @@
--- chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2013-05-07 23:41:27.000000000 +0300
+++ chrome/browser/extensions/api/serial/serial_connection_posix.cc 2013-05-08 00:08:36.000000000 +0300
@@ -67,7 +67,7 @@
case 38400:
bitrate_opt_ = B38400;
break;
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
case 57600:
bitrate_opt_ = B57600;
break;

42
www/chromium/files/patch-chrome__browser__extensions__api__system_info_storage__storage_info_provider_bsd.cc Normal file
View File

@ -0,0 +1,42 @@
--- /dev/null 2013-05-08 01:24:05.000000000 +0300
+++ chrome/browser/extensions/api/system_info_storage/storage_info_provider_bsd.cc 2013-05-08 01:20:01.000000000 +0300
@@ -0,0 +1,39 @@
+// Copyright 2013 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.
+
+#include "chrome/browser/extensions/api/system_info_storage/storage_info_provider.h"
+
+namespace extensions {
+
+namespace {
+
+using api::experimental_system_info_storage::StorageUnitInfo;
+
+class StorageInfoProviderBSD : public StorageInfoProvider {
+ public:
+ StorageInfoProviderBSD() {}
+
+ virtual bool QueryInfo(StorageInfo* info) OVERRIDE {
+ NOTIMPLEMENTED();
+ return false;
+ }
+ virtual bool QueryUnitInfo(const std::string& id,
+ StorageUnitInfo* info) OVERRIDE {
+ NOTIMPLEMENTED();
+ return false;
+ }
+
+ private:
+ virtual ~StorageInfoProviderBSD() {}
+};
+
+} //
+
+// static
+StorageInfoProvider* StorageInfoProvider::Get() {
+ return StorageInfoProvider::GetInstance<StorageInfoProviderBSD>();
+}
+
+} // namespace extensions
+

11
www/chromium/files/patch-chrome__browser__extensions__api__system_info_storage__system_info_storage_api.cc
View File

@ -1,15 +1,18 @@
--- chrome/browser/extensions/api/system_info_storage/system_info_storage_api.cc.orig 2013-02-13 23:14:07.000000000 +0200
+++ chrome/browser/extensions/api/system_info_storage/system_info_storage_api.cc 2013-02-13 23:14:56.000000000 +0200
@@ -14,9 +14,12 @@
@@ -14,10 +14,14 @@
}
bool SystemInfoStorageGetFunction::RunImpl() {
+// Not Implemented
+#if !defined(OS_BSD)
+#if defined(OS_BSD)
+ return false;
+#else
StorageInfoProvider::Get()->StartQueryInfo(
base::Bind(&SystemInfoStorageGetFunction::OnGetStorageInfoCompleted,
this));
+#endif
return true;
+#endif
}
void SystemInfoStorageGetFunction::OnGetStorageInfoCompleted(

4
www/chromium/files/patch-chrome__browser__web_resource__plugins_resource_service.cc → www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
View File

@ -1,5 +1,5 @@
--- chrome/browser/web_resource/plugins_resource_service.cc.orig 2013-01-03 16:15:04.489512557 +0200
+++ chrome/browser/web_resource/plugins_resource_service.cc 2013-01-03 16:16:48.346512702 +0200
--- chrome/browser/plugins/plugins_resource_service.cc.orig 2013-01-03 16:15:04.489512557 +0200
+++ chrome/browser/plugins/plugins_resource_service.cc 2013-01-03 16:16:48.346512702 +0200
@@ -31,7 +31,7 @@
std::string filename;
#if defined(OS_WIN)

10
www/chromium/files/patch-chrome__browser__process_singleton.h
View File

@ -1,5 +1,5 @@
--- chrome/browser/process_singleton.h.orig 2012-12-20 10:02:17.000000000 +0200
+++ chrome/browser/process_singleton.h 2013-01-06 21:27:17.000000000 +0200
--- chrome/browser/process_singleton.h.orig 2013-02-28 10:15:23.000000000 +0200
+++ chrome/browser/process_singleton.h 2013-03-06 20:43:40.000000000 +0200
@@ -24,9 +24,9 @@
#include "base/threading/non_thread_safe.h"
#include "ui/gfx/native_widget_types.h"
@ -41,11 +41,11 @@
+#endif // defined(OS_LINUX) || defined(OS_BSD)
private:
typedef std::pair<CommandLine::StringVector, FilePath> DelayedStartupMessage;
@@ -164,7 +164,7 @@
typedef std::pair<CommandLine::StringVector,
@@ -165,7 +165,7 @@
bool is_virtualized_; // Stuck inside Microsoft Softricity VM environment.
HANDLE lock_file_;
FilePath user_data_dir_;
base::FilePath user_data_dir_;
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_LINUX) || defined(OS_BSD)
// Return true if the given pid is one of our child processes.

22
www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/ui/webui/about_ui.cc.orig 2012-10-31 21:02:22.000000000 +0200
+++ chrome/browser/ui/webui/about_ui.cc 2012-11-07 15:58:46.000000000 +0200
@@ -928,7 +928,7 @@
--- chrome/browser/ui/webui/about_ui.cc.orig 2013-02-28 10:15:18.000000000 +0200
+++ chrome/browser/ui/webui/about_ui.cc 2013-03-06 20:47:33.000000000 +0200
@@ -740,7 +740,7 @@
return data;
}
@ -9,7 +9,7 @@
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data, 0,
@@ -944,6 +944,7 @@
@@ -756,6 +756,7 @@
return data;
}
@ -17,20 +17,20 @@
void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id,
bool good) {
data->append("<tr><td>");
@@ -1005,6 +1006,7 @@
@@ -818,6 +819,7 @@
return data;
}
#endif
+#endif
std::string AboutVersionStaticContent(const std::string& query) {
return ResourceBundle::GetSharedInstance().GetRawDataResource(
@@ -1396,7 +1398,7 @@
} else if (host == chrome::kChromeUIDNSHost) {
AboutDnsHandler::Start(this, request_id);
// AboutMemoryHandler ----------------------------------------------------------
@@ -986,7 +988,7 @@
} else if (source_name_ == chrome::kChromeUIDNSHost) {
AboutDnsHandler::Start(profile(), callback);
return;
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
} else if (host == chrome::kChromeUILinuxProxyConfigHost) {
} else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
response = AboutLinuxProxyConfig();
#endif

31
www/chromium/files/patch-chrome__chrome_browser.gypi
View File

@ -1,6 +1,15 @@
--- chrome/chrome_browser.gypi.orig 2013-02-05 10:03:06.000000000 +0200
+++ chrome/chrome_browser.gypi 2013-02-13 22:38:19.000000000 +0200
@@ -2781,6 +2781,19 @@
--- chrome/chrome_browser.gypi.orig 2013-04-30 10:22:08.000000000 +0300
+++ chrome/chrome_browser.gypi 2013-05-07 23:55:10.000000000 +0300
@@ -2479,7 +2479,7 @@
'../device/device.gyp:device_media_transfer_protocol',
],
}],
- ['OS=="linux" and chromeos==0', {
+ ['(OS=="linux" and chromeos==0) or os_bsd==1', {
'dependencies': [
'../build/linux/system.gyp:libspeechd',
],
@@ -2782,6 +2782,21 @@
['exclude', '^browser/usb/'],
],
}],
@ -8,13 +17,15 @@
+ 'sources/': [
+ ['exclude', '^browser/chrome_browser_main_linux.cc'],
+ ['exclude', '^browser/chrome_browser_main_linux.h'],
+ ['exclude', '^browser/media_gallery/linux/'],
+ ['exclude', '^browser/system_monitor/media_transfer_protocol_device_observer_linux.cc'],
+ ['exclude', '^browser/system_monitor/media_transfer_protocol_device_observer_linux.h'],
+ ['exclude', '^browser/system_monitor/removable_device_notifications_linux.cc'],
+ ['exclude', '^browser/system_monitor/removable_device_notifications_linux.h'],
+ ['exclude', '^browser/system_monitor/udev_util_linux.cc'],
+ ['exclude', '^browser/system_monitor/udev_util_linux.h'],
+ ['exclude', '^browser/media_galleries/linux/'],
+ ['exclude', '^browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc'],
+ ['exclude', '^browser/storage_monitor/media_transfer_protocol_device_observer_linux.h'],
+ ['exclude', '^browser/storage_monitor/removable_device_notifications_linux.cc'],
+ ['exclude', '^browser/storage_monitor/removable_device_notifications_linux.h'],
+ ['exclude', '^browser/storage_monitor/storage_monitor_linux.cc'],
+ ['exclude', '^browser/storage_monitor/storage_monitor_linux.h'],
+ ['exclude', '^browser/storage_monitor/udev_util_linux.cc'],
+ ['exclude', '^browser/storage_monitor/udev_util_linux.h'],
+ ],
+ }],
['OS=="mac"', {

20
www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
View File

@ -1,15 +1,25 @@
--- chrome/chrome_browser_extensions.gypi.orig 2013-02-13 22:11:49.000000000 +0200
+++ chrome/chrome_browser_extensions.gypi 2013-02-13 23:10:09.000000000 +0200
@@ -912,6 +912,12 @@
--- chrome/chrome_browser_extensions.gypi.orig 2013-05-08 00:59:31.000000000 +0300
+++ chrome/chrome_browser_extensions.gypi 2013-05-08 01:23:36.000000000 +0300
@@ -409,6 +409,7 @@
'browser/extensions/api/system_info_storage/storage_info_provider.cc',
'browser/extensions/api/system_info_storage/storage_info_provider.h',
'browser/extensions/api/system_info_storage/storage_info_provider_android.cc',
+ 'browser/extensions/api/system_info_storage/storage_info_provider_bsd.cc',
'browser/extensions/api/system_info_storage/storage_info_provider_linux.cc',
'browser/extensions/api/system_info_storage/storage_info_provider_mac.cc',
'browser/extensions/api/system_info_storage/storage_info_provider_win.cc',
@@ -930,6 +931,14 @@
'browser/extensions/platform_app_launcher.h',
],
}],
+ ['os_bsd==1', {
+ 'sources!': [
+ 'browser/extensions/api/system_info_storage/storage_info_provider_linux.cc',
+ 'browser/extensions/api/system_info_storage/storage_info_provider_linux.h',
+ ],
+ 'sources': [
+ 'browser/extensions/api/system_info_storage/storage_info_provider_bsd.cc',
+ ],
+ }],
],
},
{
],

12
www/chromium/files/patch-chrome__common__chrome_paths.cc
View File

@ -1,6 +1,6 @@
--- chrome/common/chrome_paths.cc.orig 2012-05-23 04:50:48.000000000 +0300
+++ chrome/common/chrome_paths.cc 2012-05-26 00:47:40.880289194 +0300
@@ -334,10 +334,12 @@
--- chrome/common/chrome_paths.cc.orig 2013-02-28 10:15:52.000000000 +0200
+++ chrome/common/chrome_paths.cc 2013-03-06 21:25:36.000000000 +0200
@@ -441,10 +441,12 @@
if (!file_util::PathExists(cur)) // We don't want to create this
return false;
break;
@ -8,9 +8,9 @@
+#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"));
cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
+#elif defined(OS_BSD)
+ cur = FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies"));
+ cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies"));
#else
cur = FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif

11
www/chromium/files/patch-chrome__common__omaha_query_params.cc Normal file
View File

@ -0,0 +1,11 @@
--- chrome/common/omaha_query_params.cc.orig 2013-05-07 22:43:58.000000000 +0300
+++ chrome/common/omaha_query_params.cc 2013-05-07 22:44:41.000000000 +0300
@@ -28,6 +28,8 @@
"linux";
#elif defined(OS_OPENBSD)
"openbsd";
+#elif defined(OS_FREEBSD)
+ "freebsd";
#else
#error "unknown os"
#endif

26
www/chromium/files/patch-content__browser__browser_main_loop.cc
View File

@ -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

4
www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
View File

@ -29,8 +29,8 @@
+namespace content {
+namespace {
+// The time periods, in milliseconds, between successive polls of the wifi data.
+const int kDefaultPollingInterval = 120000; // 2 mins
+const int kNoChangePollingInterval = 300000; // 5 mins
+const int kDefaultPollingInterval = 10000; // 10s
+const int kNoChangePollingInterval = 120000; // 2 mins
+const int kTwoNoChangePollingInterval = 600000; // 10 mins
+const int kNoWifiPollingIntervalMilliseconds = 20 * 1000; // 20s
+

11
www/chromium/files/patch-content__browser__gpu__gpu_blacklist.cc
View File

@ -1,11 +0,0 @@
--- content/browser/gpu/gpu_blacklist.cc.orig 2012-12-20 10:01:26.000000000 +0200
+++ content/browser/gpu/gpu_blacklist.cc 2013-01-06 21:30:12.000000000 +0200
@@ -1348,7 +1348,7 @@
return kOsWin;
#elif defined(OS_ANDROID)
return kOsAndroid;
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_LINUX) || defined(OS_BSD)
return kOsLinux;
#elif defined(OS_MACOSX)
return kOsMacosx;

11
www/chromium/files/patch-content__browser__gpu__gpu_blacklist_unittest.cc
View File

@ -1,11 +0,0 @@
--- content/browser/gpu/gpu_blacklist_unittest.cc.orig 2012-02-01 21:51:33.000000000 +0200
+++ content/browser/gpu/gpu_blacklist_unittest.cc 2012-02-01 21:52:45.000000000 +0200
@@ -191,7 +191,7 @@
EXPECT_EQ(flags.flags(),
static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl));
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || \
- defined(OS_OPENBSD)
+ defined(OS_BSD)
// Blacklist entries will be filtered to the current OS only upon loading.
EXPECT_TRUE(
blacklist.LoadGpuBlacklist(vendor_json, GpuBlacklist::kCurrentOsOnly));

18
www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
View File

@ -1,16 +1,16 @@
--- content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2012-11-15 23:43:31.000000000 +0200
+++ content/renderer/renderer_webkitplatformsupport_impl.cc 2012-11-15 23:43:50.000000000 +0200
@@ -62,7 +62,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/mac/WebSandboxSupport.h"
--- content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2013-04-30 10:20:40.000000000 +0300
+++ content/renderer/renderer_webkitplatformsupport_impl.cc 2013-05-07 21:11:09.000000000 +0300
@@ -67,7 +67,7 @@
#include "third_party/WebKit/Source/Platform/chromium/public/mac/WebSandboxSupport.h"
#endif
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
#include <string>
#include <map>
#include <string>
@@ -117,7 +117,7 @@
int mode);
@@ -146,7 +146,7 @@
DISALLOW_COPY_AND_ASSIGN(Hyphenator);
};
-#if defined(OS_ANDROID)
@ -18,7 +18,7 @@
// WebKit doesn't use WebSandboxSupport on android so we don't need to
// implement anything here.
class RendererWebKitPlatformSupportImpl::SandboxSupport {
@@ -216,7 +216,7 @@
@@ -237,7 +237,7 @@
}
WebKit::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() {
@ -27,7 +27,7 @@
// WebKit doesn't use WebSandboxSupport on android.
return NULL;
#else
@@ -463,7 +463,7 @@
@@ -534,7 +534,7 @@
return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
}

10
www/chromium/files/patch-content__test__layout_browsertest.cc
View File

@ -1,11 +1,11 @@
--- content/test/layout_browsertest.cc.orig 2012-05-30 10:01:22.000000000 +0300
+++ content/test/layout_browsertest.cc 2012-06-05 22:53:35.000000000 +0300
@@ -28,6 +28,8 @@
--- content/test/layout_browsertest.cc.orig 2013-02-28 10:14:35.000000000 +0200
+++ content/test/layout_browsertest.cc 2013-03-06 21:29:58.000000000 +0200
@@ -34,6 +34,8 @@
static const char kPlatformName[] = "chromium-linux";
#elif defined(OS_OPENBSD)
static const char kPlatformName[] = "chromium-openbsd";
+#elif defined(OS_FREEBSD)
+static const char kPlatformName[] = "chromium-freebsd";
#elif defined(OS_ANDROID)
static const char kPlatformName[] = "chromium-android";
#else
#error No known OS defined
#endif

11
www/chromium/files/patch-ipc__ipc_channel_posix.cc
View File

@ -1,11 +0,0 @@
--- ipc/ipc_channel_posix.cc.orig 2012-01-18 11:12:21.000000000 +0200
+++ ipc/ipc_channel_posix.cc 2012-01-29 17:17:10.000000000 +0200
@@ -948,7 +948,7 @@
bool Channel::ChannelImpl::GetClientEuid(uid_t* client_euid) const {
DCHECK(HasAcceptedConnection());
-#if defined(OS_MACOSX) || defined(OS_OPENBSD)
+#if defined(OS_MACOSX) || defined(OS_BSD)
uid_t peer_euid;
gid_t peer_gid;
if (getpeereid(pipe_, &peer_euid, &peer_gid) != 0) {

17
www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
View File

@ -1,16 +1,7 @@
--- media/audio/audio_input_volume_unittest.cc.orig 2013-01-08 22:03:03.389246512 +0200
+++ media/audio/audio_input_volume_unittest.cc 2013-01-08 22:03:51.071246007 +0200
@@ -59,7 +59,7 @@
int samples_per_packet = 0;
#if defined(OS_MACOSX)
samples_per_packet = (sample_rate / 100);
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_LINUX) || defined(OS_BSD)
samples_per_packet = (sample_rate / 100);
#elif defined(OS_WIN)
if (sample_rate == 44100)
@@ -75,7 +75,7 @@
device_id);
--- media/audio/audio_input_volume_unittest.cc.orig 2013-04-30 10:22:14.000000000 +0300
+++ media/audio/audio_input_volume_unittest.cc 2013-05-07 21:17:17.000000000 +0300
@@ -57,7 +57,7 @@
params, device_id);
EXPECT_TRUE(NULL != ais);
-#if defined(OS_LINUX) || defined(OS_OPENBSD)

15
www/chromium/files/patch-media__media.gyp
View File

@ -1,6 +1,6 @@
--- media/media.gyp.orig 2012-11-27 10:01:14.000000000 +0200
+++ media/media.gyp 2012-11-28 22:11:36.000000000 +0200
@@ -470,7 +470,7 @@
--- media/media.gyp.orig 2013-04-30 10:22:14.000000000 +0300
+++ media/media.gyp 2013-05-08 21:54:11.000000000 +0300
@@ -598,7 +598,7 @@
'audio/openbsd/audio_manager_openbsd.h',
],
}],
@ -9,12 +9,3 @@
'variables': {
'conditions': [
['sysroot!=""', {
@@ -1101,7 +1101,7 @@
},
],
}],
- ['OS == "linux" and target_arch != "arm" and target_arch != "mipsel"', {
+ ['(OS == "linux" or OS == "freebsd") and target_arch != "arm" and target_arch != "mipsel"', {
'targets': [
{
'target_name': 'tile_render_bench',

12
www/chromium/files/patch-net__base__net_util.cc
View File

@ -1,10 +1,10 @@
--- net/base/net_util.cc.orig 2011-02-17 10:52:37.000000000 +0100
+++ net/base/net_util.cc 2011-02-20 21:20:04.000000000 +0100
@@ -24,6 +24,7 @@
#include <fcntl.h>
#include <ifaddrs.h>
--- net/base/net_util.cc.orig 2013-02-28 10:14:41.000000000 +0200
+++ net/base/net_util.cc 2013-03-06 21:34:27.000000000 +0200
@@ -22,6 +22,7 @@
#endif
#include <net/if.h>
#include <netdb.h>
+#include <sys/socket.h>
#include <net/if.h>
#include <netinet/in.h>
#endif

20
www/chromium/files/patch-remoting__remoting.gyp
View File

@ -1,18 +1,18 @@
--- remoting/remoting.gyp.orig 2013-02-13 20:16:24.000000000 +0200
+++ remoting/remoting.gyp 2013-02-13 23:31:43.000000000 +0200
@@ -44,7 +44,7 @@
--- remoting/remoting.gyp.orig 2013-04-30 10:22:16.000000000 +0300
+++ remoting/remoting.gyp 2013-05-07 21:24:08.000000000 +0300
@@ -56,7 +56,7 @@
'conditions': [
# Remoting host is supported only on Windows, OSX and Linux.
- ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', {
+ ['OS=="win" or OS=="mac" or OS=="freebsd" or (OS=="linux" and chromeos==0)', {
# Remoting host is supported only on Windows, OSX and Linux (with X11).
- ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', {
+ ['OS=="win" or OS=="mac" or OS=="freebsd" or (OS=="linux" and chromeos==0 and use_x11==1)', {
'enable_remoting_host': 1,
}, {
'enable_remoting_host': 0,
@@ -445,7 +445,7 @@
'host/win/window_station_and_desktop.h',
],
'conditions': [
@@ -479,7 +479,7 @@
'*_gtk.cc',
],
}],
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'link_settings': {

76
www/chromium/files/patch-third_party__libusb__libusb.gyp
View File

@ -1,38 +1,44 @@
--- third_party/libusb/libusb.gyp.orig
+++ third_party/libusb/libusb.gyp
@@ -10,23 +10,36 @@
--- third_party/libusb/libusb.gyp.orig 2013-04-30 10:21:05.000000000 +0300
+++ third_party/libusb/libusb.gyp 2013-05-08 20:58:00.000000000 +0300
@@ -10,31 +10,43 @@
{
'target_name': 'libusb',
'conditions': [
- ['OS == "linux" and use_system_libusb', {
+ ['(OS == "linux" or os_bsd == 1) and use_system_libusb', {
'type': 'none',
- ['OS == "linux" and use_system_libusb==1', {
- 'type': 'none',
- 'variables': {
- 'headers_root_path': 'src/libusb',
- 'header_filenames': [
- 'libusb.h',
- ],
- },
- 'includes': [
- '../../build/shim_headers.gypi',
- ],
+ ['(OS == "linux" or os_bsd == 1) and use_system_libusb==1', {
+ 'type': 'none',
'direct_dependent_settings': {
'defines': [
'USE_SYSTEM_LIBUSB',
],
- 'cflags': [
- '<!@(pkg-config --cflags libusb-1.0)',
- ],
- 'link_settings': {
- 'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other libusb-1.0)',
- ],
- 'libraries': [
- '<!@(pkg-config --libs-only-l libusb-1.0)',
- ],
- },
+ 'conditions': [
+ ['OS == "freebsd"', {
+ 'link_settings': {
+ 'libraries': [
+ '-lusb',
+ 'direct_dependent_settings': {
+ 'link_settings': {
+ 'libraries': [
+ '-lusb',
+ ],
+ },
+ },
+ }, {
+ 'variables': {
+ 'headers_root_path': 'src/libusb',
+ 'header_filenames': [
+ 'libusb.h',
+ ],
+ },
+ 'defines': [
+ 'LIBUSB_CALL=',
+ 'includes': [
+ '../../build/shim_headers.gypi',
+ ],
+ }, {
+ 'cflags': [
+ '<!@(pkg-config --cflags libusb-1.0)',
+ ],
@ -44,8 +50,20 @@
+ '<!@(pkg-config --libs-only-l libusb-1.0)',
+ ],
+ },
+ }],
+ ],
},
}, {
'type': '<(library)',
+ }],
],
- 'link_settings': {
- 'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other libusb-1.0)',
- ],
- 'libraries': [
- '<!@(pkg-config --libs-only-l libusb-1.0)',
- ],
- },
- },
- }, {
+ },
+ }, {
'type': 'static_library',
'sources': [
'src/libusb/core.c',

22
www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
View File

@ -1,8 +1,26 @@
--- third_party/libvpx/unpack_lib_posix.sh.orig 2012-09-29 23:59:44.000000000 +0300
+++ third_party/libvpx/unpack_lib_posix.sh 2012-09-30 00:02:38.000000000 +0300
--- third_party/libvpx/unpack_lib_posix.sh.orig 2013-05-08 22:39:15.000000000 +0300
+++ third_party/libvpx/unpack_lib_posix.sh 2013-05-08 22:37:44.000000000 +0300
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/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
@@ -45,16 +45,12 @@
ar=$AR
fi
-obj_list="$($ar t $lib_file | grep '\.o$')"
+obj_list="$($ar t $lib_file)"
function extract_object {
for f in $obj_list; do
filename="${f##*/}"
- if [ -z "$(echo $filename | grep $1)" ]; then
- continue
- fi
-
# Only echo this if debugging.
# echo "Extract $filename from archive to $out_dir/$1."
$ar p $lib_file $filename > $out_dir/$1

10
www/chromium/files/patch-tools__grit__grit__node__base.py Normal file
View File

@ -0,0 +1,10 @@
--- tools/grit/grit/node/base.py.orig 2013-03-06 22:30:09.000000000 +0200
+++ tools/grit/grit/node/base.py 2013-03-06 22:33:00.000000000 +0200
@@ -447,6 +447,7 @@
'is_linux': target_platform.startswith('linux'),
'is_macosx': target_platform == 'darwin',
'is_win': target_platform in ('cygwin', 'win32'),
+ 'is_bsd': 'bsd' in target_platform,
'is_posix': (target_platform in ('darwin', 'linux2', 'linux3', 'sunos5')
or 'bsd' in target_platform),
'pp_ifdef' : pp_ifdef,

11
www/chromium/files/patch-webkit__plugins__npapi__plugin_utils.cc Normal file
View File

@ -0,0 +1,11 @@
--- webkit/plugins/npapi/plugin_utils.cc.orig 2013-05-12 20:08:18.000000000 +0300
+++ webkit/plugins/npapi/plugin_utils.cc 2013-05-12 20:10:33.000000000 +0300
@@ -45,7 +45,7 @@
}
bool NPAPIPluginsSupported() {
-#if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(USE_AURA))
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || (defined(OS_LINUX) && !defined(USE_AURA))
return true;
#else
return false;

10
www/chromium/files/patch-webkit__plugins__ppapi__ppapi_plugin_instance.cc
View File

@ -1,11 +1,11 @@
--- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig 2011-07-28 11:01:06.000000000 +0300
+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc 2011-09-07 01:45:08.000000000 +0300
@@ -1035,7 +1035,7 @@
--- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig 2013-04-30 10:22:18.000000000 +0300
+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc 2013-05-07 21:26:49.000000000 +0300
@@ -1627,7 +1627,7 @@
#endif // defined(OS_WIN)
bool ret = false;
-#if defined(OS_LINUX) || (defined(OS_MACOSX) && defined(USE_SKIA))
+#if defined(OS_LINUX) || (defined(OS_MACOSX) && defined(USE_SKIA)) || defined(OS_FREEBSD)
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FREEBSD)
// On Linux we just set the final bits in the native metafile
// (NativeMetafile and PreviewMetafile must have compatible formats,
// i.e. both PDF for this to work).

13
www/chromium/pkg-message Normal file
View File

@ -0,0 +1,13 @@
======================================================================
For correct operation, shared memory support has to be enabled
in Chromium by performing the following command as root :
sysctl kern.ipc.shm_allow_removed=1
To preserve this setting across reboots, append the following
to /etc/sysctl.conf :
kern.ipc.shm_allow_removed=1
======================================================================

11
www/chromium/pkg-plist
View File

@ -63,6 +63,16 @@ bin/chrome
%%DATADIR%%/protoc
%%DATADIR%%/resources.pak
%%DATADIR%%/resources/extension/demo/library.js
%%DATADIR%%/resources/inspector/AceTextEditor.js
%%DATADIR%%/resources/inspector/acedevtools.css
%%DATADIR%%/resources/inspector/breakpointsList.css
%%DATADIR%%/resources/inspector/buildSystemOnly.js
%%DATADIR%%/resources/inspector/flameChart.css
%%DATADIR%%/resources/inspector/mode_css.js
%%DATADIR%%/resources/inspector/mode_html.js
%%DATADIR%%/resources/inspector/mode_javascript.js
%%DATADIR%%/resources/inspector/sidebarPane.css
%%DATADIR%%/resources/inspector/theme_textmate.js
%%DATADIR%%/resources/inspector/auditsPanel.css
%%DATADIR%%/resources/inspector/AuditsPanel.js
%%DATADIR%%/resources/inspector/breadcrumbList.css
@ -82,6 +92,7 @@ bin/chrome
%%DATADIR%%/resources/inspector/heapProfiler.css
%%DATADIR%%/resources/inspector/HeapSnapshotWorker.js
%%DATADIR%%/resources/inspector/helpScreen.css
%%DATADIR%%/resources/inspector/Images/addIcon.png
%%DATADIR%%/resources/inspector/Images/applicationCache.png
%%DATADIR%%/resources/inspector/Images/back.png
%%DATADIR%%/resources/inspector/Images/breakpointBorder.png