Version bump for dev channel release. Remove old.

(Portage version: 2.1.10.44/cvs/Linux i686)

6 files changed, 145 insertions, 6 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 008500f47185..0a3abd623b37 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.550 2012/01/31 10:11:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.551 2012/02/01 20:11:58 phajdan.jr Exp $
+
+*chromium-18.0.1025.1 (01 Feb 2012)
+
+  01 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-gyp-settings-r0.patch,
+  +files/chromium-revert-jpeg-swizzle-r2.patch,
+  +files/chromium-webkit-zlib-r0.patch, -chromium-18.0.1010.0.ebuild,
+  +chromium-18.0.1025.1.ebuild, chromium-9999-r1.ebuild:
+  Version bump for dev channel release. Remove old.
 
   31 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-17.0.963.46.ebuild:
diff --git a/www-client/chromium/chromium-18.0.1010.0.ebuild b/www-client/chromium/chromium-18.0.1025.1.ebuild
index 63e467ae9e29..8c8ddc8f8957 100644
--- a/www-client/chromium/chromium-18.0.1010.0.ebuild
+++ b/www-client/chromium/chromium-18.0.1025.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-18.0.1010.0.ebuild,v 1.3 2012/01/22 22:27:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-18.0.1025.1.ebuild,v 1.1 2012/02/01 20:11:58 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -30,7 +30,7 @@ RDEPEND="app-arch/bzip2
 		dev-libs/libgcrypt
 		>=net-print/cups-1.3.11
 	)
-	>=dev-lang/v8-3.7.6
+	>=dev-lang/v8-3.8.9.4
 	dev-libs/dbus-glib
 	dev-libs/elfutils
 	>=dev-libs/icu-4.4.1
