From f4a8da6a14755f7f76cd2821a6c7783b21841cdc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 29 Mar 2012 22:24:08 +0000 Subject: [PATCH] - merged 18.0.1024.142 from DEVEL (now also stable branch) Changed files: chromium-browser-pulse.patch -> 1.2 chromium-browser.spec -> 1.184 gyp-system-minizip.patch -> 1.6 system-libs.patch -> 1.13 --- chromium-browser-pulse.patch | 81 ++++++++++++++++++++++++++++++++++++ chromium-browser.spec | 17 ++++---- gyp-system-minizip.patch | 11 +++++ system-libs.patch | 9 ++-- 4 files changed, 105 insertions(+), 13 deletions(-) create mode 100644 chromium-browser-pulse.patch diff --git a/chromium-browser-pulse.patch b/chromium-browser-pulse.patch new file mode 100644 index 0000000..19f0da3 --- /dev/null +++ b/chromium-browser-pulse.patch @@ -0,0 +1,81 @@ +diff --git a/media/audio/pulse/pulse_output.cc b/media/audio/pulse/pulse_output.cc +index c58d5bf..55ce3d2 100644 +--- a/media/audio/pulse/pulse_output.cc ++++ b/media/audio/pulse/pulse_output.cc +@@ -126,7 +126,7 @@ void PulseAudioOutputStream::WriteRequestCallback(pa_stream* playback_handle, + PulseAudioOutputStream* stream = + reinterpret_cast(stream_addr); + +- DCHECK_EQ(stream->manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(stream->manager_->GetMessageLoop()->BelongsToCurrentThread()); + + stream->write_callback_handled_ = true; + +@@ -153,7 +153,7 @@ PulseAudioOutputStream::PulseAudioOutputStream(const AudioParameters& params, + write_callback_handled_(false), + ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + source_callback_(NULL) { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + + // TODO(slock): Sanity check input values. + } +@@ -167,7 +167,7 @@ PulseAudioOutputStream::~PulseAudioOutputStream() { + } + + bool PulseAudioOutputStream::Open() { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + + // TODO(slock): Possibly move most of this to an OpenPlaybackDevice function + // in a new class 'pulse_util', like alsa_util. +@@ -270,7 +270,7 @@ void PulseAudioOutputStream::Reset() { + } + + void PulseAudioOutputStream::Close() { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + + Reset(); + +@@ -280,7 +280,7 @@ void PulseAudioOutputStream::Close() { + } + + void PulseAudioOutputStream::WaitForWriteRequest() { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + + if (stream_stopped_) + return; +@@ -382,7 +382,7 @@ void PulseAudioOutputStream::WriteToStream(size_t bytes_to_write, + } + + void PulseAudioOutputStream::Start(AudioSourceCallback* callback) { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + CHECK(callback); + DLOG_IF(ERROR, !playback_handle_) + << "Open() has not been called successfully"; +@@ -402,19 +402,19 @@ void PulseAudioOutputStream::Start(AudioSourceCallback* callback) { + } + + void PulseAudioOutputStream::Stop() { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + + stream_stopped_ = true; + } + + void PulseAudioOutputStream::SetVolume(double volume) { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + + volume_ = static_cast(volume); + } + + void PulseAudioOutputStream::GetVolume(double* volume) { +- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); ++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + + *volume = volume_; + } diff --git a/chromium-browser.spec b/chromium-browser.spec index 81520eb..1d54a2b 100644 --- a/chromium-browser.spec +++ b/chromium-browser.spec @@ -20,6 +20,7 @@ %bcond_without system_vpx # with system vpx %bcond_without system_yasm # with system yasm %bcond_without system_zlib # with system zlib +%bcond_without libjpegturbo # use libjpeg-turbo features %bcond_with verbose # verbose build (V=1) # TODO @@ -49,13 +50,12 @@ %define gyp_rev 1014 Summary: A WebKit powered web browser Name: chromium-browser -Version: 17.0.963.83 +Version: 18.0.1025.142 Release: 1 License: BSD, LGPL v2+ (ffmpeg) Group: X11/Applications/Networking Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.tar.xz -# Source0-md5: 55eb30a093f060e718c4b69fd8ab5d7b -#SourceX: http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz +# Source0-md5: 6e1313b57234c1f3414cff27e0865d99 Source2: %{name}.sh Source3: %{name}.desktop Source5: find-lang.sh @@ -71,11 +71,10 @@ Patch6: get-webkit_revision.patch Patch7: dlopen_sonamed_gl.patch Patch8: chromium_useragent.patch.in Patch9: system-expat.patch -Patch10: dlopen-sonames.patch +Patch10: %{name}-pulse.patch # https://bugs.gentoo.org/show_bug.cgi?id=393471 # libjpeg-turbo >= 1.1.90 supports that feature -# but there is no autodetection currently, so revert for now -Patch11: chromium-revert-jpeg-swizzle-r0.patch +Patch11: chromium-revert-jpeg-swizzle-r2.patch URL: http://www.chromium.org/Home %{?with_gconf:BuildRequires: GConf2-devel} BuildRequires: OpenGL-GLU-devel @@ -98,6 +97,7 @@ BuildRequires: libevent-devel %{?with_keyring:BuildRequires: libgnome-keyring-devel} BuildRequires: libicu-devel >= 4.6 BuildRequires: libjpeg-devel +%{?with_libjpegturbo:BuildRequires: libjpeg-turbo-devel >= 1.2.0} BuildRequires: libpng-devel %{?with_selinux:BuildRequires: libselinux-devel} BuildRequires: libstdc++-devel @@ -137,6 +137,7 @@ Requires: desktop-file-utils Requires: hicolor-icon-theme %{?with_system_vpx:Requires: libvpx >= 0.9.5-2} Requires: xdg-utils >= 1.0.2-4 +%{?with_libjpegturbo:Requires: libjpeg-turbo >= 1.2.0} Provides: wwwbrowser Obsoletes: chromium-browser-bookmark_manager < 5.0.388.0 Obsoletes: chromium-browser-inspector < 15.0.863.0 @@ -213,10 +214,8 @@ ln -s %{SOURCE7} src %patch7 -p1 cd src %patch9 -p1 -cd .. %patch10 -p1 -cd src -%patch11 -p0 +%{!?with_libjpegturbo:%patch11 -p0} cd .. cd src diff --git a/gyp-system-minizip.patch b/gyp-system-minizip.patch index 96c8bbd..d7429f8 100644 --- a/gyp-system-minizip.patch +++ b/gyp-system-minizip.patch @@ -83,3 +83,14 @@ #if defined(OS_WIN) #include "third_party/zlib/contrib/minizip/iowin32.h" #endif +--- chromium-browser-18.0.1025.11/src/chrome/common/zip_internal.cc~ 2012-02-12 16:37:27.000000000 +0100 ++++ chromium-browser-18.0.1025.11/src/chrome/common/zip_internal.cc 2012-02-12 16:53:51.341474034 +0100 +@@ -10,7 +10,7 @@ + #if defined(OS_WIN) + #include "third_party/zlib/contrib/minizip/iowin32.h" + #elif defined(OS_POSIX) +-#include "third_party/zlib/contrib/minizip/ioapi.h" ++#include + #endif + + namespace { diff --git a/system-libs.patch b/system-libs.patch index de707bb..f6e8c47 100644 --- a/system-libs.patch +++ b/system-libs.patch @@ -42,14 +42,15 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete.h" ---- chromium-browser-14.0.830.0~svn20110722r93513/src/chrome/common/metrics_helpers.cc.orig 2011-07-19 04:00:59.000000000 +0200 -+++ chromium-browser-14.0.830.0~svn20110722r93513/src/chrome/common/metrics_helpers.cc 2011-07-22 20:43:47.608727449 +0200 -@@ -17,7 +17,7 @@ +--- a/src/chrome/common/metrics/metrics_log_base.cc~ 2012-02-09 03:36:29.000000000 +0100 ++++ b/src/chrome/common/metrics/metrics_log_base.cc 2012-02-12 16:17:46.992725484 +0100 +@@ -10,7 +10,7 @@ #include "base/perftimer.h" #include "base/string_number_conversions.h" #include "base/sys_info.h" -#include "base/third_party/nspr/prtime.h" +#include - #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/common/logging_chrome.h" + #include "libxml/xmlwriter.h" + -- 2.44.0