diff options
Diffstat (limited to 'www-client/chromium/files')
16 files changed, 0 insertions, 396 deletions
diff --git a/www-client/chromium/files/chromium-browser.xml b/www-client/chromium/files/chromium-browser.xml deleted file mode 100644 index 2c95a55..0000000 --- a/www-client/chromium/files/chromium-browser.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?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-browser</executable> - <command>chromium-browser %s</command> - <icon-name>chromium-browser</icon-name> - <run-in-terminal>false</run-in-terminal> - </web-browser> - </web-browsers> -</default-apps> diff --git a/www-client/chromium/files/chromium-cups-r0.patch b/www-client/chromium/files/chromium-cups-r0.patch deleted file mode 100644 index 5d0808c..0000000 --- a/www-client/chromium/files/chromium-cups-r0.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- chrome/browser/ui/webui/print_preview_handler.cc.orig 2011-04-23 09:05:25.000000000 +0200 -+++ chrome/browser/ui/webui/print_preview_handler.cc 2011-04-23 09:13:07.000000000 +0200 -@@ -28,7 +28,7 @@ - #include "printing/metafile_impl.h" - #include "printing/print_job_constants.h" - --#if defined(OS_POSIX) && !defined(OS_CHROMEOS) -+#if defined(CP_PRINT_SYSTEM_AVAILABLE) - #include <cups/cups.h> - - #include "base/file_util.h" -@@ -42,7 +42,7 @@ - const char kDisableColorOption[] = "disableColorOption"; - const char kSetColorAsDefault[] = "setColorAsDefault"; - --#if defined(OS_POSIX) && !defined(OS_CHROMEOS) -+#if defined(CP_PRINT_SYSTEM_AVAILABLE) - const char kColorDevice[] = "ColorDevice"; - #endif - -@@ -131,7 +131,7 @@ - return; - } - -- #if defined(OS_POSIX) && !defined(OS_CHROMEOS) -+#if defined(CP_PRINT_SYSTEM_AVAILABLE) - FilePath ppd_file_path; - if (!file_util::CreateTemporaryFile(&ppd_file_path)) - return; -@@ -153,9 +153,9 @@ - ppdClose(ppd); - } - file_util::Delete(ppd_file_path, false); -- #elif defined(OS_WIN) || defined(OS_CHROMEOS) -+#else - NOTIMPLEMENTED(); -- #endif -+#endif - - DictionaryValue settings_info; - settings_info.SetBoolean(kDisableColorOption, !supports_color); diff --git a/www-client/chromium/files/chromium-ffmpeg-build-r0.patch b/www-client/chromium/files/chromium-ffmpeg-build-r0.patch deleted file mode 100644 index b46017d..0000000 --- a/www-client/chromium/files/chromium-ffmpeg-build-r0.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: media/ffmpeg/ffmpeg_common.h -diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h -index ac1774a5b1dc7a80aee96e7e35fa2f5366e8f589..46dbe07bf5dad14e897b21b7f479776127ff7ef7 100644 ---- a/media/ffmpeg/ffmpeg_common.h -+++ b/media/ffmpeg/ffmpeg_common.h -@@ -19,11 +19,15 @@ extern "C" { - // TODO(scherkus): fix and upstream the compiler warnings. - MSVC_PUSH_DISABLE_WARNING(4244); - #include <libavcodec/avcodec.h> --#include <libavcore/samplefmt.h> - #include <libavformat/avformat.h> - #include <libavformat/avio.h> - #include <libavutil/avutil.h> - #include <libavutil/log.h> -+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(50, 38, 0) -+#include <libavutil/samplefmt.h> -+#else -+#include <libavcore/samplefmt.h> -+#endif - MSVC_POP_WARNING(); - } // extern "C" - diff --git a/www-client/chromium/files/chromium-glibc-2.14-r0.patch b/www-client/chromium/files/chromium-glibc-2.14-r0.patch deleted file mode 100644 index be7fdcd..0000000 --- a/www-client/chromium/files/chromium-glibc-2.14-r0.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- third_party/tcmalloc/chromium/src/tcmalloc.cc.orig 2011-06-23 13:45:05.000000000 +0200 -+++ third_party/tcmalloc/chromium/src/tcmalloc.cc 2011-06-23 13:47:51.000000000 +0200 -@@ -135,6 +135,10 @@ - # define WIN32_DO_PATCHING 1 - #endif - -+#if !defined(__MALLOC_HOOK_VOLATILE) -+#define __MALLOC_HOOK_VOLATILE -+#endif -+ - using std::max; - using tcmalloc::PageHeap; - using tcmalloc::SizeMap; -@@ -375,7 +379,7 @@ - return tc_malloc(size); - } - --void* (*__malloc_hook)( -+void* (*__MALLOC_HOOK_VOLATILE __malloc_hook)( - size_t size, const void* caller) = tc_ptmalloc_malloc_hook; - - static void* tc_ptmalloc_realloc_hook( -@@ -383,14 +387,14 @@ - return tc_realloc(ptr, size); - } - --void* (*__realloc_hook)( -+void* (*__MALLOC_HOOK_VOLATILE __realloc_hook)( - void* ptr, size_t size, const void* caller) = tc_ptmalloc_realloc_hook; - - static void tc_ptmalloc_free_hook(void* ptr, const void* caller) { - tc_free(ptr); - } - --void (*__free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook; -+void (*__MALLOC_HOOK_VOLATILE __free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook; - - #endif - -@@ -1584,7 +1588,7 @@ - MallocHook::InvokeNewHook(result, size); - return result; - } --void *(*__memalign_hook)(size_t, size_t, const void *) = MemalignOverride; -+void *(*__MALLOC_HOOK_VOLATILE __memalign_hook)(size_t, size_t, const void *) = MemalignOverride; - #endif // #ifndef TCMALLOC_FOR_DEBUGALLOCATION - - // ---Double free() debugging implementation ----------------------------------- diff --git a/www-client/chromium/files/chromium-icu-compatibility-r0.patch b/www-client/chromium/files/chromium-icu-compatibility-r0.patch deleted file mode 100644 index 305cb2f..0000000 --- a/www-client/chromium/files/chromium-icu-compatibility-r0.patch +++ /dev/null @@ -1,53 +0,0 @@ -this patch fixes build failures with ICU 4.8 - -http://codereview.chromium.org/7421003/ -https://bugs.gentoo.org/show_bug.cgi?id=374903 - ---- v8/src/extensions/experimental/number-format.cc -+++ v8/src/extensions/experimental/number-format.cc -@@ -36,6 +36,8 @@ - #include "unicode/numfmt.h" - #include "unicode/uchar.h" - #include "unicode/ucurr.h" -+#include "unicode/unum.h" -+#include "unicode/uversion.h" - - namespace v8 { - namespace internal { -@@ -231,6 +233,8 @@ - } - - // Generates ICU number format pattern from given skeleton. -+// TODO(cira): Remove once ICU includes equivalent method -+// (see http://bugs.icu-project.org/trac/ticket/8610). - static icu::DecimalFormat* CreateFormatterFromSkeleton( - const icu::Locale& icu_locale, - const icu::UnicodeString& skeleton, -@@ -251,6 +255,7 @@ - // Case of non-consecutive U+00A4 is taken care of in i18n.js. - int32_t end_index = skeleton.lastIndexOf(currency_symbol, index); - -+#if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 6) - icu::NumberFormat::EStyles style; - switch (end_index - index) { - case 0: -@@ -262,6 +267,19 @@ - default: - style = icu::NumberFormat::kPluralCurrencyStyle; - } -+#else // ICU version is 4.8 or above (we ignore versions below 4.0). -+ UNumberFormatStyle style; -+ switch (end_index - index) { -+ case 0: -+ style = UNUM_CURRENCY; -+ break; -+ case 1: -+ style = UNUM_CURRENCY_ISO; -+ break; -+ default: -+ style = UNUM_CURRENCY_PLURAL; -+ } -+#endif - - base_format = static_cast<icu::DecimalFormat*>( - icu::NumberFormat::createInstance(icu_locale, style, *status)); diff --git a/www-client/chromium/files/chromium-launcher-r1.sh b/www-client/chromium/files/chromium-launcher-r1.sh deleted file mode 100644 index 761e561..0000000 --- a/www-client/chromium/files/chromium-launcher-r1.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2009 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. - -# Let the wrapped binary know that it has been run through the wrapper -export CHROME_WRAPPER="`readlink -f "$0"`" - -PROGDIR="`dirname "$CHROME_WRAPPER"`" - -case ":$PATH:" in - *:$PROGDIR:*) - # $PATH already contains $PROGDIR - ;; - *) - # Append $PROGDIR to $PATH - export PATH="$PATH:$PROGDIR" - ;; -esac - -# Set the .desktop file name -export CHROME_DESKTOP="chromium-browser-chromium.desktop" - -exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins "$@" diff --git a/www-client/chromium/files/chromium-launcher-r2.sh b/www-client/chromium/files/chromium-launcher-r2.sh deleted file mode 100644 index e20bcea..0000000 --- a/www-client/chromium/files/chromium-launcher-r2.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Allow the user to override command-line flags, bug #357629. -# This is based on Debian's chromium-browser package, and is intended -# to be consistent with Debian. -if [ -f /etc/chromium/default ] ; then - . /etc/chromium/default -fi - -# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system -# default CHROMIUM_FLAGS (from /etc/chromium/default). -CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"} - -# Let the wrapped binary know that it has been run through the wrapper -export CHROME_WRAPPER="`readlink -f "$0"`" - -PROGDIR="`dirname "$CHROME_WRAPPER"`" - -case ":$PATH:" in - *:$PROGDIR:*) - # $PATH already contains $PROGDIR - ;; - *) - # Append $PROGDIR to $PATH - export PATH="$PATH:$PROGDIR" - ;; -esac - -# Set the .desktop file name -export CHROME_DESKTOP="chromium-browser-chromium.desktop" - -exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@" diff --git a/www-client/chromium/files/chromium-libgcrypt-r0.patch b/www-client/chromium/files/chromium-libgcrypt-r0.patch deleted file mode 100644 index d75a06a..0000000 --- a/www-client/chromium/files/chromium-libgcrypt-r0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- build/linux/system.gyp.orig 2011-06-28 07:58:51.000000000 +0000 -+++ build/linux/system.gyp 2011-06-28 08:00:05.000000000 +0000 -@@ -314,7 +314,7 @@ - 'target_name': 'libgcrypt', - 'type': 'settings', - 'conditions': [ -- ['_toolset=="target"', { -+ ['_toolset=="target" and use_cups==1', { - 'direct_dependent_settings': { - 'cflags': [ - '<!@(libgcrypt-config --cflags)', diff --git a/www-client/chromium/files/chromium-perl-5.14-r0.patch b/www-client/chromium/files/chromium-perl-5.14-r0.patch deleted file mode 100644 index 40d6ea3..0000000 --- a/www-client/chromium/files/chromium-perl-5.14-r0.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: third_party/WebKit/Source/WebCore/make-hash-tools.pl -=================================================================== ---- third_party/WebKit/Source/WebCore/make-hash-tools.pl (revision 72664) -+++ third_party/WebKit/Source/WebCore/make-hash-tools.pl (revision 89265) -@@ -21,5 +21,4 @@ - - use strict; --use Switch; - use File::Basename; - -@@ -29,7 +28,5 @@ - - --switch ($option) { -- --case "DocTypeStrings" { -+if ($option eq "DocTypeStrings") { - - my $docTypeStringsGenerated = "$outdir/DocTypeStrings.cpp"; -@@ -39,7 +36,5 @@ - system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?"; - --} # case "DocTypeStrings" -- --case "ColorData" { -+} elsif ($option eq "ColorData") { - - my $colorDataGenerated = "$outdir/ColorData.cpp"; -@@ -49,5 +44,5 @@ - system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?"; - --} # case "ColorData" -- --} # switch ($option) -+} else { -+ die "Unknown option."; -+} diff --git a/www-client/chromium/files/chromium-system-libevent-r0.patch b/www-client/chromium/files/chromium-system-libevent-r0.patch deleted file mode 100644 index fa9833d..0000000 --- a/www-client/chromium/files/chromium-system-libevent-r0.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- base/base.gyp.orig 2011-08-04 18:25:17.000000000 +0200 -+++ base/base.gyp 2011-08-04 18:25:24.000000000 +0200 -@@ -283,6 +283,9 @@ - 'message_pump_libevent_unittest.cc', - ], - }, { # OS != "win" -+ 'dependencies': [ -+ '../third_party/libevent/libevent.gyp:libevent' -+ ], - 'sources/': [ - ['exclude', '^win/'], - ], diff --git a/www-client/chromium/files/chromium-system-vpx-r3.patch b/www-client/chromium/files/chromium-system-vpx-r3.patch deleted file mode 100644 index de15909..0000000 --- a/www-client/chromium/files/chromium-system-vpx-r3.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- remoting/remoting.gyp.orig 2011-03-10 14:43:29.000000000 +0000 -+++ remoting/remoting.gyp 2011-03-10 14:44:50.000000000 +0000 -@@ -127,6 +127,7 @@ - '../ui/gfx/gfx.gyp:gfx', - '../media/media.gyp:media', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', -+ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', - '../third_party/libvpx/libvpx.gyp:libvpx_include', - '../third_party/zlib/zlib.gyp:zlib', - 'chromoting_jingle_glue', ---- third_party/ffmpeg/ffmpeg.gyp.orig 2011-03-10 15:39:13.000000000 +0000 -+++ third_party/ffmpeg/ffmpeg.gyp 2011-03-10 15:39:41.000000000 +0000 -@@ -728,11 +728,14 @@ - '../libvpx/include', - ], - }, { # use_system_vpx != 0 -+ 'defines': [ -+ 'USE_SYSTEM_VPX', -+ ], - 'direct_dependent_settings': { -+ 'defines': [ -+ 'USE_SYSTEM_VPX', -+ ], - 'link_settings': { -- 'defines': [ -- 'USE_SYSTEM_VPX', -- ], - 'libraries': [ - '-lvpx', - ], diff --git a/www-client/chromium/files/chromium-system-vpx-r4.patch b/www-client/chromium/files/chromium-system-vpx-r4.patch deleted file mode 100644 index 3550065..0000000 --- a/www-client/chromium/files/chromium-system-vpx-r4.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- remoting/remoting.gyp.orig 2011-03-10 14:43:29.000000000 +0000 -+++ remoting/remoting.gyp 2011-03-10 14:44:50.000000000 +0000 -@@ -127,6 +127,7 @@ - '../ui/gfx/gfx.gyp:gfx', - '../media/media.gyp:media', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', -+ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', - '../third_party/libvpx/libvpx.gyp:libvpx_include', - '../third_party/zlib/zlib.gyp:zlib', - 'chromoting_jingle_glue', diff --git a/www-client/chromium/files/chromium-system-zlib-r0.patch b/www-client/chromium/files/chromium-system-zlib-r0.patch deleted file mode 100644 index 894525d..0000000 --- a/www-client/chromium/files/chromium-system-zlib-r0.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- content/browser/renderer_host/clipboard_message_filter.cc.orig 2011-04-21 12:29:49.000000000 +0200 -+++ content/browser/renderer_host/clipboard_message_filter.cc 2011-04-21 12:31:14.000000000 +0200 -@@ -4,6 +4,12 @@ - - #include "content/browser/renderer_host/clipboard_message_filter.h" - -+#if defined(USE_SYSTEM_ZLIB) -+#include <zlib.h> -+#else -+#include "third_party/zlib/zlib.h" -+#endif -+ - #include "base/stl_util-inl.h" - #include "chrome/browser/browser_process.h" - #include "chrome/browser/clipboard_dispatcher.h" -@@ -11,7 +17,6 @@ - #include "googleurl/src/gurl.h" - #include "ipc/ipc_message_macros.h" - #include "third_party/skia/include/core/SkBitmap.h" --#include "third_party/zlib/zlib.h" - #include "ui/gfx/codec/png_codec.h" - #include "ui/gfx/size.h" - ---- content/content_browser.gypi.orig 2011-04-21 12:32:18.000000000 +0200 -+++ content/content_browser.gypi 2011-04-21 12:32:56.000000000 +0200 -@@ -13,7 +13,8 @@ - '../ppapi/ppapi.gyp:ppapi_proxy', - '../skia/skia.gyp:skia', - '../third_party/flac/flac.gyp:libflac', -- '../third_party/speex/speex.gyp:libspeex', -+ '../third_party/speex/speex.gyp:libspeex', -+ '../third_party/zlib/zlib.gyp:zlib', - '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', - '../ui/ui.gyp:ui_base', - ], diff --git a/www-client/chromium/files/chromium.default b/www-client/chromium/files/chromium.default deleted file mode 100644 index 45f1f38..0000000 --- a/www-client/chromium/files/chromium.default +++ /dev/null @@ -1,5 +0,0 @@ -# Default settings for chromium. This file is sourced by /bin/bash from -# the chromium launcher. - -# Options to pass to chromium. -CHROMIUM_FLAGS="" diff --git a/www-client/chromium/files/chromium.xml b/www-client/chromium/files/chromium.xml deleted file mode 100644 index 2c95a55..0000000 --- a/www-client/chromium/files/chromium.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?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-browser</executable> - <command>chromium-browser %s</command> - <icon-name>chromium-browser</icon-name> - <run-in-terminal>false</run-in-terminal> - </web-browser> - </web-browsers> -</default-apps> diff --git a/www-client/chromium/files/dot-gclient b/www-client/chromium/files/dot-gclient deleted file mode 100644 index f3e0fce..0000000 --- a/www-client/chromium/files/dot-gclient +++ /dev/null @@ -1,9 +0,0 @@ -solutions = [ - { "name" : "src", - "url" : "http://src.chromium.org/svn/trunk/src", - "custom_deps" : { - "src/third_party/WebKit/LayoutTests": None, - }, - "safesync_url": "http://chromium-status.appspot.com/lkgr", - }, -] |