@@ -187,7 +187,14 @@ src_prepare() {
 		chrome/common/zip*.cc || die
 
 	# Revert WebKit changeset responsible for Gentoo bug #393471.
-	epatch "${FILESDIR}/${PN}-revert-jpeg-swizzle-r1.patch"
+	epatch "${FILESDIR}/${PN}-revert-jpeg-swizzle-r2.patch"
+
+	# Prevent gyp failures caused by target type 'settings' instead of 'none'.
+	epatch "${FILESDIR}/${PN}-gyp-settings-r0.patch"
+
+	# Prevent compilation failures caused by missing zlib #include
+	# and dependency.
+	epatch "${FILESDIR}/${PN}-webkit-zlib-r0.patch"
 
 	epatch_user
 
@@ -211,6 +218,7 @@ src_prepare() {
 		\! -path 'third_party/leveldatabase/*' \
 		\! -path 'third_party/libjingle/*' \
 		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libsrtp/*' \
 		\! -path 'third_party/libvpx/*' \
 		\! -path 'third_party/libyuv/*' \
 		\! -path 'third_party/lss/*' \
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 40e959c735c1..12d1d06e8631 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.88 2012/01/22 22:26:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.89 2012/02/01 20:11:58 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -30,7 +30,7 @@ RDEPEND="app-arch/bzip2
 		dev-libs/libgcrypt
 		>=net-print/cups-1.3.11
 	)
-	>=dev-lang/v8-3.8.7.1
+	>=dev-lang/v8-3.8.9.4
 	dev-libs/dbus-glib
 	dev-libs/elfutils
 	>=dev-libs/icu-4.4.1
@@ -262,6 +262,7 @@ src_prepare() {
 		\! -path 'third_party/leveldatabase/*' \
 		\! -path 'third_party/libjingle/*' \
 		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libsrtp/*' \
 		\! -path 'third_party/libvpx/*' \
 		\! -path 'third_party/libyuv/*' \
 		\! -path 'third_party/lss/*' \
diff --git a/www-client/chromium/files/chromium-gyp-settings-r0.patch b/www-client/chromium/files/chromium-gyp-settings-r0.patch
new file mode 100644
index 000000000000..dfebcf3e8d24
--- /dev/null
+++ b/www-client/chromium/files/chromium-gyp-settings-r0.patch
@@ -0,0 +1,11 @@
+--- third_party/flac/flac.gyp.orig	2012-02-01 09:48:17.000000000 +0100
++++ third_party/flac/flac.gyp	2012-02-01 09:51:21.000000000 +0100
+@@ -93,7 +93,7 @@
+       'targets': [
+         {
+           'target_name': 'libflac',
+-          'type': 'settings',
++          'type': 'none',
+           'direct_dependent_settings': {
+             'defines': [
+               'USE_SYSTEM_FLAC',
diff --git a/www-client/chromium/files/chromium-revert-jpeg-swizzle-r2.patch b/www-client/chromium/files/chromium-revert-jpeg-swizzle-r2.patch
new file mode 100644
index 000000000000..1d21121f0cc6
--- /dev/null
+++ b/www-client/chromium/files/chromium-revert-jpeg-swizzle-r2.patch
@@ -0,0 +1,61 @@
+This reverts http://trac.webkit.org/changeset/101286
+to fix Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=393471
+
+Index: third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+===================================================================
+--- third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp	(revision 96970)
++++ third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp	(revision 101286)
+@@ -67,24 +67,6 @@
+ 
+ #include <setjmp.h>
+ 
+-#if CPU(BIG_ENDIAN) || CPU(MIDDLE_ENDIAN)
+-#define ASSUME_LITTLE_ENDIAN 0
+-#else
+-#define ASSUME_LITTLE_ENDIAN 1
+-#endif
+-
+-#if defined(JCS_ALPHA_EXTENSIONS) && ASSUME_LITTLE_ENDIAN
+-#define TURBO_JPEG_RGB_SWIZZLE
+-#if USE(SKIA) && (!SK_R32_SHIFT && SK_G32_SHIFT == 8 && SK_B32_SHIFT == 16)
+-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_RGBA; }
+-#else
+-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRA; }
+-#endif
+-inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == rgbOutputColorSpace(); }
+-#else
+-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_RGB; }
+-#endif
+-
+ namespace WebCore {
+ 
+ struct decoder_error_mgr {
+@@ -270,7 +252,7 @@
+             case JCS_RGB:
+             case JCS_YCbCr:
+                 // libjpeg can convert GRAYSCALE and YCbCr image pixels to RGB.
+-                m_info.out_color_space = rgbOutputColorSpace();
++                m_info.out_color_space = JCS_RGB;
+                 break;
+             case JCS_CMYK:
+             case JCS_YCCK:
+@@ -525,19 +507,6 @@
+     }
+ 
+     jpeg_decompress_struct* info = m_reader->info();
+-
+-#if !ENABLE(IMAGE_DECODER_DOWN_SAMPLING) && defined(TURBO_JPEG_RGB_SWIZZLE)
+-    if (turboSwizzled(info->out_color_space)) {
+-         ASSERT(!m_scaled);
+-         while (info->output_scanline < info->output_height) {
+-             unsigned char* row = reinterpret_cast<unsigned char*>(buffer.getAddr(0, info->output_scanline));
+-             if (jpeg_read_scanlines(info, &row, 1) != 1)
+-                  return false;
+-         }
+-         return true;
+-     }
+-#endif
+-
+     JSAMPARRAY samples = m_reader->samples();
+ 
+     while (info->output_scanline < info->output_height) {
diff --git a/www-client/chromium/files/chromium-webkit-zlib-r0.patch b/www-client/chromium/files/chromium-webkit-zlib-r0.patch
new file mode 100644
index 000000000000..8332652a1785
--- /dev/null
+++ b/www-client/chromium/files/chromium-webkit-zlib-r0.patch
@@ -0,0 +1,49 @@
+--- webkit/support/webkit_support_gfx.cc.orig	2012-02-01 11:00:50.000000000 +0100
++++ webkit/support/webkit_support_gfx.cc	2012-02-01 11:04:21.000000000 +0100
+@@ -14,6 +14,12 @@
+ #else
+ #include "third_party/libpng/png.h"
+ #endif
++
++#if defined(USE_SYSTEM_ZLIB)
++#include <zlib.h>
++#else
++#include "third_party/zlib/zlib.h"
++#endif
+ }
+ 
+ namespace webkit_support {
+--- webkit/support/webkit_support.gypi.orig	2012-02-01 11:05:23.000000000 +0100
++++ webkit/support/webkit_support.gypi	2012-02-01 11:06:31.000000000 +0100
+@@ -140,6 +140,7 @@
+       'variables': { 'enable_wexit_time_destructors': 1, },
+       'dependencies': [
+         '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
++        '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
+       ],
+       'sources': [
+         'webkit_support_gfx.h',
+--- webkit/support/webkit_support.gypi.orig	2012-02-01 12:46:29.000000000 +0100
++++ webkit/support/webkit_support.gypi	2012-02-01 12:47:09.000000000 +0100
+@@ -89,6 +89,7 @@
+         '<(DEPTH)/crypto/crypto.gyp:crypto',
+         '<(DEPTH)/net/net.gyp:net',
+         '<(DEPTH)/skia/skia.gyp:skia',
++        '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
+         '<(DEPTH)/ui/ui.gyp:ui',
+         'glue',
+         'webkit_support_gfx',
+--- webkit/tools/test_shell/simple_clipboard_impl.cc.orig	2012-02-01 14:02:32.000000000 +0100
++++ webkit/tools/test_shell/simple_clipboard_impl.cc	2012-02-01 14:03:10.000000000 +0100
+@@ -11,7 +11,11 @@
+ #include "base/string16.h"
+ #include "googleurl/src/gurl.h"
+ #include "third_party/skia/include/core/SkBitmap.h"
++#if defined(USE_SYSTEM_ZLIB)
++#include <zlib.h>
++#else
+ #include "third_party/zlib/zlib.h"
++#endif
+ #include "ui/base/clipboard/clipboard.h"
+ #include "ui/gfx/codec/png_codec.h"
+ #include "ui/gfx/size.h"