Raymond Wooninck
2011-09-20 16:10:49 +00:00
committed by Git OBS Bridge
parent 8f37fc5c2e
commit ce43a69833
30 changed files with 2221 additions and 0 deletions

51
chrome-wrapper Normal file
View File

@@ -0,0 +1,51 @@
#!/bin/sh
# Copyright (c) 2010 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.
# Running Chromium via this script makes it possible to set Chromium as the
# default browser directly out of a compile, without needing to package it.
DESKTOP="chromium-devel"
TITLE="Chromium"
# Checks a file to see if it's a 32 or 64-bit.
check_executable() {
out=$(file $(readlink -f $1) 2> /dev/null)
echo $out | grep -qs "ELF 32-bit LSB"
if [ $? = 0 ]; then
echo 32
return
fi
echo $out | grep -qs "ELF 64-bit LSB"
if [ $? = 0 ]; then
echo 64
return
fi
echo neither
}
# Let the wrapped binary know that it has been run through the wrapper.
export CHROME_WRAPPER="`readlink -f "$0"`"
HERE="`dirname "$CHROME_WRAPPER"`"
# We include some xdg utilities next to the binary, and we want to prefer them
# over the system versions because we know they work correctly for us. But if
# our path already exists, we leave it where it is, to allow overriding this.
# (Once distributions have picked up the updated xdg-mime, we can go back to
# appending $HERE rather than prepending.)
case ":$PATH:" in
*:$HERE:*)
# $PATH already contains $HERE, leave it where it is.
;;
*)
# Prepend $HERE to $PATH.
export PATH="$HERE:$PATH"
;;
esac
export LD_LIBRARY_PATH="$HERE:$HERE/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
exec "$HERE/chrome" "$@"

View File

