From 445103cd0fccb93f0900a636680e4d31747e7d27 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 19 Sep 2011 11:25:31 +0200 Subject: [PATCH] chromium: update to 14.0.835.163. --- srcpkgs/chromium/patches/gcc-4.6.patch | 13 +- srcpkgs/chromium/patches/glibc-2.14.patch | 51 -- ...-hash-tools-use-if-instead-of-switch.patch | 35 -- ...bug-77625-huge-number-of-cpu-wakeups.patch | 506 ------------------ srcpkgs/chromium/template | 19 +- 5 files changed, 10 insertions(+), 614 deletions(-) delete mode 100644 srcpkgs/chromium/patches/glibc-2.14.patch delete mode 100644 srcpkgs/chromium/patches/make-hash-tools-use-if-instead-of-switch.patch delete mode 100644 srcpkgs/chromium/patches/v8-r8472-crbug-77625-huge-number-of-cpu-wakeups.patch diff --git a/srcpkgs/chromium/patches/gcc-4.6.patch b/srcpkgs/chromium/patches/gcc-4.6.patch index 220fe7a7ed..b5e61dc308 100644 --- a/srcpkgs/chromium/patches/gcc-4.6.patch +++ b/srcpkgs/chromium/patches/gcc-4.6.patch @@ -68,9 +68,9 @@ diff -u -r third_party/tcmalloc/chromium/src/common.cc third_party/tcmalloc/chro --- third_party/tcmalloc/chromium/src/common.cc 2011-04-13 13:23:04.000000000 +0400 +++ third_party/tcmalloc/chromium/src/common.cc 2011-04-20 19:32:58.000000000 +0400 @@ -34,6 +34,7 @@ - #include "system-alloc.h" #include "config.h" #include "common.h" + #include "system-alloc.h" +#include namespace tcmalloc { @@ -86,17 +86,6 @@ diff -u -r third_party/tcmalloc/chromium/src/symbolize.h third_party/tcmalloc/ch using std::map; -diff -u -r third_party/tcmalloc/chromium/src/system-alloc.h third_party/tcmalloc/chromium/src/system-alloc.h ---- third_party/tcmalloc/chromium/src/system-alloc.h 2011-04-13 13:23:04.000000000 +0400 -+++ third_party/tcmalloc/chromium/src/system-alloc.h 2011-04-20 19:32:58.000000000 +0400 -@@ -37,6 +37,7 @@ - #define TCMALLOC_SYSTEM_ALLOC_H_ - - #include -+#include - #include "internal_logging.h" - - // REQUIRES: "alignment" is a power of two or "0" to indicate default alignment diff -u -r ui/gfx/codec/jpeg_codec.h ui/gfx/codec/jpeg_codec.h --- ui/gfx/codec/jpeg_codec.h 2011-04-13 13:23:45.000000000 +0400 +++ ui/gfx/codec/jpeg_codec.h 2011-04-20 19:32:58.000000000 +0400 diff --git a/srcpkgs/chromium/patches/glibc-2.14.patch b/srcpkgs/chromium/patches/glibc-2.14.patch deleted file mode 100644 index f8468efa98..0000000000 --- a/srcpkgs/chromium/patches/glibc-2.14.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- third_party/tcmalloc/chromium/src/tcmalloc.cc 2011/06/21 07:36:46 89799 -+++ third_party/tcmalloc/chromium/src/tcmalloc.cc 2011/06/21 07:37:01 89800 -@@ -150,6 +150,13 @@ - # define WIN32_DO_PATCHING 1 - #endif - -+// GLibc 2.14+ requires the hook functions be declared volatile, based on the -+// value of the define __MALLOC_HOOK_VOLATILE. For compatibility with -+// older/non-GLibc implementations, provide an empty definition. -+#if !defined(__MALLOC_HOOK_VOLATILE) -+#define __MALLOC_HOOK_VOLATILE -+#endif -+ - using std::max; - using tcmalloc::PageHeap; - using tcmalloc::SizeMap; -@@ -403,7 +410,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( -@@ -411,14 +418,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 - -@@ -1757,7 +1764,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/srcpkgs/chromium/patches/make-hash-tools-use-if-instead-of-switch.patch b/srcpkgs/chromium/patches/make-hash-tools-use-if-instead-of-switch.patch deleted file mode 100644 index 14db65f5f7..0000000000 --- a/srcpkgs/chromium/patches/make-hash-tools-use-if-instead-of-switch.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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/srcpkgs/chromium/patches/v8-r8472-crbug-77625-huge-number-of-cpu-wakeups.patch b/srcpkgs/chromium/patches/v8-r8472-crbug-77625-huge-number-of-cpu-wakeups.patch deleted file mode 100644 index b37bd0485a..0000000000 --- a/srcpkgs/chromium/patches/v8-r8472-crbug-77625-huge-number-of-cpu-wakeups.patch +++ /dev/null @@ -1,506 +0,0 @@ -Index: compilation-cache.h -=================================================================== ---- v8/src/compilation-cache.h (revision 8471) -+++ v8/src/compilation-cache.h (revision 8472) -@@ -223,14 +223,6 @@ - JSRegExp::Flags flags, - Handle data); - -- // Support for eager optimization tracking. -- bool ShouldOptimizeEagerly(Handle function); -- void MarkForEagerOptimizing(Handle function); -- void MarkForLazyOptimizing(Handle function); -- -- // Reset the eager optimization tracking data. -- void ResetEagerOptimizingData(); -- - // Clear the cache - also used to initialize the cache at startup. - void Clear(); - -@@ -274,8 +266,6 @@ - // Current enable state of the compilation cache. - bool enabled_; - -- HashMap* eager_optimizing_set_; -- - friend class Isolate; - - DISALLOW_COPY_AND_ASSIGN(CompilationCache); -Index: objects.cc -=================================================================== ---- v8/src/objects.cc (revision 8471) -+++ v8/src/objects.cc (revision 8472) -@@ -6287,19 +6287,6 @@ - } - - --uint32_t JSFunction::SourceHash() { -- uint32_t hash = 0; -- Object* script = shared()->script(); -- if (!script->IsUndefined()) { -- Object* source = Script::cast(script)->source(); -- if (source->IsUndefined()) hash = String::cast(source)->Hash(); -- } -- hash ^= ComputeIntegerHash(shared()->start_position_and_type()); -- hash += ComputeIntegerHash(shared()->end_position()); -- return hash; --} -- -- - bool JSFunction::IsInlineable() { - if (IsBuiltin()) return false; - SharedFunctionInfo* shared_info = shared(); -Index: runtime-profiler.cc -=================================================================== ---- v8/src/runtime-profiler.cc (revision 8471) -+++ v8/src/runtime-profiler.cc (revision 8472) -@@ -43,32 +43,6 @@ - namespace internal { - - --class PendingListNode : public Malloced { -- public: -- explicit PendingListNode(JSFunction* function); -- ~PendingListNode() { Destroy(); } -- -- PendingListNode* next() const { return next_; } -- void set_next(PendingListNode* node) { next_ = node; } -- Handle function() { return Handle::cast(function_); } -- -- // If the function is garbage collected before we've had the chance -- // to optimize it the weak handle will be null. -- bool IsValid() { return !function_.is_null(); } -- -- // Returns the number of microseconds this node has been pending. -- int Delay() const { return static_cast(OS::Ticks() - start_); } -- -- private: -- void Destroy(); -- static void WeakCallback(v8::Persistent object, void* data); -- -- PendingListNode* next_; -- Handle function_; // Weak handle. -- int64_t start_; --}; -- -- - // Optimization sampler constants. - static const int kSamplerFrameCount = 2; - static const int kSamplerFrameWeight[kSamplerFrameCount] = { 2, 1 }; -@@ -80,33 +54,10 @@ - static const int kSamplerThresholdDelta = 1; - - static const int kSamplerThresholdSizeFactorInit = 3; --static const int kSamplerThresholdSizeFactorMin = 1; --static const int kSamplerThresholdSizeFactorDelta = 1; - - static const int kSizeLimit = 1500; - - --PendingListNode::PendingListNode(JSFunction* function) : next_(NULL) { -- GlobalHandles* global_handles = Isolate::Current()->global_handles(); -- function_ = global_handles->Create(function); -- start_ = OS::Ticks(); -- global_handles->MakeWeak(function_.location(), this, &WeakCallback); --} -- -- --void PendingListNode::Destroy() { -- if (!IsValid()) return; -- GlobalHandles* global_handles = Isolate::Current()->global_handles(); -- global_handles->Destroy(function_.location()); -- function_= Handle::null(); --} -- -- --void PendingListNode::WeakCallback(v8::Persistent, void* data) { -- reinterpret_cast(data)->Destroy(); --} -- -- - Atomic32 RuntimeProfiler::state_ = 0; - // TODO(isolates): Create the semaphore lazily and clean it up when no - // longer required. -@@ -125,16 +76,8 @@ - sampler_threshold_(kSamplerThresholdInit), - sampler_threshold_size_factor_(kSamplerThresholdSizeFactorInit), - sampler_ticks_until_threshold_adjustment_( -- kSamplerTicksBetweenThresholdAdjustment), -- js_ratio_(0), -- sampler_window_position_(0), -- optimize_soon_list_(NULL), -- state_window_position_(0), -- state_window_ticks_(0) { -- state_counts_[IN_NON_JS_STATE] = kStateWindowSize; -- state_counts_[IN_JS_STATE] = 0; -- STATIC_ASSERT(IN_NON_JS_STATE == 0); -- memset(state_window_, 0, sizeof(state_window_)); -+ kSamplerTicksBetweenThresholdAdjustment), -+ sampler_window_position_(0) { - ClearSampleBuffer(); - } - -@@ -148,16 +91,13 @@ - } - - --void RuntimeProfiler::Optimize(JSFunction* function, bool eager, int delay) { -+void RuntimeProfiler::Optimize(JSFunction* function) { - ASSERT(function->IsOptimizable()); - if (FLAG_trace_opt) { -- PrintF("[marking (%s) ", eager ? "eagerly" : "lazily"); -+ PrintF("[marking "); - function->PrintName(); - PrintF(" 0x%" V8PRIxPTR, reinterpret_cast(function->address())); - PrintF(" for recompilation"); -- if (delay > 0) { -- PrintF(" (delayed %0.3f ms)", static_cast(delay) / 1000); -- } - PrintF("]\n"); - } - -@@ -243,20 +183,6 @@ - - void RuntimeProfiler::OptimizeNow() { - HandleScope scope(isolate_); -- PendingListNode* current = optimize_soon_list_; -- while (current != NULL) { -- PendingListNode* next = current->next(); -- if (current->IsValid()) { -- Handle function = current->function(); -- int delay = current->Delay(); -- if (function->IsOptimizable()) { -- Optimize(*function, true, delay); -- } -- } -- delete current; -- current = next; -- } -- optimize_soon_list_ = NULL; - - // Run through the JavaScript frames and collect them. If we already - // have a sample of the function, we mark it for optimizations -@@ -303,24 +229,9 @@ - : 1; - - int threshold = sampler_threshold_ * threshold_size_factor; -- int current_js_ratio = NoBarrier_Load(&js_ratio_); - -- // Adjust threshold depending on the ratio of time spent -- // in JS code. -- if (current_js_ratio < 20) { -- // If we spend less than 20% of the time in JS code, -- // do not optimize. -- continue; -- } else if (current_js_ratio < 75) { -- // Below 75% of time spent in JS code, only optimize very -- // frequently used functions. -- threshold *= 3; -- } -- - if (LookupSample(function) >= threshold) { -- Optimize(function, false, 0); -- isolate_->compilation_cache()->MarkForEagerOptimizing( -- Handle(function)); -+ Optimize(function); - } - } - -@@ -333,40 +244,8 @@ - } - - --void RuntimeProfiler::OptimizeSoon(JSFunction* function) { -- if (!function->IsOptimizable()) return; -- PendingListNode* node = new PendingListNode(function); -- node->set_next(optimize_soon_list_); -- optimize_soon_list_ = node; --} -- -- --#ifdef ENABLE_LOGGING_AND_PROFILING --void RuntimeProfiler::UpdateStateRatio(SamplerState current_state) { -- SamplerState old_state = state_window_[state_window_position_]; -- state_counts_[old_state]--; -- state_window_[state_window_position_] = current_state; -- state_counts_[current_state]++; -- ASSERT(IsPowerOf2(kStateWindowSize)); -- state_window_position_ = (state_window_position_ + 1) & -- (kStateWindowSize - 1); -- // Note: to calculate correct ratio we have to track how many valid -- // ticks are actually in the state window, because on profiler -- // startup this number can be less than the window size. -- state_window_ticks_ = Min(kStateWindowSize, state_window_ticks_ + 1); -- NoBarrier_Store(&js_ratio_, state_counts_[IN_JS_STATE] * 100 / -- state_window_ticks_); --} --#endif -- -- - void RuntimeProfiler::NotifyTick() { - #ifdef ENABLE_LOGGING_AND_PROFILING -- // Record state sample. -- SamplerState state = IsSomeIsolateInJS() -- ? IN_JS_STATE -- : IN_NON_JS_STATE; -- UpdateStateRatio(state); - isolate_->stack_guard()->RequestRuntimeProfilerTick(); - #endif - } -@@ -424,7 +303,6 @@ - // to get the right count of active isolates. - NoBarrier_AtomicIncrement(&state_, 1); - semaphore_->Signal(); -- isolate->ResetEagerOptimizingData(); - #endif - } - -@@ -471,15 +349,8 @@ - - bool RuntimeProfilerRateLimiter::SuspendIfNecessary() { - #ifdef ENABLE_LOGGING_AND_PROFILING -- static const int kNonJSTicksThreshold = 100; -- if (RuntimeProfiler::IsSomeIsolateInJS()) { -- non_js_ticks_ = 0; -- } else { -- if (non_js_ticks_ < kNonJSTicksThreshold) { -- ++non_js_ticks_; -- } else { -- return RuntimeProfiler::WaitForSomeIsolateToEnterJS(); -- } -+ if (!RuntimeProfiler::IsSomeIsolateInJS()) { -+ return RuntimeProfiler::WaitForSomeIsolateToEnterJS(); - } - #endif - return false; -Index: runtime.cc -=================================================================== ---- v8/src/runtime.cc (revision 8471) -+++ v8/src/runtime.cc (revision 8472) -@@ -7821,7 +7821,6 @@ - } - } - -- isolate->compilation_cache()->MarkForLazyOptimizing(function); - if (type == Deoptimizer::EAGER) { - RUNTIME_ASSERT(function->IsOptimized()); - } else { -Index: objects.h -=================================================================== ---- v8/src/objects.h (revision 8471) -+++ v8/src/objects.h (revision 8472) -@@ -4924,9 +4924,6 @@ - // recompilation. - inline bool IsMarkedForLazyRecompilation(); - -- // Compute a hash code for the source code of this function. -- uint32_t SourceHash(); -- - // Check whether or not this function is inlineable. - bool IsInlineable(); - -Index: compilation-cache.cc -=================================================================== ---- v8/src/compilation-cache.cc (revision 8471) -+++ v8/src/compilation-cache.cc (revision 8472) -@@ -52,8 +52,7 @@ - eval_global_(isolate, kEvalGlobalGenerations), - eval_contextual_(isolate, kEvalContextualGenerations), - reg_exp_(isolate, kRegExpGenerations), -- enabled_(true), -- eager_optimizing_set_(NULL) { -+ enabled_(true) { - CompilationSubCache* subcaches[kSubCacheCount] = - {&script_, &eval_global_, &eval_contextual_, ®_exp_}; - for (int i = 0; i < kSubCacheCount; ++i) { -@@ -62,10 +61,7 @@ - } - - --CompilationCache::~CompilationCache() { -- delete eager_optimizing_set_; -- eager_optimizing_set_ = NULL; --} -+CompilationCache::~CompilationCache() {} - - - static Handle AllocateTable(Isolate* isolate, int size) { -@@ -457,47 +453,6 @@ - } - - --static bool SourceHashCompare(void* key1, void* key2) { -- return key1 == key2; --} -- -- --HashMap* CompilationCache::EagerOptimizingSet() { -- if (eager_optimizing_set_ == NULL) { -- eager_optimizing_set_ = new HashMap(&SourceHashCompare); -- } -- return eager_optimizing_set_; --} -- -- --bool CompilationCache::ShouldOptimizeEagerly(Handle function) { -- if (FLAG_opt_eagerly) return true; -- uint32_t hash = function->SourceHash(); -- void* key = reinterpret_cast(hash); -- return EagerOptimizingSet()->Lookup(key, hash, false) != NULL; --} -- -- --void CompilationCache::MarkForEagerOptimizing(Handle function) { -- uint32_t hash = function->SourceHash(); -- void* key = reinterpret_cast(hash); -- EagerOptimizingSet()->Lookup(key, hash, true); --} -- -- --void CompilationCache::MarkForLazyOptimizing(Handle function) { -- uint32_t hash = function->SourceHash(); -- void* key = reinterpret_cast(hash); -- EagerOptimizingSet()->Remove(key, hash); --} -- -- --void CompilationCache::ResetEagerOptimizingData() { -- HashMap* set = EagerOptimizingSet(); -- if (set->occupancy() > 0) set->Clear(); --} -- -- - void CompilationCache::Clear() { - for (int i = 0; i < kSubCacheCount; i++) { - subcaches_[i]->Clear(); -Index: isolate.h -=================================================================== ---- v8/src/isolate.h (revision 8471) -+++ v8/src/isolate.h (revision 8472) -@@ -978,8 +978,6 @@ - } - #endif - -- void ResetEagerOptimizingData(); -- - void SetData(void* data) { embedder_data_ = data; } - void* GetData() { return embedder_data_; } - -Index: runtime-profiler.h -=================================================================== ---- v8/src/runtime-profiler.h (revision 8471) -+++ v8/src/runtime-profiler.h (revision 8472) -@@ -37,7 +37,6 @@ - class Isolate; - class JSFunction; - class Object; --class PendingListNode; - class Semaphore; - - class RuntimeProfiler { -@@ -52,7 +51,6 @@ - } - - void OptimizeNow(); -- void OptimizeSoon(JSFunction* function); - - void NotifyTick(); - -@@ -106,7 +104,7 @@ - - static void HandleWakeUp(Isolate* isolate); - -- void Optimize(JSFunction* function, bool eager, int delay); -+ void Optimize(JSFunction* function); - - void AttemptOnStackReplacement(JSFunction* function); - -@@ -118,31 +116,16 @@ - - void AddSample(JSFunction* function, int weight); - --#ifdef ENABLE_LOGGING_AND_PROFILING -- void UpdateStateRatio(SamplerState current_state); --#endif -- - Isolate* isolate_; - - int sampler_threshold_; - int sampler_threshold_size_factor_; - int sampler_ticks_until_threshold_adjustment_; - -- // The ratio of ticks spent in JS code in percent. -- Atomic32 js_ratio_; -- - Object* sampler_window_[kSamplerWindowSize]; - int sampler_window_position_; - int sampler_window_weight_[kSamplerWindowSize]; - -- // Support for pending 'optimize soon' requests. -- PendingListNode* optimize_soon_list_; -- -- SamplerState state_window_[kStateWindowSize]; -- int state_window_position_; -- int state_window_ticks_; -- int state_counts_[2]; -- - // Possible state values: - // -1 => the profiler thread is waiting on the semaphore - // 0 or positive => the number of isolates running JavaScript code. -@@ -159,7 +142,7 @@ - // Rate limiter intended to be used in the profiler thread. - class RuntimeProfilerRateLimiter BASE_EMBEDDED { - public: -- RuntimeProfilerRateLimiter() : non_js_ticks_(0) { } -+ RuntimeProfilerRateLimiter() {} - - // Suspends the current thread (which must be the profiler thread) - // when not executing JavaScript to minimize CPU usage. Returns -@@ -170,8 +153,6 @@ - bool SuspendIfNecessary(); - - private: -- int non_js_ticks_; -- - DISALLOW_COPY_AND_ASSIGN(RuntimeProfilerRateLimiter); - }; - -Index: compiler.cc -=================================================================== ---- v8/src/compiler.cc (revision 8471) -+++ v8/src/compiler.cc (revision 8472) -@@ -109,8 +109,6 @@ - void CompilationInfo::AbortOptimization() { - Handle code(shared_info()->code()); - SetCode(code); -- Isolate* isolate = code->GetIsolate(); -- isolate->compilation_cache()->MarkForLazyOptimizing(closure()); - } - - -@@ -660,9 +658,6 @@ - CompilationInfo optimized(function); - optimized.SetOptimizing(AstNode::kNoNumber); - return CompileLazy(&optimized); -- } else if (isolate->compilation_cache()->ShouldOptimizeEagerly( -- function)) { -- isolate->runtime_profiler()->OptimizeSoon(*function); - } - } - } -Index: isolate.cc -=================================================================== ---- v8/src/isolate.cc (revision 8471) -+++ v8/src/isolate.cc (revision 8472) -@@ -1855,11 +1855,6 @@ - } - - --void Isolate::ResetEagerOptimizingData() { -- compilation_cache_->ResetEagerOptimizingData(); --} -- -- - #ifdef DEBUG - #define ISOLATE_FIELD_OFFSET(type, name, ignored) \ - const intptr_t Isolate::name##_debug_offset_ = OFFSET_OF(Isolate, name##_); diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 9724b6a565..3b2f9525e0 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,13 +1,13 @@ # Template file for 'chromium' pkgname=chromium -version=13.0.782.218 +version=14.0.835.163 distfiles="http://build.chromium.org/official/$pkgname-$version.tar.bz2" build_style=custom-install short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="Juan RP " homepage="http://www.chromium.org/" license="BSD" -checksum=d5bf89bed7f865b50d84d541cddafee2c6195eae41b5cfc229e8e35eaeac5abd +checksum=2a16908fce65fda294448c43ec16dbbe3ff07603f0695126e5e845f727c6b5aa long_desc=" Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all Internet users to experience the web. @@ -55,6 +55,7 @@ Add_dependency run pam Add_dependency run libvpx Add_dependency run libspeex Add_dependency run libwebp +Add_dependency run libpulseaudio Add_dependency run desktop-file-utils Add_dependency run hicolor-icon-theme @@ -80,19 +81,16 @@ Add_dependency build libgnome-keyring-devel Add_dependency build libvpx-devel Add_dependency build speex-devel Add_dependency build libwebp-devel +Add_dependency build pulseaudio-devel do_configure() { - # Replace linux2 with linux3 for 3.x kernels. - grep -rlZ linux2 . 2>/dev/null | xargs -0 sed -ie "s:linux2:linux3:g" - # We need to disable system_ssl until "next protocol negotiation" support is # available in our nss package. # (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312) # # XXX: Disable CUPS until a package exists. build/gyp_chromium --depth=. -fmake build/all.gyp \ - --ignore-environment \ -Dwerror= \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ -Dffmpeg_branding=Chrome \ @@ -114,7 +112,8 @@ do_configure() -Duse_system_speex=1 \ -Duse_system_libwebp=1 \ -Duse_gconf=0 \ - -Duse_cups=0 + -Duse_cups=0 \ + -Ddisable_nacl=1 } do_build() @@ -129,8 +128,8 @@ do_install() vinstall out/Release/chrome.pak 644 usr/lib/${pkgname} vinstall out/Release/resources.pak 644 usr/lib/${pkgname} vinstall out/Release/libffmpegsumo.so 755 usr/lib/${pkgname} - vinstall out/Release/libppGoogleNaClPluginChrome.so 755 usr/lib/${pkgname} - vcopy "out/Release/nacl_irt_x86_*.nexe" usr/lib/${pkgname} + #vinstall out/Release/libppGoogleNaClPluginChrome.so 755 usr/lib/${pkgname} + #vcopy "out/Release/nacl_irt_x86_*.nexe" usr/lib/${pkgname} for f in locales resources; do vcopy out/Release/${f} usr/lib/chromium @@ -139,7 +138,7 @@ do_install() vinstall out/Release/chrome.1 644 usr/share/man/man1 chromium.1 vinstall ${FILESDIR}/chromium.desktop 644 usr/share/applications for size in 16 22 24 32 48 64 128 256; do - install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \ + install -Dm644 "chrome/app/theme/chromium/product_logo_${size}.png" \ ${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png done vinstall ${FILESDIR}/chromium.sh 755 usr/bin chromium