@@ -0,0 +1,81 @@
--- chromium/src/build/all.gyp 2010-11-25 19:17:16.000000000 +0100
+++ new/src/build/all.gyp 2010-11-25 21:05:09.413000018 +0100
@@ -51,7 +51,7 @@
'../third_party/sqlite/sqlite.gyp:*',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:*',
'../third_party/zlib/zlib.gyp:*',
- '../v8/tools/gyp/v8.gyp:*',
+ 'linux/system.gyp:v8',
'../webkit/support/webkit_support.gyp:*',
'../webkit/webkit.gyp:*',
'util/build_util.gyp:*',
--- chromium/src/build/linux/system.gyp 2010-11-20 23:07:46.000000000 +0100
+++ new/src/build/linux/system.gyp 2010-11-25 21:05:09.418000018 +0100
@@ -340,6 +340,19 @@
}]]
},
{
+ 'target_name': 'v8',
+ 'type': 'settings',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'link_settings': {
+ 'libraries': [
+ '-lv8',
+ '-lvpx',
+ ],
+ },
+ }]]
+ },
+ {
'target_name': 'gnome_keyring',
'type': 'settings',
'conditions': [
--- chromium/src/net/net.gyp 2010-11-25 19:17:15.000000000 +0100
+++ new/src/net/net.gyp 2010-11-25 21:05:09.427000018 +0100
@@ -717,7 +717,7 @@
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/zlib/zlib.gyp:zlib',
- '../v8/tools/gyp/v8.gyp:v8',
+ '../build/linux/system.gyp:v8',
'net_resources',
'ssl_false_start_blacklist_process#host',
],
--- chromium/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp 2010-11-20 23:09:21.000000000 +0100
+++ new/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp 2010-11-25 21:05:09.435000018 +0100
@@ -789,7 +789,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ '<(chromium_src_dir)/build/linux/system.gyp:v8',
],
'conditions': [
['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
@@ -904,10 +904,10 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ '<(chromium_src_dir)/build/linux/system.gyp:v8',
],
'export_dependent_settings': [
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ '<(chromium_src_dir)/build/linux/system.gyp:v8',
],
'conditions': [
['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
@@ -1438,10 +1438,10 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ '<(chromium_src_dir)/build/linux/system.gyp:v8',
],
'export_dependent_settings': [
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ '<(chromium_src_dir)/build/linux/system.gyp:v8',
],
}],
['OS=="mac"', {

View File

@@ -0,0 +1,23 @@
diff -up chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/ffmpeg.gyp.BAD chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/ffmpeg.gyp
--- chromium-6.0.425.0-20100603svn48830/src/third_party/ffmpeg/ffmpeg.gyp.BAD 2010-06-03 13:48:45.196313786 -0400
+++ chromium-6.0.425.0-20100603svn48830/src/third_party/ffmpeg/ffmpeg.gyp 2010-06-03 13:50:10.580325776 -0400
@@ -818,12 +818,14 @@
# Add pkg-config result to include path when use_system_ffmpeg!=0
['use_system_ffmpeg!=0', {
- 'cflags': [
- '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
- ],
+ 'include_dirs': [
+ 'config',
+ 'ffmpeg-0.6-headers',
+ ],
'direct_dependent_settings': {
- 'cflags': [
- '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
+ 'include_dirs': [
+ 'config',
+ 'ffmpeg-0.6-headers',
],
},
}, { # else use_system_ffmpeg==0, add local copy to include path

View File

@@ -0,0 +1,53 @@
diff -up chromium-7.0.500.0-20100819svn56724/build/linux/system.gyp.speex chromium-7.0.500.0-20100819svn56724/build/linux/system.gyp
--- chromium-7.0.500.0-20100819svn56724/src/build/linux/system.gyp.speex 2010-08-19 16:23:14.594998783 -0400
+++ chromium-7.0.500.0-20100819svn56724/src/build/linux/system.gyp 2010-08-19 16:23:14.676903548 -0400
@@ -348,6 +348,26 @@
}]]
},
{
+ 'target_name': 'speex',
+ 'type': 'settings',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(pkg-config --cflags speex)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other speex)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l speex)',
+ ],
+ },
+ }]]
+ },
+ {
'target_name': 'gnome_keyring',
'type': 'settings',
'conditions': [
diff -up chromium-7.0.500.0-20100819svn56724/content/content_browser.gypi.speex chromium-7.0.500.0-20100819svn56724/chrome/chrome_browser.gypi
--- chromium-7.0.500.0-20100819svn56724/src/content/content_browser.gypi.speex 2010-08-19 16:23:14.594998783 -0400
+++ chromium-7.0.500.0-20100819svn56724/src/content/content_browser.gypi 2010-08-19 16:25:27.921293238 -0400
@@ -15,7 +15,7 @@
'../third_party/flac/flac.gyp:libflac',
# TODO(ericu): remove leveldb ref after crbug.com/6955013 is fixed.
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
- '../third_party/speex/speex.gyp:libspeex',
+ '../build/linux/system.gyp:speex',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'../third_party/zlib/zlib.gyp:zlib',
'../ui/ui.gyp:ui',
--- chromium/src/content/browser/speech/audio_encoder.cc 2011-01-20 09:04:11.631000020 +0100
+++ chromium/src/content/browser/speech/audio_encoder.cc 2011-01-20 09:04:11.631000020 +0100
@@ -10,7 +10,7 @@
#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "third_party/flac/flac.h"
-#include "third_party/speex/speex.h"
+#include <speex/speex.h>
using std::string;

View File

@@ -0,0 +1,310 @@
diff -up chromium-7.0.542.0/chrome/browser/browser_about_handler.cc.system-code chromium-7.0.542.0/chrome/browser/browser_about_handler.cc
--- chromium-7.0.542.0/src/chrome/browser/browser_about_handler.cc.system-code 2010-10-04 05:42:38.000000000 -0400
+++ chromium-7.0.542.0/src/chrome/browser/browser_about_handler.cc 2010-10-04 13:50:45.322377060 -0400
@@ -60,7 +60,7 @@
#include "net/base/net_util.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
-#include "v8/include/v8.h"
+#include <v8.h>
#include "webkit/glue/user_agent.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/plugins/npapi/plugin_list.h"
diff -up chromium-7.0.542.0/chrome/browser/ui/webui/options/about_page_handler.cc.system-code chromium-7.0.542.0/chrome/browser/dom_ui/options/about_page_handler.cc
--- chromium-7.0.542.0/src/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc.system-code 2010-10-04 14:20:06.569129133 -0400
+++ chromium-7.0.542.0/src/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc 2010-10-04 14:20:21.197112798 -0400
@@ -31,7 +31,7 @@
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
-#include "v8/include/v8.h"
+#include <v8.h>
#include "webkit/glue/user_agent.h"
#include "webkit/glue/webkit_glue.h"
diff -up chromium-7.0.542.0/chrome/renderer/external_extension.cc.system-code chromium-7.0.542.0/chrome/renderer/external_extension.cc
--- chromium-7.0.542.0/src/chrome/renderer/external_extension.cc.system-code 2010-10-04 05:42:44.000000000 -0400
+++ chromium-7.0.542.0/src/chrome/renderer/external_extension.cc 2010-10-04 14:16:54.845500082 -0400
@@ -12,7 +12,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "v8/include/v8.h"
+#include <v8.h>
using WebKit::WebFrame;
using WebKit::WebView;
diff -up chromium-7.0.542.0/chrome/renderer/loadtimes_extension_bindings.cc.system-code chromium-7.0.542.0/chrome/renderer/loadtimes_extension_bindings.cc
--- chromium-7.0.542.0/src/chrome/renderer/loadtimes_extension_bindings.cc.system-code 2010-10-04 05:42:44.000000000 -0400
+++ chromium-7.0.542.0/src/chrome/renderer/loadtimes_extension_bindings.cc 2010-10-04 14:16:54.846500790 -0400
@@ -9,7 +9,7 @@
#include "base/time.h"
#include "content/renderer/navigation_state.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "v8/include/v8.h"
+#include <v8.h>
using WebKit::WebDataSource;
using WebKit::WebFrame;
diff -up chromium-7.0.542.0/content/renderer/render_thread.cc.system-code chromium-7.0.542.0/chrome/renderer/render_thread.cc
--- chromium-7.0.542.0/src/content/renderer/render_thread.cc.system-code 2010-10-04 05:42:44.000000000 -0400
+++ chromium-7.0.542.0/src/content/renderer/render_thread.cc 2010-10-04 14:16:54.848500089 -0400
@@ -59,7 +59,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "v8/include/v8.h"
+#include <v8.h>
#include "webkit/extensions/v8/benchmarking_extension.h"
#include "webkit/extensions/v8/playback_extension.h"
#include "webkit/glue/webkit_glue.h"
diff -up chromium-7.0.542.0/chrome/renderer/search_extension.cc.system-code chromium-7.0.542.0/chrome/renderer/search_extension.cc
--- chromium-7.0.542.0/src/chrome/renderer/search_extension.cc.system-code 2010-10-04 05:42:44.000000000 -0400
+++ chromium-7.0.542.0/src/chrome/renderer/search_extension.cc 2010-10-04 14:16:54.849503141 -0400
@@ -12,7 +12,7 @@
#include "chrome/renderer/searchbox.h"
#include "content/renderer/render_view.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "v8/include/v8.h"
+#include <v8.h>
using WebKit::WebFrame;
using WebKit::WebView;
diff -up chromium-7.0.542.0/chrome/renderer/translate_helper.cc.system-code chromium-7.0.542.0/chrome/renderer/translate_helper.cc
--- chromium-7.0.542.0/src/chrome/renderer/translate_helper.cc.system-code 2010-10-04 05:42:44.000000000 -0400
+++ chromium-7.0.542.0/src/chrome/renderer/translate_helper.cc 2010-10-04 14:16:54.850500334 -0400
@@ -18,7 +18,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h"
-#include "v8/include/v8.h"
+#include <v8.h>
#include "webkit/glue/dom_operations.h"
using WebKit::WebDocument;
diff -up chromium-7.0.542.0/chrome/test/v8_unit_test.h.system-code chromium-7.0.542.0/chrome/test/v8_unit_test.h
--- chromium-7.0.542.0/src/chrome/test/base/v8_unit_test.h.system-code 2010-10-04 05:42:17.000000000 -0400
+++ chromium-7.0.542.0/src/chrome/test/base/v8_unit_test.h 2010-10-04 14:16:54.851503148 -0400
@@ -9,7 +9,7 @@
#include <string>
#include "testing/gtest/include/gtest/gtest.h"
-#include "v8/include/v8.h"
+#include <v8.h>
namespace base {
class StringPiece;
diff -up chromium-7.0.542.0/net/proxy/proxy_resolver_v8.cc.system-code chromium-7.0.542.0/net/proxy/proxy_resolver_v8.cc
--- chromium-7.0.542.0/src/net/proxy/proxy_resolver_v8.cc.system-code 2010-10-04 05:40:28.000000000 -0400
+++ chromium-7.0.542.0/src/net/proxy/proxy_resolver_v8.cc 2010-10-04 14:16:54.852507424 -0400
@@ -22,7 +22,7 @@
#include "net/proxy/proxy_resolver_js_bindings.h"
#include "net/proxy/proxy_resolver_request_context.h"
#include "net/proxy/proxy_resolver_script.h"
-#include "v8/include/v8.h"
+#include <v8.h>
// Notes on the javascript environment:
//
diff -up chromium-7.0.542.0/webkit/glue/webkit_glue.cc.system-code chromium-7.0.542.0/webkit/glue/webkit_glue.cc
--- chromium-7.0.542.0/src/webkit/glue/webkit_glue.cc.system-code 2010-10-04 05:39:57.000000000 -0400
+++ chromium-7.0.542.0/src/webkit/glue/webkit_glue.cc 2010-10-04 14:16:54.869402307 -0400
@@ -43,7 +43,7 @@
#endif
#include "webkit/glue/glue_serialize.h"
#include "webkit/glue/user_agent.h"
-#include "v8/include/v8.h"
+#include <v8.h>
using WebKit::WebCanvas;
using WebKit::WebData;
diff -up chromium-7.0.542.0/webkit/tools/test_shell/listener_leak_test.cc.system-code chromium-7.0.542.0/webkit/tools/test_shell/listener_leak_test.cc
--- chromium-7.0.542.0/src/webkit/tools/test_shell/listener_leak_test.cc.system-code 2010-10-04 05:39:56.000000000 -0400
+++ chromium-7.0.542.0/src/webkit/tools/test_shell/listener_leak_test.cc 2010-10-04 14:16:54.872365629 -0400
@@ -8,8 +8,8 @@
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "v8/include/v8.h"
-#include "v8/include/v8-profiler.h"
+#include <v8.h>
+#include <v8-profiler.h>
#include "webkit/glue/webkit_glue.h"
#include "webkit/tools/test_shell/test_shell.h"
#include "webkit/tools/test_shell/test_shell_test.h"
--- chromium/src/chrome/renderer/extensions/bindings_utils.cc 2011-09-12 19:18:09.870226952 +0200
+++ chromium/src/chrome/renderer/extensions/bindings_utils.cc 2011-09-12 19:18:09.870226952 +0200
@@ -10,7 +10,7 @@
#include "content/renderer/render_view.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "v8/include/v8.h"
+#include <v8.h>
using WebKit::WebFrame;
using WebKit::WebView;
--- chromium/src/chrome/renderer/extensions/bindings_utils.h 2011-09-12 19:18:09.870226952 +0200
+++ chromium/src/chrome/renderer/extensions/bindings_utils.h 2011-09-12 19:18:09.870226952 +0200
@@ -8,7 +8,7 @@
#include "base/memory/linked_ptr.h"
#include "base/memory/singleton.h"
-#include "v8/include/v8.h"
+#include <v8.h>
#include <list>
#include <map>
--- chromium/src/chrome/renderer/extensions/chrome_app_bindings.cc 2011-09-12 19:18:09.873226953 +0200
+++ chromium/src/chrome/renderer/extensions/chrome_app_bindings.cc 2011-09-12 19:18:09.873226953 +0200
@@ -19,7 +19,7 @@
#include "content/renderer/v8_value_converter.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "v8/include/v8.h"
+#include <v8.h>
using WebKit::WebFrame;
--- chromium/src/chrome/renderer/extensions/chrome_webstore_bindings.cc 2011-09-12 19:18:09.867226952 +0200
+++ chromium/src/chrome/renderer/extensions/chrome_webstore_bindings.cc 2011-09-12 19:18:09.867226952 +0200
@@ -16,7 +16,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h"
-#include "v8/include/v8.h"
+#include <v8.h>
using WebKit::WebDocument;
using WebKit::WebElement;
--- chromium/src/chrome/renderer/extensions/event_bindings.cc 2011-09-12 19:18:09.866226952 +0200
+++ chromium/src/chrome/renderer/extensions/event_bindings.cc 2011-09-12 19:18:09.866226952 +0200
@@ -32,7 +32,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "v8/include/v8.h"
+#include <v8.h>
using bindings_utils::CallFunctionInContext;
using bindings_utils::ContextInfo;
--- chromium/src/chrome/renderer/extensions/extension_base.cc 2011-09-12 19:18:09.868226952 +0200
+++ chromium/src/chrome/renderer/extensions/extension_base.cc 2011-09-12 19:18:09.868226952 +0200
@@ -17,7 +17,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "ui/base/resource/resource_bundle.h"
-#include "v8/include/v8.h"
+#include <v8.h>
using WebKit::WebFrame;
using WebKit::WebView;
--- chromium/src/chrome/renderer/extensions/extension_base.h 2011-09-12 19:18:09.868226952 +0200
+++ chromium/src/chrome/renderer/extensions/extension_base.h 2011-09-12 19:18:09.868226952 +0200
@@ -7,7 +7,7 @@
#pragma once
#include "base/logging.h"
-#include "v8/include/v8.h"
+#include <v8.h>
#include <string>
--- chromium/src/chrome/renderer/extensions/extension_dispatcher.cc 2011-09-12 19:18:09.871226952 +0200
+++ chromium/src/chrome/renderer/extensions/extension_dispatcher.cc 2011-09-12 19:18:09.871226952 +0200
@@ -25,7 +25,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
-#include "v8/include/v8.h"
+#include <v8.h>
namespace {
static const double kInitialExtensionIdleHandlerDelayS = 5.0 /* seconds */;
--- chromium/src/chrome/renderer/extensions/extension_process_bindings.cc 2011-09-12 19:18:09.872226953 +0200
+++ chromium/src/chrome/renderer/extensions/extension_process_bindings.cc 2011-09-12 19:18:09.872226953 +0200
@@ -40,7 +40,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"
-#include "v8/include/v8.h"
+#include <v8.h>
#include "webkit/glue/webkit_glue.h"
using bindings_utils::GetPendingRequestMap;
--- chromium/src/chrome/renderer/extensions/js_only_v8_extensions.cc 2011-09-12 19:18:09.869226952 +0200
+++ chromium/src/chrome/renderer/extensions/js_only_v8_extensions.cc 2011-09-12 19:18:09.869226952 +0200
@@ -6,7 +6,7 @@
#include "chrome/renderer/extensions/extension_base.h"
#include "grit/renderer_resources.h"
-#include "v8/include/v8.h"
+#include <v8.h>
// JsonSchemaJsV8Extension
const char* JsonSchemaJsV8Extension::kName = "chrome/jsonschema";
--- chromium/src/chrome/renderer/extensions/renderer_extension_bindings.cc 2011-09-12 19:18:09.870226952 +0200
+++ chromium/src/chrome/renderer/extensions/renderer_extension_bindings.cc 2011-09-12 19:18:09.870226952 +0200
@@ -19,7 +19,7 @@
#include "content/renderer/render_thread.h"
#include "content/renderer/render_view.h"
#include "grit/renderer_resources.h"
-#include "v8/include/v8.h"
+#include <v8.h>
// Message passing API example (in a content script):
// var extension =
--- chromium/src/webkit/extensions/v8/benchmarking_extension.cc 2011-09-12 19:14:10.296215361 +0200
+++ chromium/src/webkit/extensions/v8/benchmarking_extension.cc 2011-09-12 19:14:10.296215361 +0200
@@ -7,7 +7,7 @@
#include "base/metrics/stats_table.h"
#include "base/time.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
-#include "v8/include/v8.h"
+#include <v8.h>
#include "webkit/glue/webkit_glue.h"
using WebKit::WebCache;
--- chromium/src/webkit/extensions/v8/gc_extension.cc 2011-09-02 20:36:06.477665945 +0200
+++ chromium/src/webkit/extensions/v8/gc_extension.cc 2011-09-02 20:36:06.477665945 +0200
@@ -4,7 +4,7 @@
#include "webkit/extensions/v8/gc_extension.h"
-#include "v8/include/v8.h"
+#include <v8.h>
const char kGCExtensionName[] = "v8/GCController";
--- chromium/src/webkit/extensions/v8/heap_profiler_extension.cc 2011-09-12 19:14:10.294215364 +0200
+++ chromium/src/webkit/extensions/v8/heap_profiler_extension.cc 2011-09-12 19:14:10.294215364 +0200
@@ -5,7 +5,7 @@
#include "webkit/extensions/v8/heap_profiler_extension.h"
#include "base/basictypes.h"
-#include "v8/include/v8.h"
+#include <v8.h>
#if defined(USE_TCMALLOC) && !defined(OS_WIN)
#include "third_party/tcmalloc/chromium/src/google/heap-profiler.h"
--- chromium/src/webkit/extensions/v8/playback_extension.cc 2011-09-12 19:14:10.295215363 +0200
+++ chromium/src/webkit/extensions/v8/playback_extension.cc 2011-09-12 19:14:10.295215363 +0200
@@ -4,7 +4,7 @@
#include "webkit/extensions/v8/playback_extension.h"
-#include "v8/include/v8.h"
+#include <v8.h>
const char kPlaybackExtensionName[] = "v8/PlaybackMode";
--- chromium/src/webkit/extensions/v8/profiler_extension.cc 2011-09-12 19:14:10.295215363 +0200
+++ chromium/src/webkit/extensions/v8/profiler_extension.cc 2011-09-12 19:14:10.295215363 +0200
@@ -5,7 +5,7 @@
#include "webkit/extensions/v8/profiler_extension.h"
#include "build/build_config.h"
-#include "v8/include/v8.h"
+#include <v8.h>
#if defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX)
#include "third_party/tcmalloc/chromium/src/google/profiler.h"

View File

@@ -0,0 +1,190 @@
diff -up chromium-7.0.542.0/net/base/mime_util.cc.media-probe chromium-7.0.542.0/net/base/mime_util.cc
--- chromium-7.0.542.0/src/net/base/mime_util.cc.media-probe 2010-10-04 05:40:38.000000000 -0400
+++ chromium-7.0.542.0/src/net/base/mime_util.cc 2010-10-04 15:02:09.324499172 -0400
@@ -15,6 +15,15 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
+#include "base/path_service.h"
+
+#if ! defined(OS_MACOSX) && defined (OS_POSIX)
+#include <dlfcn.h>
+#define HAVE_DLFCN 1
+#else
+#define HAVE_DLFCN 0
+#endif
+
using std::string;
namespace net {
@@ -224,34 +233,36 @@
"image/x-xbitmap" // xbm
};
-// A list of media types: http://en.wikipedia.org/wiki/Internet_media_type
-// A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php
-static const char* const supported_media_types[] = {
-#if defined(ENABLE_MEDIA_TYPE_OGG)
- // Ogg.
- "video/ogg",
- "audio/ogg",
- "application/ogg",
-#endif
+struct format_info {
+ const char* name;
+ const char* symbol;
+ const bool fallback;
+};
- // WebM.
- "video/webm",
- "audio/webm",
- "audio/wav",
- "audio/x-wav",
#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
- // MPEG-4.
- "video/mp4",
- "video/x-m4v",
- "audio/mp4",
- "audio/x-m4a",
-
- // MP3.
- "audio/mp3",
- "audio/x-mp3",
- "audio/mpeg",
+#define MPEG true
+#else
+#define MPEG false
#endif
+
+// A list of media types: http://en.wikipedia.org/wiki/Internet_media_type
+// A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php
+static const format_info supported_media_types[] = {
+ { "video/ogg", "ogg_demuxer", true },
+ { "audio/ogg", "ogg_demuxer", true },
+ { "application/ogg", "ogg_demuxer", true },
+ { "video/webm", "matroska_demuxer", true },
+ { "audio/webm", "matroska_demuxer", true },
+ { "audio/wav", "wav_demuxer", true },
+ { "audio/x-wav", "wav_demuxer", true },
+ { "video/mp4", "mov_demuxer", MPEG },
+ { "video/x-m4v", "mov_demuxer", MPEG },
+ { "audio/mp4", "mov_demuxer", MPEG },
+ { "audio/x-m4a", "mov_demuxer", MPEG },
+ { "audio/mp3", "mp3_demuxer", MPEG },
+ { "audio/x-mp3", "mp3_demuxer", MPEG },
+ { "audio/mpeg", "mp3_demuxer", MPEG },
};
// List of supported codecs when passed in with <source type="...">.
@@ -261,17 +272,12 @@
//
// The codecs for WAV are integers as defined in Appendix A of RFC2361:
// http://tools.ietf.org/html/rfc2361
-static const char* const supported_media_codecs[] = {
-#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
- "avc1",
- "mp4a",
-#endif
-#if defined(ENABLE_MEDIA_CODEC_THEORA)
- "theora",
-#endif
- "vorbis",
- "vp8",
- "1" // WAVE_FORMAT_PCM.
+static const format_info supported_media_codecs[] = {
+ { "avc1", "aac_decoder", MPEG },
+ { "mp4a", "h264_decoder", MPEG },
+ { "theora", "theora_decoder", true },
+ { "vorbis", "vorbis_decoder", true },
+ { "vp8", "libvpx_decoder", true },
};
// Note: does not include javascript types list (see supported_javascript_types)
@@ -345,7 +351,47 @@
{ "audio/wav", "1" }
};
+#if defined(OS_MACOSX)
+#define DSO_NAME(MODULE) ("lib" MODULE ".dylib")
+#elif defined(OS_POSIX)
+#define DSO_NAME(MODULE) ("lib" MODULE ".so")
+#else
+#define DSO_NAME(MODULE) (MODULE ".dll")
+#endif
+
+static void* GetHandle(const FilePath& module_dir, const char* library) {
+#if HAVE_DLFCN
+ FilePath path = module_dir.Append(library);
+ return dlopen(path.value().c_str(), RTLD_LAZY);
+#else
+ return NULL;
+#endif
+}
+
+static void DumpHandle(void* dlhandle) {
+#if HAVE_DLFCN
+ if (dlhandle)
+ dlclose(dlhandle);
+#endif
+}
+
+static bool ProbeFormat(void* dlhandle, const char* symbol, bool fallback) {
+#if HAVE_DLFCN
+ return dlhandle && dlsym(dlhandle, symbol);
+#else
+ return fallback;
+#endif
+}
+
void MimeUtil::InitializeMimeTypeMaps() {
+ FilePath module_path;
+#if defined(OS_MACOSX)
+ module_path = mac_util::MainAppBundlePath().Append("Libraries");
+#else
+ PathService::Get(base::DIR_MODULE, &module_path);
+#endif
+ void* h_ffmpegsumo = GetHandle(module_path, DSO_NAME("ffmpegsumo"));
+
for (size_t i = 0; i < arraysize(supported_image_types); ++i)
image_map_.insert(supported_image_types[i]);
@@ -355,11 +401,15 @@
for (size_t i = 0; i < arraysize(supported_javascript_types); ++i)
non_image_map_.insert(supported_javascript_types[i]);
for (size_t i = 0; i < arraysize(supported_media_types); ++i)
- non_image_map_.insert(supported_media_types[i]);
+ if (ProbeFormat(h_ffmpegsumo, supported_media_types[i].symbol,
+ supported_media_types[i].fallback))
+ non_image_map_.insert(supported_media_types[i].name);
// Initialize the supported media types.
for (size_t i = 0; i < arraysize(supported_media_types); ++i)
- media_map_.insert(supported_media_types[i]);
+ if (ProbeFormat(h_ffmpegsumo, supported_media_types[i].symbol,
+ supported_media_types[i].fallback))
+ media_map_.insert(supported_media_types[i].name);
for (size_t i = 0; i < arraysize(supported_javascript_types); ++i)
javascript_map_.insert(supported_javascript_types[i]);
@@ -368,7 +418,9 @@
view_source_map_.insert(view_source_types[i]);
for (size_t i = 0; i < arraysize(supported_media_codecs); ++i)
- codecs_map_.insert(supported_media_codecs[i]);
+ if (ProbeFormat(h_ffmpegsumo, supported_media_codecs[i].symbol,
+ supported_media_codecs[i].fallback))
+ codecs_map_.insert(supported_media_codecs[i].name);
// Initialize the strict supported media types.
for (size_t i = 0; i < arraysize(format_codec_mappings); ++i) {
@@ -382,6 +434,8 @@
codecs.insert(mime_type_codecs[j]);
strict_format_map_[format_codec_mappings[i].mime_type] = codecs;
}
+
+ DumpHandle(h_ffmpegsumo);
}
bool MimeUtil::IsSupportedImageMimeType(const char* mime_type) const {

View File

@@ -0,0 +1,43 @@
diff -up chromium-7.0.542.0/build/linux/system.gyp.system-libvpx chromium-7.0.542.0/build/linux/system.gyp
--- chromium-7.0.542.0/src/build/linux/system.gyp.system-libvpx 2010-10-06 14:01:19.638507000 -0400
+++ chromium-7.0.542.0/src/build/linux/system.gyp 2010-10-06 14:01:19.650507000 -0400
@@ -409,6 +409,26 @@
}]]
},
{
+ 'target_name': 'libvpx',
+ 'type': 'settings',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '-I/usr/include/vpx',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '',
+ ],
+ 'libraries': [
+ '-lvpx',
+ ],
+ },
+ }]]
+ },
+ {
'target_name': 'gnome_keyring',
'type': 'settings',
'conditions': [
diff -up chromium-7.0.542.0/third_party/ffmpeg/ffmpeg.gyp.system-libvpx chromium-7.0.542.0/third_party/ffmpeg/ffmpeg.gyp
--- chromium-7.0.542.0/src/third_party/ffmpeg/ffmpeg.gyp.system-libvpx 2010-10-06 14:04:09.730507291 -0400
+++ chromium-7.0.542.0/src/third_party/ffmpeg/ffmpeg.gyp 2010-10-06 14:05:14.341510863 -0400
@@ -812,6 +812,9 @@
'<(output_root)',
'../..', # The chromium 'src' directory.
],
+ 'dependencies': [
+ '../../build/linux/system.gyp:libvpx',
+ ],
'direct_dependent_settings': {
'defines': [
'__STDC_CONSTANT_MACROS', # FFmpeg uses INT64_C.

14
chromium-browser.desktop Normal file
View File

@@ -0,0 +1,14 @@
[Desktop Entry]
Version=1.0
Name=Chromium Web Browser
Comment=Browse the World Wide Web
GenericName=Web Browser
Exec=chromium %u
Terminal=false
X-MultipleArgs=false
Type=Application
Icon=chromium-browser.png
Categories=Network;WebBrowser;
MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
StartupWMClass=Chromium

123
chromium-browser.sh Normal file
View File

@@ -0,0 +1,123 @@
#!/bin/sh
# Chromium launcher
# Authors:
# Fabien Tassin <fta@sofaraway.org>
# License: GPLv2 or later
APPNAME=chromium
LIBDIR=/usr/lib/chromium
GDB=/usr/bin/gdb
CHROME_SANDBOX=/usr/lib/chrome_sandbox
# Let the Chromium aware MeeGo desktop environment.
# For system proxy setting integration.
GNOME_DESKTOP_SESSION_ID="this-is-deprecated"
export GNOME_DESKTOP_SESSION_ID
usage () {
echo "$APPNAME [-h|--help] [-g|--debug] [options] [URL]"
echo
echo " -g or --debug Start within $GDB"
echo " -h or --help This help screen"
}
# FFmpeg needs to know where its libs are located
if [ "Z$LD_LIBRARY_PATH" != Z ] ; then
LD_LIBRARY_PATH=$LIBDIR:$LD_LIBRARY_PATH
else
LD_LIBRARY_PATH=$LIBDIR
fi
export LD_LIBRARY_PATH
# xdg-settings should in PATH
PATH=$PATH:$LIBDIR
export PATH
want_debug=0
while [ $# -gt 0 ]; do
case "$1" in
-h | --help | -help )
usage
exit 0 ;;
-g | --debug )
want_debug=1
shift ;;
-- ) # Stop option prcessing
shift
break ;;
* )
break ;;
esac
done
# Setup the default profile if this is none
# Set the default theme as GTK+ with system window decoration
if [ ! -d ~/.config/chromium/Default ]; then
mkdir -p ~/.config/chromium/Default
cat <<EOF > ~/.config/chromium/Default/Preferences
{
"browser": {
"custom_chrome_frame": false
},
"extensions": {
"theme": {
"colors": {
},
"id": "",
"images": {
},
"properties": {
},
"tints": {
},
"use_system": true
}
},
"homepage": "http://meego.com/",
"homepage_is_newtabpage": false,
"session": {
"restore_on_startup": 1
},
"webkit": {
"webprefs": {
"default_fixed_font_size": 13,
"default_font_size": 16,
"fixed_font_family": "Droid Sans Mono",
"sansserif_font_family": "Droid Sans",
"serif_font_family": "Droid Serif"
}
}
}
EOF
# Set the default browser
$LIBDIR/xdg-settings set default-web-browser chromium-browser.desktop
fi
if [ ! -u $CHROME_SANDBOX ] ; then
SANDBOX="--no-sandbox"
fi
if [ $want_debug -eq 1 ] ; then
if [ ! -x $GDB ] ; then
echo "Sorry, can't find usable $GDB. Please install it."
exit 1
fi
tmpfile=`mktemp /tmp/chromiumargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; }
trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
echo "set args ${1+"$@"}" > $tmpfile
echo "# Env:"
echo "# LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
echo "$GDB $LIBDIR/$APPNAME -x $tmpfile"
$GDB "$LIBDIR/$APPNAME" -x $tmpfile
exit $?
else
exec $LIBDIR/$APPNAME $SANDBOX "--password-store=detect" "--enable-experimental-extension-apis" "--enable-plugins" "--enable-extensions" "--enable-user-scripts" "--enable-printing" "--enable-sync" "--auto-ssl-client-auth" "$@"
fi

16
chromium-browser.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE default-apps SYSTEM "gnome-da-list.dtd">
<default-apps>
<web-browsers>
<web-browser>
<name>Chromium</name>
<executable>chromium</executable>
<command>chromium %s</command>
<icon-name>chromium-browser</icon-name>
<run-in-terminal>false</run-in-terminal>
<netscape-remote>true</netscape-remote>
<tab-command>false</tab-command>
<win-command>false</win-command>
</web-browser>
</web-browsers>
</default-apps>

View File

@@ -0,0 +1,50 @@
diff -up chromium/src/net/base/gzip_header.cc chromium/src/net/base/gzip_header.cc
--- chromium/src/net/base/gzip_header.cc 2009-09-28 10:34:28.000000000 -0600
+++ chromium/src/net/base/gzip_header.cc 2009-11-24 17:23:22.000000000 -0700
@@ -4,11 +4,11 @@
#include "net/base/gzip_header.h"
-#if defined(USE_SYSTEM_ZLIB)
+/* #if defined(USE_SYSTEM_ZLIB) */
#include <zlib.h>
-#else
+/* #else
#include "third_party/zlib/zlib.h" // for Z_DEFAULT_COMPRESSION
-#endif
+#endif */
#include "base/logging.h"
diff -up chromium/src/net/base/sdch_filter_unittest.cc chromium/src/net/base/sdch_filter_unittest.cc
--- chromium/src/net/base/sdch_filter_unittest.cc 2009-09-28 10:34:29.000000000 -0600
+++ chromium/src/net/base/sdch_filter_unittest.cc 2009-11-24 17:21:57.000000000 -0700
@@ -8,11 +8,11 @@
#include <string>
#include <vector>
-#if defined(USE_SYSTEM_ZLIB)
+/* #if defined(USE_SYSTEM_ZLIB) */
#include <zlib.h>
-#else
+/* #else
#include "third_party/zlib/zlib.h"
-#endif
+#endif */
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
--- chromium/src/chrome/common/metrics_helpers.cc 2009-09-28 10:34:29.000000000 -0600
+++ chromium/src/chrome/common/metrics_helpers.cc 2009-11-24 17:21:57.000000000 -0700
@@ -4,11 +4,7 @@
#include "chrome/common/metrics_helpers.h"
-#if defined(USE_SYSTEM_LIBBZ2)
#include <bzlib.h>
-#else
-#include "third_party/bzip2/bzlib.h"
-#endif
#include "base/base64.h"
#include "base/basictypes.h"

100
chromium-gcc46.patch Normal file
View File

@@ -0,0 +1,100 @@
--- chromium/src/ui/gfx/codec/jpeg_codec.h~ 2011-03-31 14:11:18.000000000 +0400
+++ chromium/src/ui/gfx/codec/jpeg_codec.h 2011-03-31 14:11:27.000000000 +0400
@@ -8,6 +8,7 @@
#include <stddef.h>
#include <vector>
+#include <cstddef>
#include "ui/base/ui_export.h"
--- chromium/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2011-03-31 14:48:03.000000000 +0400
+++ chromium/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2011-03-31 14:49:52.000000000 +0400
@@ -8,6 +8,7 @@
#include <stddef.h>
#include <vector>
+#include <cstddef>
class GURL;
class PrefService;
--- chromium/src/third_party/tcmalloc/chromium/src/common.cc~ 2011-03-29 20:46:14.000000000 +0400
+++ chromium/src/third_party/tcmalloc/chromium/src/common.cc 2011-03-29 20:47:02.000000000 +0400
@@ -30,6 +30,7 @@
// ---
// Author: Sanjay Ghemawat <opensource@google.com>
+#include <cstddef>
#include "config.h"
#include "common.h"
#include "system-alloc.h"
--- chromium/src/third_party/libjingle/source/talk/base/sigslot.h~ 2011-03-31 13:43:11.000000000 +0400
+++ chromium/src/third_party/libjingle/source/talk/base/sigslot.h 2011-03-31 13:52:32.000000000 +0400
@@ -81,6 +81,7 @@
#include <list>
#include <set>
#include <stdlib.h>
+#include <cstddef>
// On our copy of sigslot.h, we force single threading
#define SIGSLOT_PURE_ISO
--- chromium/src/third_party/ots/src/os2.cc~ 2011-03-31 14:03:13.000000000 +0400
+++ chromium/src/third_party/ots/src/os2.cc 2011-03-31 14:03:25.000000000 +0400
@@ -5,6 +5,7 @@
#include "os2.h"
#include "head.h"
+#include <cstddef>
// OS/2 - OS/2 and Windows Metrics
// http://www.microsoft.com/opentype/otspec/os2.htm
--- chromium/src/third_party/tcmalloc/chromium/src/base/vdso_support.h~ 2011-03-29 23:20:20.000000000 +0400
+++ chromium/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2011-03-29 23:20:37.000000000 +0400
@@ -38,6 +38,7 @@
#define HAVE_VDSO_SUPPORT 1
+#include <cstddef>
#include <stdlib.h> // for NULL
#include <link.h> // for ElfW
--- chromium/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h~ 2011-03-31 12:53:13.000000000 +0400
+++ chromium/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2011-03-31 12:53:32.000000000 +0400
@@ -39,6 +39,7 @@
#include <stddef.h> // for std::ptrdiff_t
#include <limits>
+#include <cstddef>
#include "base/logging.h"
--- chromium/src/third_party/tcmalloc/chromium/src/symbolize.h~ 2011-03-31 12:58:42.000000000 +0400
+++ chromium/src/third_party/tcmalloc/chromium/src/symbolize.h 2011-03-31 12:59:00.000000000 +0400
@@ -39,6 +39,7 @@
#endif
#include <stddef.h> // for NULL
#include <map>
+#include <cstddef>
using std::map;
--- chromium/src/third_party/tcmalloc/chromium/src/system-alloc.h~ 2011-03-31 13:01:01.000000000 +0400
+++ chromium/src/third_party/tcmalloc/chromium/src/system-alloc.h 2011-03-31 13:01:15.000000000 +0400
@@ -37,6 +37,7 @@
#define TCMALLOC_SYSTEM_ALLOC_H_
#include <config.h>
+#include <cstddef>
#include <stddef.h> // for size_t
class SysAllocator;
--- chromium/src/ppapi/cpp/paint_aggregator.h 2010-12-23 18:10:27.000000000 -0600
+++ chromium/src/ppapi/cpp/paint_aggregator.h 2011-04-19 05:34:56.085582885 -0500
@@ -5,6 +5,7 @@
#ifndef PPAPI_CPP_PAINT_AGGREGATOR_H_
#define PPAPI_CPP_PAINT_AGGREGATOR_H_
+#include <cstddef>
#include <stddef.h>
#include <vector>

3
chromium-icons.tar.bz2 Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c4d0115898a05eda80d3b1c291c9d9ee23d70db6b61411610a9b1fcbeaee40d2
size 96357

View File

@@ -0,0 +1,12 @@
diff -dupr a/src/chrome/browser/first_run.cc b/src/chrome/browser/first_run.cc
--- a/src/chrome/browser/first_run/first_run_gtk.cc 2010-03-10 10:21:33.000000000 -0700
+++ b/src/chrome/browser/first_run/first_run_gtk.cc 2010-03-10 13:08:12.000000000 -0700
@@ -63,7 +63,6 @@
FilePath FirstRun::MasterPrefsPath() {
// The standard location of the master prefs is next to the chrome binary.
FilePath master_prefs;
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
- return FilePath();
+ master_prefs = FilePath("/etc/chromium");
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
}

View File

@@ -0,0 +1,12 @@
diff -up chromium-20100218svn39394/src/build/all.gyp.no-courgette chromium-20100218svn39394/src/build/all.gyp
--- chromium-20100218svn39394/src/build/all.gyp.no-courgette 2010-02-19 16:03:23.305138076 -0500
+++ chromium-20100218svn39394/src/build/all.gyp 2010-02-19 16:03:42.426124248 -0500
@@ -81,7 +81,6 @@
['OS=="linux"', {
'dependencies': [
'../breakpad/breakpad.gyp:*',
- '../courgette/courgette.gyp:*',
'../dbus/dbus.gyp:*',
'../sandbox/sandbox.gyp:*',
],
diff -up chromium-20100218svn39394/src/chrome/chrome.gyp.no-courgette chromium-20100218svn39394/src/chrome/chrome.gyp

View File

@@ -0,0 +1,21 @@
--- chromium-20100218svn39394/src/chrome/browser/sync/util/sqlite_utils.cc.no-sqlite-debugging 2010-02-18 18:23:31.000000000 -0500
+++ chromium-20100218svn39394/src/chrome/browser/sync/util/sqlite_utils.cc 2010-02-19 15:40:50.338131672 -0500
@@ -33,8 +33,6 @@ class DebugSQLErrorHandler: public Vanil
public:
virtual int HandleError(int error, sqlite3* db) {
error_ = error;
- NOTREACHED() << "sqlite error " << error
- << " db " << static_cast<void*>(db);
return error;
}
};
@@ -280,8 +278,7 @@ int SQLStatement::prepare(sqlite3* db, c
DCHECK(!stmt_);
int rv = sqlite3_prepare_v2(db, sql, sql_len, &stmt_, NULL);
if (rv != SQLITE_OK) {
- SQLErrorHandler* error_handler = GetErrorHandlerFactory()->Make();
- return error_handler->HandleError(rv, db);
+ DLOG(ERROR) << "SQLStatement.prepare_v2 failed: " << sqlite3_errmsg(db);
}
return rv;
}

11
chromium-norpath.patch Normal file
View File

@@ -0,0 +1,11 @@
--- chromium/src/native_client/build/common.gypi.norpath 2009-12-16 10:15:46.000000000 -0500
+++ chromium/src/native_client/build/common.gypi 2009-12-16 10:15:52.000000000 -0500
@@ -511,7 +511,7 @@
# -rpath is only used when building with shared libraries.
'conditions': [
[ 'library=="shared_library"', {
- 'RPATH': '$LIB_DIR',
+ # 'RPATH': '$LIB_DIR',
}],
],
},

View File

@@ -0,0 +1,11 @@
--- chromium/src/remoting/remoting.gyp 2010-10-03 15:13:07.746440175 +0200
+++ chromium/src/remoting/remoting.gyp 2010-10-03 15:13:07.746440175 +0200
@@ -284,7 +284,7 @@
'../ui/ui.gyp:ui',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
- '../third_party/libvpx/libvpx.gyp:libvpx',
+ '../build/linux/system.gyp:libvpx',
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
'../third_party/zlib/zlib.gyp:zlib',
'../media/media.gyp:yuv_convert',

View File

@@ -0,0 +1,42 @@
diff -up chromium-5.0.358.0-20100318svn41971/src/chrome/browser/autofill/autofill_xml_parser.h.system-expat chromium-5.0.358.0-20100318svn41971/src/chrome/browser/autofill/autofill_xml_parser.h
--- chromium-5.0.358.0-20100318svn41971/src/chrome/browser/autofill/autofill_xml_parser.h.system-expat 2010-03-18 22:55:12.071283208 -0400
+++ chromium-5.0.358.0-20100318svn41971/src/chrome/browser/autofill/autofill_xml_parser.h 2010-03-18 22:55:27.671209061 -0400
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "chrome/browser/autofill/field_types.h"
#include "chrome/browser/autofill/form_structure.h"
-#include "third_party/expat/files/lib/expat.h"
+#include <expat.h>
#include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
// The base class that contains common functionality between
--- chromium-5.0.358.0-20100318svn41971/src/third_party/libjingle/source/talk/xmllite/xmlparser.h.system-expat 2010-03-18 22:55:12.071283208 -0400
+++ chromium-5.0.358.0-20100318svn41971/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2010-03-18 22:55:27.671209061 -0400
@@ -31,11 +31,7 @@
#include <string>
#include "talk/xmllite/xmlnsstack.h"
-#ifdef EXPAT_RELATIVE_PATH
-#include "expat.h"
-#else
-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
-#endif // EXPAT_RELATIVE_PATH
+#include <expat.h>
struct XML_ParserStruct;
typedef struct XML_ParserStruct* XML_Parser;
--- chromium-5.0.358.0-20100318svn41971/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h.system-expat 2010-03-18 22:55:12.071283208 -0400
+++ chromium-5.0.358.0-20100318svn41971/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2010-03-18 22:55:27.671209061 -0400
@@ -33,11 +33,7 @@
#include "talk/base/scoped_ptr.h"
#include "talk/xmllite/xmlparser.h"
-#ifdef EXPAT_RELATIVE_PATH
-#include "expat.h"
-#else
-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
-#endif // EXPAT_RELATIVE_PATH
+#include <expat.h>
namespace buzz {

View File

@@ -0,0 +1,46 @@
diff -up chromium-5.0.377.0-20100413svn44349/src/build/linux/system.gyp.GLEW chromium-5.0.377.0-20100413svn44349/src/build/linux/system.gyp
--- chromium-5.0.377.0-20100413svn44349/src/build/linux/system.gyp.GLEW 2010-04-13 11:36:47.300172139 -0400
+++ chromium-5.0.377.0-20100413svn44349/src/build/linux/system.gyp 2010-04-13 11:36:47.579173387 -0400
@@ -340,6 +340,42 @@
},
}]]
},
+ {
+ 'target_name': 'icu',
+ 'type': 'settings',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '-Wno-unused-function',
+ # TODO(port): fix ICU to not depend on this flag.
+ '-fno-strict-aliasing',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '',
+ ],
+ 'libraries': [
+ '-licui18n',
+ ],
+ },
+ }]]
+ },
+ {
+ 'target_name': 'glew',
+ 'type': 'settings',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'link_settings': {
+ 'libraries': [
+ '-lGLEW',
+ '-lGL',
+ '-lX11',
+ ],
+ },
+ }]]
+ },
{
'target_name': 'gnome_keyring',
'type': 'settings',

View File

@@ -0,0 +1,19 @@
diff -up chromium-20100315svn41580/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp.system-zlib chromium-20100315svn41580/src/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp
--- chromium-20100315svn41580/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp.system-zlib 2010-03-15 13:08:00.000000000 -0400
+++ chromium-20100315svn41580/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp 2010-03-15 13:10:34.697208907 -0400
@@ -855,6 +855,7 @@
'<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
'<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
'<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common',
+ '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib',
'<(libjpeg_gyp_path):libjpeg',
],
'export_dependent_settings': [
@@ -872,6 +873,7 @@
'<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
'<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
'<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common',
+ '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib',
'<(libjpeg_gyp_path):libjpeg',
],
# This is needed for mac because of webkit_system_interface. It'd be nice

11
chromium-vendor.patch.in Normal file
View File

@@ -0,0 +1,11 @@
--- src/webkit/glue/user_agent.cc
+++ src/webkit/glue/user_agent.cc
@@ -106,6 +106,7 @@ void BuildUserAgent(bool mimic_chrome1,
base::StringAppendF(
result,
"Mozilla/5.0 (%s%s) AppleWebKit/%d.%d"
- " (KHTML, like Gecko) %s Safari/%d.%d",
+ " (KHTML, like Gecko) %s Safari/%d.%d"
+ " SUSE/RPM_VERSION",
mimic_windows ? "Windows " : kUserAgentPlatform,
BuildOSCpuInfo().c_str(),

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a8bda77539363ea1effca1e77cf5c284aa310089de935483c8c41b83315d1974
size 251987473

471
chromium.changes Normal file
View File

@@ -0,0 +1,471 @@
-------------------------------------------------------------------
Wed Sep 14 11:30:06 UTC 2011 - tittiatcoke@gmail.com
- Update to 16.0.880
+ Print preview issues with self-closing popups have been fixed
+ Fixed many known stability issues.
+ Change chrome://crash (sad tab page) "Learn more" link to:
"If you're seeing this frequently, try these suggestions."
Link "these suggestions" to the "Learn more" help article.
+ Convert chrome://extensions to a settings page within the
options pages.
+ Beginnings of basic Focus and Key Events.
+ various bugfixes
-------------------------------------------------------------------
Sun Sep 3 17:39:50 UTC 2011 - tittiatcoke@gmail.com
- Update to 15.0.870
+ Fix the print preview regression bug
+ Enable low-latency audio by default
+ Add Indic IME support
+ Switch the native print path on Linux and ChromeOS to use Skia
instead of Cairo
+ Use 16x16 icons so they don't stretch
+ Turn client-side phishing detection on for non-UMA users
+ Fix a crash on Linux which occurs during drag drop operations
in the renderer
+ various bugfixes
-------------------------------------------------------------------
Wed Aug 24 17:53:51 UTC 2011 - tittiatcoke@gmail.com
- Update to 15.0.862
+ Fix pyauto autofill flakiness when submitting profile info via
webpage forms (issues: 90232,89784)
+ Get rid of static TabContentsView::Create function since the
interface is in content, but the implementations are in chrome.
(issue: 76697)
+ Suppress another race with KURLGooglePrivate + Workers.
(issue 93708)
+ Add a new content settings type AUTO-SELECT-CERTIFICATE. The
default value of the new content settings type AUTO-SELECT-CERTIFICATE
is CONTENT_SETTING_ASK
+ Add a policy for whitelisting origins for which client certificates
should be auto selected.
+ Add a policy to set a default setting for the auto select certificates
setting.
-------------------------------------------------------------------
Mon Aug 22 16:32:16 UTC 2011 - tittiatcoke@gmail.com
- Update to 15.0.860
-------------------------------------------------------------------
Sat Aug 20 20:47:53 UTC 2011 - tittiatcoke@gmail.com
- Update to 15.0.859
-------------------------------------------------------------------
Fri Aug 19 05:55:51 UTC 2011 - tittiatcoke@gmail.com
- Update to 15.0.857
+ Issue with the close tab button is fixed.
-------------------------------------------------------------------
Tue Aug 16 09:14:32 UTC 2011 - tittiatcoke@gmail.com
- Update to 15.0.854
- Enable build of sandbox client as that this is now mandatory
-------------------------------------------------------------------
Sun Aug 7 09:13:32 UTC 2011 - tittiatcoke@gmail.com
- Introduce an option to switch the password store for Chromium in
a more friendlier way, by using the update-alternatives. The user
has now the option to install a new package (chromium-desktop-kde
or chromium-desktop-gnome) and based on this the respective
password store is selected.
-------------------------------------------------------------------
Sat Aug 6 10:09:02 UTC 2011 - tittiatcoke@gmail.com
- Update to 15.0.846
-------------------------------------------------------------------
Sat Jul 30 08:12:51 UTC 2011 - tittiatcoke@gmail.com
- Update to 15.0.839
-------------------------------------------------------------------
Thu Jul 21 17:06:31 UTC 2011 - tittiatcoke@gmail.com
- Update to 14.0.829
-------------------------------------------------------------------
Sun Jul 17 09:15:18 UTC 2011 - tittiatcoke@gmail.com
- Update to 14.0.825
-------------------------------------------------------------------
Tue Jul 12 02:26:20 UTC 2011 - nmarques@opensuse.org
- Fix for bnc#705223:
+ Icons are installed in hicolor instead of oxygen, this ensures
compatibility with open Desktop standards.
+ Add GTK icon cache update for >= 1140 on %post and %postun.
+ Removed the .png in %{_datadir}/pixmaps as hicolor is a better
option.
+ Add hicolor-icon-theme to BuildRequires and Requires.
-------------------------------------------------------------------
Mon Jun 13 11:49:27 UTC 2011 - tittiatcoke@gmail.com
- Update to 14.0.792
-------------------------------------------------------------------
Mon Jun 6 08:47:30 UTC 2011 - tittiatcoke@gmail.com
- Update to 14.0.786
-------------------------------------------------------------------
Sat Jun 4 07:22:05 UTC 2011 - tittiatcoke@gmail.com
- Update to 14.0.785
-------------------------------------------------------------------
Sat May 28 20:05:21 UTC 2011 - tittiatcoke@gmail.com
- Update to 13.0.780
-------------------------------------------------------------------
Wed May 25 13:03:04 UTC 2011 - tittiatcoke@gmail.com
- Update to 13.0.777
+ Builds now based on system library for V8.
+ Removed Shared Library build due to errors. Everything is back
into one single binary
+ Added patchfile to build with GCC 4.6
-------------------------------------------------------------------
Sun May 15 12:49:33 UTC 2011 - tittiatcoke@gmail.com
- Update to 13.0.767
-------------------------------------------------------------------
Thu Apr 28 17:44:47 UTC 2011 - tittiatcoke@gmail.com
- Update to 13.0.751
-------------------------------------------------------------------
Fri Apr 22 06:23:09 UTC 2011 - tittiatcoke@gmail.com
- Update to 12.0.744
-------------------------------------------------------------------
Mon Apr 18 17:01:00 UTC 2011 - tittiatcoke@gmail.com
- Update to 12.0.741
- Include icon-set for Oxygen. (bnc#684728)
-------------------------------------------------------------------
Fri Apr 8 15:29:13 UTC 2011 - tittiatcoke@gmail.com
- Update to 12.0.731
-------------------------------------------------------------------
Sun Apr 3 15:30:49 UTC 2011 - tittiatcoke@gmail.com
- Update to 12.0.724
-------------------------------------------------------------------
Thu Mar 31 19:28:18 UTC 2011 - tittiatcoke@gmail.com
- Update to 12.0.721
-------------------------------------------------------------------
Mon Mar 28 18:26:22 UTC 2011 - tittiatcoke@gmail.com
- Update to 12.0.718
- Added conflict for xine-browser-plugin
-------------------------------------------------------------------
Wed Mar 16 05:15:44 UTC 2011 - tittiatcoke@gmail.com
- Update to 12.0.705
- Included option to detect the password store in /usr/bin/chromium
(options there are detect,default,gnome,kwallet)
-------------------------------------------------------------------
Fri Mar 11 08:42:36 UTC 2011 - tittiatcoke@gmail.com
- Update to 12.0.700
-------------------------------------------------------------------
Wed Mar 9 18:45:16 UTC 2011 - tittiatcoke@gmail.com
- Update to 11.0.698
-------------------------------------------------------------------
Fri Mar 4 08:08:57 UTC 2011 - tittiatcoke@gmail.com
- Update to 11.0.691
-------------------------------------------------------------------
Wed Mar 2 18:17:40 UTC 2011 - tittiatcoke@gmail.com
- Update to 11.0.688
-------------------------------------------------------------------
Sun Feb 27 09:05:00 UTC 2011 - tittiatcoke@gmail.com
- Update to 11.0.685
-------------------------------------------------------------------
Sun Feb 27 08:52:51 UTC 2011 - tittiatcoke@gmail.com
- Update to 11.0.683
* Chromium will now use the internal ICU libraries for all
openSUSE versions.
-------------------------------------------------------------------
Wed Feb 16 23:45:49 UTC 2011 - tittiatcoke@gmail.com
- Update to 11.0.674
-------------------------------------------------------------------
Tue Feb 15 18:37:51 UTC 2011 - tittiatcoke@gmail.com
- Update to 11.0.673
* For Factory the internal ICU libraries are used as that
Chromium does not build with the ones provided by Factory
-------------------------------------------------------------------
Wed Jan 19 13:23:13 UTC 2011 - prusnak@opensuse.org
- add more mimetypes to desktop file
-------------------------------------------------------------------
Sat Dec 25 09:40:13 UTC 2010 - rwooninck@opensuse.org
- update to 10.0.622.0
-------------------------------------------------------------------
Mon Oct 25 14:30:33 UTC 2010 - tittiatcoke@gmail.com
- Update to 9.0.564 build
* Added specific patches for MeeGo.
* We are now using shared libraries for Chromium
* Spec-file cleanup (Thanks to prusnak)
-------------------------------------------------------------------
Thu Jul 8 00:13:33 UTC 2010 - cristian.rodriguez@opensuse.org
- use jobs instead of a fixed numer of jobs, buildsystem may hang
-------------------------------------------------------------------
Wed Jul 7 20:10:06 UTC 2010 - cristian.rodriguez@opensuse.org
- workaround gcc bug, that produces extremely annoying
failure of the search bar.
-------------------------------------------------------------------
Mon May 24 01:17:14 UTC 2010 - cristian.rodriguez@opensuse.org
- do not include %{release} in RPM_VERSION that makes the
package to republish everytime to users even if there
are no code changes.
-------------------------------------------------------------------
Wed Mar 10 20:10:14 UTC 2010 - bgmerrell@novell.com
- Add master_preferences source file and install it to /etc/chromium.
- Create a new patch (chromium-master-prefs-path.patch) which tells
chromium to look in /etc/chromium for the master_preferences file
(instead of looking in the default directory, which is the same
directory as the 'chrome' binary).
-------------------------------------------------------------------
* Sun Mar 7 00:00:00 UTC 2010 - tititatcoke@gmail.com
- Update to 5.0.347
+ moved back to static binary again.
+ No longer depends on system v8
-------------------------------------------------------------------
* Mon Feb 21 00:00:00 UTC 2010 - tititatcoke@gmail.com
- Update to 5.0.341
+ remove courgette build and sources (patent issue)
+ Move to shared libraries build
+ Depends on system v8 again
-------------------------------------------------------------------
Sun Jan 24 21:42:27 UTC 2010 - prusnak@suse.cz
- added vendor to user agent (chromium-vendor.patch.in)
-------------------------------------------------------------------
Sun Nov 29 14:18:27 UTC 2009 - prusnak@suse.cz
- added --enable-sync to wrapper to enable bookmark sync
-------------------------------------------------------------------
* Sun Nov 29 00:00:00 UTC 2009 - tittiatcoke@gmail.com
- Update to 4.0.260
-------------------------------------------------------------------
* Fri Nov 27 00:00:00 UTC 2009 - tittiatcoke@gmail.com
- Update to 4.0.259
-------------------------------------------------------------------
* Thu Nov 26 00:00:00 UTC 2009 - tittiatcoke@gmail.com
- Update to 4.0.258
-------------------------------------------------------------------
* Tue Nov 24 00:00:00 UTC 2009 - tittatcoke@gmai.com
- In order to complete prevent the wrong v8 version to be used,
the Chromium build has been changed to having an built-in v8
-------------------------------------------------------------------
* Tue Nov 24 00:00:00 UTC 2009 - dbuck@example.com
- Re-base patches.
- Fixed a few patch errors.
- Rename some patches to better correspond with function.
- Removed some patches.
- Minor SPEC changes.
- I changed the v8 requirement to be exact, instead of greater than a specific version.
-------------------------------------------------------------------
Fri Nov 13 20:34:05 UTC 2009 - tittiatcoke@gmail.com
- update to 247.0 svn 31928
-------------------------------------------------------------------
Fri Oct 30 13:58:11 UTC 2009 - tittiatcoke@gmail.com
- update to 229.0 svn 30454
+ Fix regression where popups and app frames lost their titlebars.
+ Makes it so that when a folder is open on the bookmark bar
and the mouse moves over another folder, the menu for that
folder is shown.
+ Lazily create the find bar.
+ Polish to the gmail checker sample.
* New, crisper icons that are exactly 19x19
* Add a loading animation at the beginning before Gmail
responds.
* Fix a bug where we sometimes don't update the UI after a
logout/login cycle.
+ Refactor widget methods to support desktop notifications,
including GTK stubs.
+ Find-in-page should not ding while deleting characters.
+ Add SSL wrapper for linux and mac. This allows notifier to
use chrome's SSL layer instead of OpenSSL.
+ Add three of the six extensions to PAC that Internet Explorer supports.
+ WebSocket support in chromium. (Run with --enable-web-sockets
enables WebSocket features.)
+ Do not allow GTK File Chooser dialogs to return directories.
+ Fix the notifier SSL layer to make notifications work for
Linux Bookmark sync.
+ linux: don't override mouse selection behavior in omnibox
-------------------------------------------------------------------
Sun Oct 25 08:37:29 UTC 2009 - tittiatcoke@gmail.com
- Update to 224.4 svn 30027
+ First cut at new page and browser action docs based
on new API. Deleted old stuff.
+ Add suppression for new memory leak caused by WebKit merge 49830:49844
+ Cleanup: change PIDs to base::ProcessId (or pid_t, as appropriate)
+ Minimize dependency of user scripts
+ Fixup the flip_framer eof-handling semantics now that we have
the FIN bit in place
+ app depends on x11 because of active_window_watcher_x
+ Adding two images for the new Extension managment UI
+ Removing hard-coded Chrome Frame output path
+ Rearrange clipboard code
+ Fix crash bug when attempting to download a url with unsupported scheme,
e.g. 'data:', by 'Alt + Click'
+ GTK: Change text for extension download UI
+ Ignore invalid urls on command line
+ Make dropped tabs animate from where they were dropped.
+ Make room for the full width of the tab placeholder.
+ Make tab dragging as smooth as glass.
+ Remove an annoying NOTIMPLEMNETED
+ Extensions: guarantee removal of BROWSER_WINDOW_READY registration
+ If we're in the middle of a drag, don't allow the user to middle
click to close or right click for the context menu
+ "Fix" a NOTIMPLEMENTED on Linux by using the default password store
+ Remove +x bit from files that shouldn't have it
+ Fold first 3 channels of multichannel instead of 5. Use fixed point
+ Adding new image needed for the managment UI
+ Fix a race bug where content scripts would not apply to the first page load
+ Make escape remove a bookmark if it's just been added (but not if it already existed)
+ Fix bubbles deactivating the opaque frame
+ Allow ESC to cancel ALT+SHIFT+T in Toolbar
+ ake all pepper plugins default to windowless and transparent
+ Add styles for printing
+ Implement the new extension management UI
+ Add support for to automation interface load install and load extensions
+ GTK: theme the info bar border
+ Update V8 to version 1.3.16.1
+ Introduce WebSecurityPolicy for security related methods
+ New button scheme...borders are separate from the inner contents so
that they can be highlighted / depressed independently
+ When opening Chrome maximized with an application window already
running, the Chrome window was not activated
+ Fix compatibility problems with FileZilla FTP Server
+ Remove the extension shelf on Linux
+ Fix the proxy host and port string to start with http:// if it does not already
+ Enable HTML5 databases for all extension renderer processes
-------------------------------------------------------------------
* Sat Oct 24 00:00:00 UTC 2009 - prusnak@opensuse.org
- don't create desktop files in wrapper
- fix LD_LIBRARY_PATH (chromium-fix-wrapper.patch)
-------------------------------------------------------------------
* Tue Oct 20 00:00:00 UTC 2009 - tittiatcoke@gmail.com
- update to newer svn snapshot
+ Obsoletes fwrite patch (included upstream)
-------------------------------------------------------------------
* Fri Oct 16 00:00:00 UTC 2009 - tittiatcoke@gmail.com
- update to newer svn snapshot
+ Requires newer version of v8
-------------------------------------------------------------------
* Thu Oct 15 00:00:00 UTC 2009 - prusnak@suse.cz
- do not force SSE on x86 (drop-sse.patch)
-------------------------------------------------------------------
* Tue Oct 13 00:00:00 UTC 2009 - tittiatcoke@gmail.com
- Update to newer svn snapshot
- Fixed spec file in order to build
- Included patch to build with system zlib
-------------------------------------------------------------------
* Mon Oct 12 00:00:00 UTC 2009 - prusnak@suse.cz
- package renamed to chromium
- cleaned up spec file
-------------------------------------------------------------------
* Tue Oct 6 00:00:00 UTC 2009 - dbuck@example.com
- v8 is now built as a separate package, and is required
- included many patches to use system libraries:
v8, icu, libxml2, libxslt, libjpeg, libpng, libevent, bzip2, zlib, nspr, nss
-------------------------------------------------------------------
* Sun Oct 1 00:00:00 UTC 2009 - dbuck@example.com
- included a newer DEP than is in svn, native_client@823
- things should compile cleanly now
-------------------------------------------------------------------
* Sun Aug 31 00:00:00 UTC 2009 - dbuck@example.com
- initial build

1
chromium.easy Normal file
View File

@@ -0,0 +1 @@
/usr/lib/chrome_sandbox root.root 4755

420
chromium.spec Normal file
View File

@@ -0,0 +1,420 @@
#
# spec file for package chromium
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define svn_rev 100708
%define v8_ver 3.6.2.0
Name: chromium
Version: 16.0.880.0
Release: 1
License: BSD-3-Clause and LGPL-2.1+
Summary: Google's opens source browser project
Group: Productivity/Networking/Web/Browsers
Url: http://code.google.com/p/chromium/
Source0: %{name}.%{version}.svn%{svn_rev}.tar.lzma
Source8: ffmpeg-0.6-headers.tar.bz2
Source20: chromium-vendor.patch.in
Source30: master_preferences
Source31: default_bookmarks.html
Source99: chrome-wrapper
Source100: chromium-browser.sh
Source101: chromium-browser.desktop
Source102: chromium-browser.xml
Source104: chromium-icons.tar.bz2
Provides: chromium-browser = %{version}
Provides: chromium-based-browser = %{version}
Obsoletes: chromium-browser < %{version}
Conflicts: xine-browser-plugin
## Start Patches
# Many changes to the gyp systems so we can use system libraries
# PATCH-FIX-OPENSUSE Fix build with GCC 4.6
Patch1: chromium-gcc46.patch
# PATCH-FIX-OPENSUSE disable debug for sqlite
Patch4: chromium-no-sqlite-debug.patch
# PATCH-FIX-OPENSUSE patches in system zlib library
Patch8: chromium-codechanges-zlib.patch
# PATCH-FIX-OPENSUSE removes build part for courgette
Patch13: chromium-no-courgette.patch
# PATCH-FIX-OPENSUSE enables reading of the master preference
Patch14: chromium-master-prefs-path.patch
# PATCH-FIX-OPENSUSE patches in system glew library
Patch17: chromium-system-glew.patch
# PATCH-FIX-OPENSUSE patches in system expat library
Patch18: chromium-system-expat.patch
# PATCH-FIX-OPENSUSE further changes to work with system zlib library
Patch19: chromium-system-zlib.patch
# PATCH-FIX-OPENSUSE disables the requirement for ffmpeg
Patch20: chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch
# PATCH-FIX-OPENSUSE ensure that all media formats are being recognized
Patch21: chromium-7.0.542.0-media-probe.patch
# PATCH-FIX-OPENSUSE disable the use of tcmallic function
Patch25: tcmalloc-factory.patch
# PATCH-FIX-OPENSUSE make sure that Chrome remoting is linking against the system libvpx
Patch26: chromium-remoting-build-fix.diff
# PATCH-FIX-OPENSUSE patches in system speex library
Patch28: chromium-7.0.500.0-system-speex.patch
# PATCH-FIX-OPENSUSE patches in the system libvpx library
Patch32: chromium-7.0.542.0-system-libvpx.patch
# PATCH-FIX-OPENSUSE further changes to ensure working with the system minizip and v8 libraries
Patch34: chromium-7.0.542.0-codechanges-system-minizip-v8.patch
# PATCH-FIX-OPENSUSE remove the rpath in the libraries
Patch62: chromium-norpath.patch
# PATCH-FIX-OPENSUSE patches in the system v8 library
Patch63: chromium-6.0.406.0-system-gyp-v8.patch
BuildRequires: Mesa-devel
BuildRequires: alsa-devel
BuildRequires: bison
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: freetype2-devel
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: gperf
BuildRequires: hunspell-devel
BuildRequires: libbz2-devel
BuildRequires: libevent
BuildRequires: libexpat-devel
BuildRequires: libgnutls-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: libvpx-devel
BuildRequires: libxslt-devel
BuildRequires: libzip-devel
BuildRequires: lzma
BuildRequires: mozilla-nspr-devel
BuildRequires: mozilla-nss-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: perl(Switch)
BuildRequires: pkg-config
BuildRequires: pkgconfig(cairo) >= 1.6
BuildRequires: pkgconfig(dbus-1)
BuildRequires: dbus-1-glib-devel
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: python
BuildRequires: python-xml
BuildRequires: sqlite3-devel
BuildRequires: update-desktop-files
BuildRequires: v8-devel = %{v8_ver}
BuildRequires: wdiff
BuildRequires: zlib-devel
BuildRequires: libpulse-devel
BuildRequires: libelf-devel
%if 0%{?suse_version} > 1120
BuildRequires: libgnome-keyring-devel
%else
BuildRequires: gnome-keyring-devel
%endif
%if 0%{?suse_version} > 1130
BuildRequires: python-devel
%endif
%if 0%{?suse_version} >= 1110
BuildRequires: libevent-devel
BuildRequires: libicu-devel >= 4.0
%endif
BuildRequires: speex-devel
BuildRequires: hicolor-icon-theme
Requires: alsa
Requires: xdg-utils
Requires: libv8-3 = %{v8_ver}
Requires: hicolor-icon-theme
Requires: update-alternatives
PreReq: permissions
Recommends: Chromium-password
Requires: %{name}-suid-helper
# Recommends the chromium-ffmpeg library (available from packman)
Recommends: chromium-ffmpeg = %{version}
%if 0%{?suse_version} < 1120
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%endif
%description
Chromium is the open-source project behind Google Chrome. We invite you to join us in our effort to help build a safer, faster, and more stable way for all Internet users to experience the web, and to create a powerful platform for developing a new generation of web applications.
%package desktop-kde
Summary: Update to chromium to use KDE's kwallet to store passwords
Group: Productivity/Networking/Web/Browsers
Supplements: packageand(chromium:kdebase4-session)
Conflicts: chromium-desktop-gnome
Provides: Chromium-password
%description desktop-kde
By using the openSUSE update-alternatives the password store for Chromium is changed to utilize
KDE's kwallet. Please be aware that by this change the old password are no longer accessible and
are also not converted to kwallet.
%package desktop-gnome
Summary: Update to chromium to use Gnome keyring to store passwords
Group: Productivity/Networking/Web/Browsers
Supplements: packageand(chromium:gnome-session)
Conflicts: chromium-desktop-kde
Provides: Chromium-password
%description desktop-gnome
By using the openSUSE update-alternatives the password store for Chromium is changed to utilize
Gnome's Keyring. Please be aware that by this change the old password are no longer accessible and
are also not converted to Gnome's Keyring.
%package suid-helper
Summary: A suid helper to let a process willingly drop privileges on Linux
Url: http://code.google.com/p/setuid-sandbox/
Group: Productivity/Networking/Web/Browsers
%description suid-helper
t will allow a process to execute a target executable that will be able to drop privileges:
* The suid sandbox will create a new PID namespace or will switch uid/gid to isolate the process
* a helper process, sharing the filesystem view of the existing process, will be created. It
will accept a request to chroot() the process to an empty directory
This is convenient because an executable can be launched, load libraries and open files and get
chroot()-ed to an empty directory when it wants to drop filesystem access.
%prep
lzma -cd %{SOURCE0} | tar xf -
%setup -D -T -n %{name}-suse
%patch1 -p1
%patch62 -p1
%patch63 -p1
%patch8 -p1
%patch13 -p1
%patch14 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch25 -p1
%patch26 -p1
%patch28 -p1
%patch32 -p1
%patch34 -p1
%patch4 -p1
pushd src/third_party/ffmpeg/
tar xf %{SOURCE8}
popd
# apply vendor patch after substitution
sed "s:RPM_VERSION:%{version}:" %{SOURCE20} | patch -p0
# Make sure that the requires legal files can be found
cp -a src/AUTHORS src/LICENSE .
ls -l /usr/src/packages/BUILD/chromium-suse/src/native_client/toolchain/linux_x86_newlib/bin/
%build
## create make files
PARSED_OPT_FLAGS=`echo \'%{optflags} -DUSE_SYSTEM_LIBEVENT -fPIC -fno-ipa-cp -fno-strict-aliasing \' | sed "s/ /',/g" | sed "s/',/', '/g"`
for i in src/build/common.gypi; do
sed -i "s|'-march=pentium4',||g" $i
sed -i "s|'-mfpmath=sse',||g" $i
sed -i "s|'-O<(debug_optimize)',||g" $i
sed -i "s|'-m32',||g" $i
sed -i "s|'-fno-exceptions',|$PARSED_OPT_FLAGS|g" $i
sed -i "s|'-Werror'|'-Wno-error'|g" $i
done
# '
pushd src
./build/gyp_chromium -f make build/all.gyp \
-Dlinux_sandbox_path=%{_prefix}/lib/chrome_sandbox \
-Dlinux_sandbox_chrome_path=%{_libdir}/chromium/chromium \
-Duse_openssl=0 \
-Duse_system_ffmpeg=1 \
-Duse_system_zlib=1 \
-Duse_system_libpng=1 \
-Duse_system_bzip2=1 \
-Duse_system_libbz2=1 \
-Duse_system_libjpeg=1 \
-Duse_system_libxml=1 \
-Duse_system_libxslt=1 \
-Duse_system_libevent=1 \
-Duse_system_vpx=1 \
-Dremove_webcore_debug_symbols=1 \
-Duse_system_v8=1 \
-Dproprietary_codecs=1 \
-Ddisable_nacl=1 \
-Djavascript_engine=v8 \
-Dlinux_fpic=1 \
-Ddisable_sse2=1 \
%ifarch x86_64
-Dtarget_arch=x64 \
%endif
-Dno_strict_aliasing=1 \
-Drelease_extra_cflags=-fPIC
make -r %{?_smp_mflags} chrome V=1 BUILDTYPE=Release disable_nacl=1
# Build the required SUID_SANDBOX helper.
make -r %{?_smp_mflags} chrome_sandbox V=1 BUILDTYPE=Release disable_nacl=1
popd
%install
mkdir -p %{buildroot}%{_libdir}/chromium/
%ifarch x86_64
mkdir -p %{buildroot}%{_prefix}/lib/
%endif
install -m 755 %{SOURCE100} %{buildroot}%{_libdir}/chromium/chromium-generic
# x86_64 capable systems need this
sed -i "s|/usr/lib/chromium|%{_libdir}/chromium|g" %{buildroot}%{_libdir}/chromium/chromium-generic
# For now disable the sandbox in awaitance of Security approval
sed -i "s|exec \$LIBDIR/\$APPNAME|exec \$LIBDIR/\$APPNAME \"--no-sandbox\"|g" %{buildroot}%{_libdir}/chromium/chromium-generic
#update the password-store settings for each alternative
sed "s|password-store=detect|password-store=kwallet|g" %{buildroot}%{_libdir}/chromium/chromium-generic > %{buildroot}%{_libdir}/chromium/chromium-kde
sed "s|password-store=detect|password-store=gnome|g" %{buildroot}%{_libdir}/chromium/chromium-generic > %{buildroot}%{_libdir}/chromium/chromium-gnome
mkdir -p %{buildroot}%{_mandir}/man1/
pushd src/out/Release
cp -a chrome_sandbox %{buildroot}%{_prefix}/lib/
cp -a chrome.pak locales xdg-mime xdg-settings %{buildroot}%{_libdir}/chromium/
cp -a resources.pak %{buildroot}%{_libdir}/chromium/
cp -a chrome %{buildroot}%{_libdir}/chromium/chromium
cp -a chrome.1 %{buildroot}%{_mandir}/man1/chrome.1
cp -a chrome.1 %{buildroot}%{_mandir}/man1/chromium.1
%fdupes %{buildroot}%{_mandir}/man1/
popd
mkdir -p %{buildroot}%{_datadir}/icons/
pushd %{buildroot}%{_datadir}/icons/
tar -xjf %{SOURCE104}
mv oxygen hicolor
popd
mkdir -p %{buildroot}%{_datadir}/applications/
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE101}
mkdir -p %{buildroot}%{_datadir}/gnome-control-center/default-apps/
cp -a %{SOURCE102} %{buildroot}%{_datadir}/gnome-control-center/default-apps/
# link to browser plugin path. Plugin patch doesn't work. Why?
mkdir -p %{buildroot}%{_libdir}/browser-plugins
pushd %{buildroot}%{_libdir}/%{name}
ln -s %{_libdir}/browser-plugins plugins
# Install the master_preferences file
mkdir -p %{buildroot}%{_sysconfdir}/%{name}
install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/%{name}
install -m 0644 %{SOURCE31} %{buildroot}%{_sysconfdir}/%{name}
%clean
rm -rf %{buildroot}
%pre
if [ -f %{_bindir}/chromium -a ! -L %{_bindir}/chromium ] ; then rm -f %{_bindir}/chromium
fi
# Add snipplets to update the GTK cache on package install.
%if 0%{?suse_version} >= 1140
%post
%icon_theme_cache_post
update-alternatives --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-generic 10
%set_permissions %{_prefix}/lib/chrome_sandbox
%postun
%icon_theme_cache_postun
update-alternatives --remove all chromium
%endif
%if 0%{?suse_version} < 1140
%post
update-alternatives --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-generic 10
%set_permissions %{_prefix}/lib/chrome_sandbox
%postun
update-alternatives --remove all chromium
%endif
%post desktop-kde
update-alternatives --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-kde 15
update-alternatives --auto chromium
%postun desktop-kde
update-alternatives --remove %{_bindir}/chromium %{_libdir}/chromium/chromium-kde
update-alternatives --auto chromium
%post desktop-gnome
update-alternatives --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-gnome 15
update-alternatives --auto chromium
%postun desktop-gnome
update-alternatives --remove %{_bindir}/chromium %{_libdir}/chromium/chromium-gnome
update-alternatives --auto chromium
%verifyscript
%verify_permissions -e %{_prefix}/lib/chrome_sandbox
# Files!
%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE
%config %{_sysconfdir}/%{name}
%dir %{_datadir}/gnome-control-center
%dir %{_datadir}/gnome-control-center/default-apps
%dir %{_libdir}/chromium/
%{_libdir}/chromium/chromium
%{_libdir}/chromium/chromium-generic
%{_libdir}/chromium/plugins/
%{_libdir}/chromium/locales/
%{_libdir}/chromium/xdg-settings
%{_libdir}/chromium/xdg-mime
%{_libdir}/chromium/*.pak
%{_mandir}/man1/chrom*
%{_datadir}/applications/*.desktop
%{_datadir}/gnome-control-center/default-apps/chromium-browser.xml
%{_datadir}/icons/hicolor/
%files desktop-kde
%attr(755, root, root) %{_libdir}/chromium/chromium-kde
%files desktop-gnome
%attr(755, root, root) %{_libdir}/chromium/chromium-gnome
%files suid-helper
%defattr(-,root,root,-)
%verify(not mode) %{_prefix}/lib/chrome_sandbox
%changelog

38
default_bookmarks.html Normal file
View File

@@ -0,0 +1,38 @@
<!DOCTYPE NETSCAPE-Bookmark-file-1>
<!-- This is an automatically generated file.
It will be read and overwritten.
DO NOT EDIT! -->
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
<TITLE>Bookmarks</TITLE>
<H1>Bookmarks Menu</H1>
<DL><p>
<DT><A HREF="place:folder=BOOKMARKS_MENU&folder=UNFILED_BOOKMARKS&folder=TOOLBAR&sort=12&excludeQueries=1&excludeItemIfParentHasAnnotation=livemark%2FfeedURI&maxResults=10&queryType=1">Recently Bookmarked</A>
<DT><A HREF="place:sort=14&type=6&maxResults=10&queryType=1">Recent Tags</A>
<HR>
<DT><A HREF="http://en-us.add-ons.mozilla.com/en-US/firefox/bookmarks/" ADD_DATE="1273256552" LAST_MODIFIED="1273256552" ICON_URI="http://www.mozilla.org/2005/made-up-favicon/0-1273256552642492" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADGUlEQVQ4jXWTXUxTZxjH33jBhRfGkGXGEC+M8dYbL7z0eiZL5sWJQqJuwnAz26CKxgrGN1Iwa/lwCVmDDJBZQNsdYlCraGlUSu0X/ZDak67tWmxpWjh9Szk9tJue/ncBG6LbL/nfPf/f81y8LyEf0EjpdpVGU9Ok0x1o6tQdaurUHfq2Q3eg4XLHrs8b6fYP59+Dbmvu6N19pd9QN2wRUg/9mbcvYhKskVXcdaTfdt97HT+j/fUIp6LVhNBtH5VVmp6aLpOdfxFllbnFEjypNbjeyLDFi7BGJDwWChh1ZZSWgZmR2ssdu7ZIvmymO3sn5qZ8iyXMZ8oIZsuYz5ThS5fgSsqYiRVhCUt4ECyA9zNcvOUw156nnxBCCOE4WqX++f4XjgUJrzJlCMtlhHN/YirEYA7mMBkQMZuQYY1IMIcKmAjkcdu5jHqtieM4WkXqVbT6l+lowrtYQjC7Xo7l/8JTgeEfhEwJ1uimYNzDcNUUTB5toZ+Ss63de8wB8Z0ntYb5TBlTrxmeCAxToa2C6XAB5lAB/Iagz5JSjl1o30ca2nR7n0clOJMyfOkSzMEc/g93ogjezzDqZhiwZVH3Q/t+0tCi2/tUWIEtXoQzuYbJgAhFqUBRlI/ijBdh9DIY3DkM2JbWBd+0amp475JijUqYiRUxm5BhXyiC9y3/u9mblOFOyJiNSRj3MIw4RfxkSSnHz2r2EE5Fq/WPf889EgqwhCVMRyRYoxLuupdQqQCVCuBKyJgI5HFnjuG2K4chu4h2PsS4elpNOI5Wnes1dfIBhgfBFZhDhY2swp2Q4YxLsP8h4c7c+unDL0XctGVxRmvScRytIoQQclKlqek0+sK8n4EP5DGxkd/8DEYvw5h7szwwu4w2g2fh2IX2fVue8lfqnsPXxpzBEXu2Mu5hGPMwjLpzMLhyGHGIGHopQv88jVaDI16n1h7h6Mb29yV157sONncZ+7vuR/L6Z2ll2CFi0C6iz7Ko/DgpFL/rNhpr1drD/1He5LPv6Y4Tl25w9Vf62r6mN/WNmsH+01f110+qe06t/8St/A10n5SW/zQjywAAAABJRU5ErkJggg==">Get Bookmark Add-ons</A>
<DT><H3 ADD_DATE="1273256552" LAST_MODIFIED="1273256742" PERSONAL_TOOLBAR_FOLDER="true">Bookmarks Toolbar</H3>
<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
<DL><p>
<DT><H3 ADD_DATE="1273256552" LAST_MODIFIED="1273256552">openSUSE</H3>
<DL><p>
<DT><A HREF="http://www.opensuse.org/" ADD_DATE="1273256552" LAST_MODIFIED="1273256552" ICON_URI="http://www.opensuse.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABSklEQVQ4jZWToY6EMBCGeRlegCfgBfYJEGg0CQZbu+IQSJAoEtyFChIQGwIC0YRwSQXJgkAgFoFY859qc9wBu9dkxCTtN/1n/lEAmH5twK8NRMxB3ofgc4k3j6lUY4zr7QKbqn/Crw2k3MOwtIcEZe/hXpBCR8o9rM/H/wBupiFiDoLGgptpcDMN1Ri/B7jeLmATRdBYiJgDNlEpd17vrwF8Ljf9ENVtqiJizjlANNCmKoLGAp9LkELfQNfn4xhACl1WO/pVNcZbACn0zeVqjOHXhsyFT0QeNNYWkHIPbKIS5GaaNBafSynpZ8ENwM00Oeszg4kezet9vwdi9sPSYlha5H0ovSCcWY0xko68NhIpdCQdQco9pNxDxBy4mQabqsj78H0r/46gsc7HeCZNuBAAlM+vD7MaY6TcQ9IRiNX2a0NqzvvwaCPNb8+My7ifNoCEAAAAAElFTkSuQmCC" LAST_CHARSET="UTF-8">openSUSE</A>
<DT><A HREF="http://en.opensuse.org/documentation/" ADD_DATE="1273256552" LAST_MODIFIED="1273256552" ICON_URI="http://www.mozilla.org/2005/made-up-favicon/2-1273256552647245" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABSklEQVQ4jZWToY6EMBCGeRlegCfgBfYJEGg0CQZbu+IQSJAoEtyFChIQGwIC0YRwSQXJgkAgFoFY859qc9wBu9dkxCTtN/1n/lEAmH5twK8NRMxB3ofgc4k3j6lUY4zr7QKbqn/Crw2k3MOwtIcEZe/hXpBCR8o9rM/H/wBupiFiDoLGgptpcDMN1Ri/B7jeLmATRdBYiJgDNlEpd17vrwF8Ljf9ENVtqiJizjlANNCmKoLGAp9LkELfQNfn4xhACl1WO/pVNcZbACn0zeVqjOHXhsyFT0QeNNYWkHIPbKIS5GaaNBafSynpZ8ENwM00Oeszg4kezet9vwdi9sPSYlha5H0ovSCcWY0xko68NhIpdCQdQco9pNxDxBy4mQabqsj78H0r/46gsc7HeCZNuBAAlM+vD7MaY6TcQ9IRiNX2a0NqzvvwaCPNb8+My7ifNoCEAAAAAElFTkSuQmCC" LAST_CHARSET="UTF-8">openSUSE Documentation</A>
<DT><A HREF="http://software.opensuse.org/" ADD_DATE="1273256552" LAST_MODIFIED="1273256552" ICON_URI="http://www.mozilla.org/2005/made-up-favicon/3-1273256552648253" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABSklEQVQ4jZWToY6EMBCGeRlegCfgBfYJEGg0CQZbu+IQSJAoEtyFChIQGwIC0YRwSQXJgkAgFoFY859qc9wBu9dkxCTtN/1n/lEAmH5twK8NRMxB3ofgc4k3j6lUY4zr7QKbqn/Crw2k3MOwtIcEZe/hXpBCR8o9rM/H/wBupiFiDoLGgptpcDMN1Ri/B7jeLmATRdBYiJgDNlEpd17vrwF8Ljf9ENVtqiJizjlANNCmKoLGAp9LkELfQNfn4xhACl1WO/pVNcZbACn0zeVqjOHXhsyFT0QeNNYWkHIPbKIS5GaaNBafSynpZ8ENwM00Oeszg4kezet9vwdi9sPSYlha5H0ovSCcWY0xko68NhIpdCQdQco9pNxDxBy4mQabqsj78H0r/46gsc7HeCZNuBAAlM+vD7MaY6TcQ9IRiNX2a0NqzvvwaCPNb8+My7ifNoCEAAAAAElFTkSuQmCC" LAST_CHARSET="UTF-8">openSUSE Download</A>
<DT><A FEEDURL="http://news.opensuse.org/?feed=rss2" HREF="http://news.opensuse.org/">openSUSE News</A>
<DT><A HREF="http://wiki.opensuse.org/Portal:How_to_participate" ADD_DATE="1273256552" LAST_MODIFIED="1273256552" ICON_URI="http://www.mozilla.org/2005/made-up-favicon/4-1273256552650167" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABSklEQVQ4jZWToY6EMBCGeRlegCfgBfYJEGg0CQZbu+IQSJAoEtyFChIQGwIC0YRwSQXJgkAgFoFY859qc9wBu9dkxCTtN/1n/lEAmH5twK8NRMxB3ofgc4k3j6lUY4zr7QKbqn/Crw2k3MOwtIcEZe/hXpBCR8o9rM/H/wBupiFiDoLGgptpcDMN1Ri/B7jeLmATRdBYiJgDNlEpd17vrwF8Ljf9ENVtqiJizjlANNCmKoLGAp9LkELfQNfn4xhACl1WO/pVNcZbACn0zeVqjOHXhsyFT0QeNNYWkHIPbKIS5GaaNBafSynpZ8ENwM00Oeszg4kezet9vwdi9sPSYlha5H0ovSCcWY0xko68NhIpdCQdQco9pNxDxBy4mQabqsj78H0r/46gsc7HeCZNuBAAlM+vD7MaY6TcQ9IRiNX2a0NqzvvwaCPNb8+My7ifNoCEAAAAAElFTkSuQmCC" LAST_CHARSET="UTF-8">How To participate in openSUSE</A>
<DT><A HREF="http://forums.opensuse.org/" ADD_DATE="1273256552" LAST_MODIFIED="1273256552" ICON_URI="http://www.mozilla.org/2005/made-up-favicon/5-1273256552651242" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABSklEQVQ4jZWToY6EMBCGeRlegCfgBfYJEGg0CQZbu+IQSJAoEtyFChIQGwIC0YRwSQXJgkAgFoFY859qc9wBu9dkxCTtN/1n/lEAmH5twK8NRMxB3ofgc4k3j6lUY4zr7QKbqn/Crw2k3MOwtIcEZe/hXpBCR8o9rM/H/wBupiFiDoLGgptpcDMN1Ri/B7jeLmATRdBYiJgDNlEpd17vrwF8Ljf9ENVtqiJizjlANNCmKoLGAp9LkELfQNfn4xhACl1WO/pVNcZbACn0zeVqjOHXhsyFT0QeNNYWkHIPbKIS5GaaNBafSynpZ8ENwM00Oeszg4kezet9vwdi9sPSYlha5H0ovSCcWY0xko68NhIpdCQdQco9pNxDxBy4mQabqsj78H0r/46gsc7HeCZNuBAAlM+vD7MaY6TcQ9IRiNX2a0NqzvvwaCPNb8+My7ifNoCEAAAAAElFTkSuQmCC" LAST_CHARSET="UTF-8">openSUSE Forums</A>
<DT><A FEEDURL="http://www.planetsuse.org/rss20.xml" HREF="http://planet.opensuse.org/">Planet SUSE</A>
</DL><p>
<DT><A FEEDURL="http://en-us.fxfeeds.mozilla.com/en-US/firefox/headlines.xml" HREF="http://news.bbc.co.uk/go/rss/-/2/hi/default.stm">Latest Headlines</A>
<HR>
<DT><H3 ADD_DATE="1273256722" LAST_MODIFIED="1273256951">Chromium</H3>
<DL><p>
<DT><A HREF="http://dev.chromium.org/for-testers/bug-reporting-guidelines" ADD_DATE="1273256788" ICON_URI="http://www.gstatic.com/sites/p/0d68f1/system/app/images/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC3ElEQVQ4jW3S3WtTBxiA8dz4B3inNwNvTJ3YDmstWHGotNVMWcsqRNm60Q8ZQ9FdbKDsZgOhoBOGC/Qj0NJSMB6wJqsm5ixZT0J6TrO1VYaBUpNjzrGH1PQkbdeUJP14vNCmluWF9/aBH+9rWbSdxTxzhvmGBrSTJ5k9fpx/a48yVX2Y6CdVKJWHUKoqeVBRgaXcpBsbKbx8Se7FC8xgEH1wkFBVJU8PHmT0QAUjFVYe7N/Pfau1fOD1qVM8bmujfaaD9lgbl5+38d1kB9eVTr4Pd3L1r1a+9V+i03uBjtEvaBlo3BkyDANJkvjq2UXS+TfoOY3nC//gnnXR7rtA65PPufj0HHavDfuTs3zmPLEzoOs6gUCAS1ITXwab+drXTMdoM60Pz9N8/zQNA3V82ltL3e811N2t5sTtmp2BZDJJMBjEMAwAFEWhezJL39QifVOL9E4u0j2ZxfF3hp/H3vBTIMW1xzpXPEmO/TaORVVVRFFE13UA+vv7uRfNkiuss/J+/8uv8eeMyQ/e11z1vKJdmOUb1wxH7oSwJBIJRFEkmUwCEIlE6IoscCuU5pexFDf8c/zo07niSWDrm+K0Q6H21zBH7khU3w5hicfj+Hw+VFUFwOl0ljgfzsbGBsVikXw+TzabJZPJEIlE3hH8fj+JRAKAUChU4ni9XjY3N7Hb7bS0tNDU1ITNZqO+vp50Ok00GsUSi8UQBIF4PE6xWKSnp6fEAVhbW6NQKLCyssLS0hKmaZJKpTAMA1mWty+iqir5fB5Jkkocj8fD6uoqLpeLoaEhNE1Dv3mTwJ49fNQ1ztiYtB2IxWJMT08zMjJS4qyvr7O8vIxpmszPz6NpGuNWKw937WJv5GO8fm/5997iCIKAaZo4nU4cDgeappH7w0JmyMJu/z4euR+VD2xxcrkcqVSKubk5NE373wqCUD6wxZmYmECWZRRFQZZlZFkmHA4jiiJut5vh4WHeAhqappiWhSp5AAAAAElFTkSuQmCC">Bug Life Cycle and Reporting Guidelines (The Chromium Projects)</A>
<DT><A HREF="http://code.google.com/chromium/" ADD_DATE="1273256762" ICON_URI="http://code.google.com/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADRUlEQVQ4jSXT60/VdQDH8c/vd7AlI4EHtjW0WCs1i7U2i8u54GWxYDVtpkabumX5JLs86oLYEgRDQjAIBbsYayTmCjDQMwsrtcgxUBdWkNyyJDkCB9jRw+/8vu8e8OD9D7y2tyTJiUFX/wipWxuJe/pzSo9fwiVGNDzB2ewsei0xa9u4Eq5sIpYYl5AkxRwwwLriU2hTEHtbFwte/I6//p0CEyPyWy/XE+JxJYzlwbVExBIhxTFkCwE4jsMDO9rRtk60vQfl/0jxN5fBgInBUE4OUVnEPCJqWUzKw5glBiVkXCAG3sIO7M0/Y2/vxH7hHJv2dwMOAFfXr2NGcWAJVx6mLfGPRJ/tQeACLkVNl9H6IHEvXcB+/nvyqzpxMXAbfnloGT/dcwctS5JpT02mK2kew7botYT6h29igNFwhGU72tBzp1mwOUiw5xoGqGs5zOI3UtFH6Xhq/ajay/yyJ8h6OY19DyeipVs+43jHFXANE1NRjpwZoG/kJi6GklN1qOgRPPVePIeyUG06qs3EOpCFqrOx9q5GCzceJWntx6x+vZE9DR1zajic6fsV+6370OHHUV06qk/HqvFh1fhQZQZWuR9rbwAtzW9g0YYvuDPvU5KfOsTgaBhjDMOhayypfxbVpGEfzMQ+6EU1GdgferEq/djlflSWge7P3U/Glk/Y+G4rr1X9QE/fOC4Gg8vY1Bg5R1/BqkhDtT5U7Z2r0o/2+dEeP2o8fZGxcRcDzE72Mnq1mYGeWm5N3wBgNuaQ2/gqVsVyVJ2BqrzY5ZnofR8q8SFcmP7vIt3NGQw2x/N3mxj52uZK03LCoT/BxPh9dIi7SrNRVSaeD3zYZX5UEkC7A+i2M0NXYzoT3wpz3sY5G0+kYz43jon+5jyMMZgYPHhgAypbgSq8qNTPvN1rsHYF0FRogD8aUrgVTCIcTGCqLZHJ1kRmTqRw/atHITpNxDEsLslDpZnYJatQqQ/7vZVopx85McPgya2EvkxgsuVuwq0LmTmRQvjYvYyfK8QATRdO4nnzMaxiL56ibLQrgAoC6J01c0c6MyHGzhcy0b6WcMuTTLQ/Q6S7mqgT4dLwAIvezkUFK7ALs1HhSrTThwpWIUn/A1g/hnpCRmiJAAAAAElFTkSuQmCC">Chromium - Google Code</A>
<DT><A HREF="http://blog.chromium.org/" ADD_DATE="1273256696" ICON_URI="http://www.blogger.com/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAiUlEQVQ4jWNggIJ/aUz/ScEMyIBUzSiGkKsZbgiG4L6+//++vfv/798/BD637v+/IiEiDNjXh6oRGd/aR4QByDbPi4NgZLEmIwIGwBSuykOIzYtDiG9qwjAEuwGEMO0NQPYCDK/KI8IAbIEIwzDxb+/IjEYY3tdHRkKC2YymGbsB9MwPFOVImD4AmSK780dhlOYAAAAASUVORK5CYII=">Chromium Blog</A>
<DT><A HREF="http://dev.chromium.org/getting-involved" ADD_DATE="1273256924" ICON_URI="http://www.gstatic.com/sites/p/0d68f1/system/app/images/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC3ElEQVQ4jW3S3WtTBxiA8dz4B3inNwNvTJ3YDmstWHGotNVMWcsqRNm60Q8ZQ9FdbKDsZgOhoBOGC/Qj0NJSMB6wJqsm5ixZT0J6TrO1VYaBUpNjzrGH1PQkbdeUJP14vNCmluWF9/aBH+9rWbSdxTxzhvmGBrSTJ5k9fpx/a48yVX2Y6CdVKJWHUKoqeVBRgaXcpBsbKbx8Se7FC8xgEH1wkFBVJU8PHmT0QAUjFVYe7N/Pfau1fOD1qVM8bmujfaaD9lgbl5+38d1kB9eVTr4Pd3L1r1a+9V+i03uBjtEvaBlo3BkyDANJkvjq2UXS+TfoOY3nC//gnnXR7rtA65PPufj0HHavDfuTs3zmPLEzoOs6gUCAS1ITXwab+drXTMdoM60Pz9N8/zQNA3V82ltL3e811N2t5sTtmp2BZDJJMBjEMAwAFEWhezJL39QifVOL9E4u0j2ZxfF3hp/H3vBTIMW1xzpXPEmO/TaORVVVRFFE13UA+vv7uRfNkiuss/J+/8uv8eeMyQ/e11z1vKJdmOUb1wxH7oSwJBIJRFEkmUwCEIlE6IoscCuU5pexFDf8c/zo07niSWDrm+K0Q6H21zBH7khU3w5hicfj+Hw+VFUFwOl0ljgfzsbGBsVikXw+TzabJZPJEIlE3hH8fj+JRAKAUChU4ni9XjY3N7Hb7bS0tNDU1ITNZqO+vp50Ok00GsUSi8UQBIF4PE6xWKSnp6fEAVhbW6NQKLCyssLS0hKmaZJKpTAMA1mWty+iqir5fB5Jkkocj8fD6uoqLpeLoaEhNE1Dv3mTwJ49fNQ1ztiYtB2IxWJMT08zMjJS4qyvr7O8vIxpmszPz6NpGuNWKw937WJv5GO8fm/5997iCIKAaZo4nU4cDgeappH7w0JmyMJu/z4euR+VD2xxcrkcqVSKubk5NE373wqCUD6wxZmYmECWZRRFQZZlZFkmHA4jiiJut5vh4WHeAhqappiWhSp5AAAAAElFTkSuQmCC">Getting Involved (The Chromium Projects)</A>
<DT><A HREF="http://www.google.com/support/forum/p/Chrome" ADD_DATE="1273256938" ICON_URI="http://www.google.com/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADRUlEQVQ4jSXT60/VdQDH8c/vd7AlI4EHtjW0WCs1i7U2i8u54GWxYDVtpkabumX5JLs86oLYEgRDQjAIBbsYayTmCjDQMwsrtcgxUBdWkNyyJDkCB9jRw+/8vu8e8OD9D7y2tyTJiUFX/wipWxuJe/pzSo9fwiVGNDzB2ewsei0xa9u4Eq5sIpYYl5AkxRwwwLriU2hTEHtbFwte/I6//p0CEyPyWy/XE+JxJYzlwbVExBIhxTFkCwE4jsMDO9rRtk60vQfl/0jxN5fBgInBUE4OUVnEPCJqWUzKw5glBiVkXCAG3sIO7M0/Y2/vxH7hHJv2dwMOAFfXr2NGcWAJVx6mLfGPRJ/tQeACLkVNl9H6IHEvXcB+/nvyqzpxMXAbfnloGT/dcwctS5JpT02mK2kew7botYT6h29igNFwhGU72tBzp1mwOUiw5xoGqGs5zOI3UtFH6Xhq/ajay/yyJ8h6OY19DyeipVs+43jHFXANE1NRjpwZoG/kJi6GklN1qOgRPPVePIeyUG06qs3EOpCFqrOx9q5GCzceJWntx6x+vZE9DR1zajic6fsV+6370OHHUV06qk/HqvFh1fhQZQZWuR9rbwAtzW9g0YYvuDPvU5KfOsTgaBhjDMOhayypfxbVpGEfzMQ+6EU1GdgferEq/djlflSWge7P3U/Glk/Y+G4rr1X9QE/fOC4Gg8vY1Bg5R1/BqkhDtT5U7Z2r0o/2+dEeP2o8fZGxcRcDzE72Mnq1mYGeWm5N3wBgNuaQ2/gqVsVyVJ2BqrzY5ZnofR8q8SFcmP7vIt3NGQw2x/N3mxj52uZK03LCoT/BxPh9dIi7SrNRVSaeD3zYZX5UEkC7A+i2M0NXYzoT3wpz3sY5G0+kYz43jon+5jyMMZgYPHhgAypbgSq8qNTPvN1rsHYF0FRogD8aUrgVTCIcTGCqLZHJ1kRmTqRw/atHITpNxDEsLslDpZnYJatQqQ/7vZVopx85McPgya2EvkxgsuVuwq0LmTmRQvjYvYyfK8QATRdO4nnzMaxiL56ibLQrgAoC6J01c0c6MyHGzhcy0b6WcMuTTLQ/Q6S7mqgT4dLwAIvezkUFK7ALs1HhSrTThwpWIUn/A1g/hnpCRmiJAAAAAElFTkSuQmCC">Google Chrome Help</A>
</DL><p>
</DL><p>
</DL><p>

BIN
ffmpeg-0.6-headers.tar.bz2 (Stored with Git LFS) Normal file

Binary file not shown.

31
master_preferences Normal file
View File

@@ -0,0 +1,31 @@
{
"distribution": {
"skip_first_run_ui": true,
"import_bookmarks_from_file": "/etc/chromium/default_bookmarks.html",
"alternate_shortcut_text": false,
"oem_bubble": true,
"chrome_shortcut_icon_index": 0,
"create_all_shortcuts": true,
"show_welcome_page": true,
"make_chrome_default": false,
"make_chrome_default_for_user": false,
"system_level": false,
"verbose_logging": false
},
"download": {
"extensions_to_open": "ymp"
},
"browser": {
"show_home_button": true,
"check_default_browser": false
},
"bookmark_bar": {
"show_on_all_tabs": true
},
"first_run_tabs": [
"http://www.opensuse.org",
"http://tools.google.com/chrome/intl/en/welcome.html"
],
"homepage": "http://www.opensuse.org",
"homepage_is_newtabpage": false
}

12
tcmalloc-factory.patch Normal file
View File

@@ -0,0 +1,12 @@
--- chromium/src/build/common.gypi 2010-04-29 12:39:04.018140987 +0200
+++ chromium/src/build/common.gypi 2010-05-03 21:38:49.733821848 +0200
@@ -261,7 +261,7 @@
'linux_strip_reliability_tests%': 0,
# Enable TCMalloc.
- 'linux_use_tcmalloc%': 1,
+ 'linux_use_tcmalloc%': 0,
# Disable TCMalloc's debugallocation.
'linux_use_debugallocation%': 0,