chromium: update to 13.0.782.112.

srcpkgs/chromium/patches/chromium-cups-r0.patch

@@ -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);

srcpkgs/chromium/patches/gcc-4.6.patch

@@ -31,17 +31,6 @@ diff -u -r ppapi/cpp/paint_aggregator.h ppapi/cpp/paint_aggregator.h
  
  namespace pp {
  
-diff -u -r third_party/libjingle/source/talk/base/sigslot.h third_party/libjingle/source/talk/base/sigslot.h
---- third_party/libjingle/source/talk/base/sigslot.h	2011-04-13 13:25:41.000000000 +0400
-+++ third_party/libjingle/source/talk/base/sigslot.h	2011-04-20 20:00:43.000000000 +0400
-@@ -80,6 +80,7 @@
- 
- #include <set>
- #include <list>
-+#include <cstddef>
- 
- // On our copy of sigslot.h, we force single threading
- #define SIGSLOT_PURE_ISO
 diff -u -r third_party/ots/src/os2.cc third_party/ots/src/os2.cc
 --- third_party/ots/src/os2.cc	2011-04-13 13:24:06.000000000 +0400
 +++ third_party/ots/src/os2.cc	2011-04-20 19:45:44.000000000 +0400
@@ -119,42 +108,3 @@ diff -u -r ui/gfx/codec/jpeg_codec.h ui/gfx/codec/jpeg_codec.h
  
  class SkBitmap;
  
---- ppapi/cpp/paint_aggregator.h	2010-12-23 18:10:27.000000000 -0600
-+++ 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 <vector>
- 
- #include "ppapi/cpp/point.h"
-Index: Source/WebCore/ChangeLog
-===================================================================
---- third_party/WebKit/Source/WebCore/ChangeLog	(revision 84120)
-+++ third_party/WebKit/Source/WebCore/ChangeLog	(revision 84123)
-@@ -1,2 +1,24 @@
-+2011-04-17  Thierry Reding  <thierry.reding@avionic-design.de>
-+
-+        Reviewed by Adam Barth.
-+
-+        Fix build with GCC 4.6.
-+
-+        * dom/make_names.pl: Execute preprocessor without the -P option. The
-+        preprocessor in GCC 4.6 eats empty lines, effectively breaking the
-+        parsing performed by this script. Dropping the -P option when invoking
-+        the preprocessor keeps the empty lines but as a side-effect also adds
-+        additional linemarkers.
-+
-+        From the cpp manpage:
-+
-+          -P  Inhibit generation of linemarkers in the output from the
-+              preprocessor. This might be useful when running the preprocessor
-+              on something that is not C code, and will be sent to a program
-+              which might be confused by the linemarkers.
-+
-+        The linemarkers are not problematic, however, because the script
-+        properly handles them by ignoring all lines starting with a #.
-+
- 2011-04-17  David Kilzer  <ddkilzer@apple.com>
- 

srcpkgs/chromium/patches/glibc-2.14.patch

@@ -0,0 +1,51 @@
+--- 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 -----------------------------------

srcpkgs/chromium/patches/make-hash-tools-use-if-instead-of-switch.patch

@@ -0,0 +1,35 @@
+--- 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.";
++}

srcpkgs/chromium/patches/perl_deprecated_switch_module_use_givenwhen.patch

@@ -1,134 +0,0 @@
-perl-5.14 deprecated the Switch module. We can use the given/when statement instead,
-available since 5.10. Submitted upstream:
-
-http://code.google.com/p/chromium/issues/detail?id=86645
-
---- third_party/WebKit/Source/WebKit/scripts/generate-webkitversion.pl.orig	2011-06-18 11:13:44.104816166 +0200
-+++ third_party/WebKit/Source/WebKit/scripts/generate-webkitversion.pl	2011-06-18 11:14:10.238814221 +0200
-@@ -39,7 +39,6 @@ use strict;
- use Config;
- use Getopt::Long;
- use File::Path;
--use Switch;
- 
- my $usage = "generate-webkitversion --config WebKit/mac/Configurations/Version.xcconfig --outputDir <outputdir>";
- 
---- chrome/tools/test/generate_mime_tests.pl.orig	2011-06-14 10:01:52.000000000 +0200
-+++ chrome/tools/test/generate_mime_tests.pl	2011-06-18 11:48:40.093660143 +0200
-@@ -32,7 +32,7 @@
- # the layout test framework.
- 
- use strict;
--use Switch;  # used for switch-case program structure
-+use feature qw(switch);
- 
- my $arg_count = $#ARGV + 1;
- 
-@@ -161,15 +161,15 @@ my @expected = (
- #   Output : returns the associated description
- sub get_result_description
- {
--  switch ($_[0]) {
--    case "void"  { return "NOTHING";}
--    case "image" { return "an IMAGE";}
--    case "text"  { return "simple TEXT";}
--    case "html"  { return "an HTML as text";}
--    case "flash" { return "a FLASH object"}
--    case "rs"    { return "been RENDERED CORRECTLY";}
--    case "rf"    { return "been RENDERED INCORRECTLY";}
--    else         { return "UNKNOWN";}
-+  given ($_[0]) {
-+    when ('void')  { return "NOTHING";}
-+    when ('image') { return "an IMAGE";}
-+    when ('text')  { return "simple TEXT";}
-+    when ('html')  { return "an HTML as text";}
-+    when ('flash') { return "a FLASH object"}
-+    when ('rs')    { return "been RENDERED CORRECTLY";}
-+    when ('rf')    { return "been RENDERED INCORRECTLY";}
-+    default         { return "UNKNOWN";}
-   }
- }
- 
-@@ -180,22 +180,22 @@ sub get_result_description
- #   Output : returns the associated description
- sub get_query_description
- {
--  switch ($_[0]) {     
--    case "tag=img&content=type_gif.gif" { return "HTML page with a GIF image";}
--    case "tag=img&content=type_bmp.bmp" { return "HTML page with a BMP image";}
--    case "tag=img&content=type_tif.tif" { return "HTML page with a TIF image";}
--    case "tag=img&content=type_png.png" { return "HTML page with a PNG image";}
--    case "tag=img&content=type_jpg.jpg" { return "HTML page with a JPEG image"}
--    case "tag=img&content=type_txt.txt" { return "HTML page";}
--    case "tag=embed&content=type_swf.swf" { return "an HTML page with a FLASH object";}
--    case "switch=nohtml&content=type_gif.gif" { return "GIF image and no HTML";}
--    case "switch=nohtml&content=type_bmp.bmp" { return "BMP image and no HTML";}
--    case "switch=nohtml&content=type_tif.tif" { return "TIF image and no HTML";}
--    case "switch=nohtml&content=type_png.png" { return "PNG image and no HTML";}
--    case "switch=nohtml&content=type_jpg.jpg" { return "JPEG image and no HTML"}
--    case "switch=nohtml&content=type_txt.txt" { return "simple TEXT and no HTML";}
--    case "switch=nohtml&content=type_swf.swf" { return "FLASH object and no HTML";}
--    else { return "UNKNOWN TYPE";}
-+  given ($_[0]) {     
-+    when ('tag=img&content=type_gif.gif') { return "HTML page with a GIF image";}
-+    when ('tag=img&content=type_bmp.bmp') { return "HTML page with a BMP image";}
-+    when ('tag=img&content=type_tif.tif') { return "HTML page with a TIF image";}
-+    when ('tag=img&content=type_png.png') { return "HTML page with a PNG image";}
-+    when ('tag=img&content=type_jpg.jpg') { return "HTML page with a JPEG image"}
-+    when ('tag=img&content=type_txt.txt') { return "HTML page";}
-+    when ('tag=embed&content=type_swf.swf') { return "an HTML page with a FLASH object";}
-+    when ('switch=nohtml&content=type_gif.gif') { return "GIF image and no HTML";}
-+    when ('switch=nohtml&content=type_bmp.bmp') { return "BMP image and no HTML";}
-+    when ('switch=nohtml&content=type_tif.tif') { return "TIF image and no HTML";}
-+    when ('switch=nohtml&content=type_png.png') { return "PNG image and no HTML";}
-+    when ('switch=nohtml&content=type_jpg.jpg') { return "JPEG image and no HTML"}
-+    when ('switch=nohtml&content=type_txt.txt') { return "simple TEXT and no HTML";}
-+    when ('switch=nohtml&content=type_swf.swf') { return "FLASH object and no HTML";}
-+    default { return "UNKNOWN TYPE";}
-   }
- }
- 
---- third_party/WebKit/Source/WebCore/make-hash-tools.pl.orig	2011-06-14 10:04:55.000000000 +0200
-+++ third_party/WebKit/Source/WebCore/make-hash-tools.pl	2011-06-18 11:49:02.502658474 +0200
-@@ -20,7 +20,7 @@
- #   Boston, MA 02110-1301, USA.
- 
- use strict;
--use Switch;
-+use feature qw(switch);
- use File::Basename;
- 
- my $outdir = $ARGV[0];
-@@ -28,9 +28,9 @@ shift;
- my $option = basename($ARGV[0],".gperf");
- 
- 
--switch ($option) {
-+given ($option) {
- 
--case "DocTypeStrings" {
-+when ('DocTypeStrings') {
- 
-     my $docTypeStringsGenerated    = "$outdir/DocTypeStrings.cpp";
-     my $docTypeStringsGperf        = $ARGV[0];
-@@ -38,9 +38,9 @@ case "DocTypeStrings" {
- 
-     system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?";
- 
--} # case "DocTypeStrings"
-+} # when "DocTypeStrings"
- 
--case "ColorData" {
-+when ('ColorData') {
- 
-     my $colorDataGenerated         = "$outdir/ColorData.cpp";
-     my $colorDataGperf             = $ARGV[0];
-@@ -48,6 +48,6 @@ case "ColorData" {
- 
-     system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?";
- 
--} # case "ColorData"
-+} # when "ColorData"
- 
--} # switch ($option)
-+} # given ($option)

srcpkgs/chromium/patches/tcmalloc-prototypes-glibc-2.14.patch

@@ -1,42 +0,0 @@
-glibc-2.14 changed the _hook prototypes with a volatile pointer.
-Submitted upstream:
-
-http://code.google.com/p/chromium/issues/detail?id=86646
-
---- third_party/tcmalloc/chromium/src/tcmalloc.cc.orig	2011-06-18 10:29:01.407015864 +0200
-+++ third_party/tcmalloc/chromium/src/tcmalloc.cc	2011-06-18 10:29:32.305013564 +0200
-@@ -375,7 +375,7 @@ static void* tc_ptmalloc_malloc_hook(siz
-   return tc_malloc(size);
- }
- 
--void* (*__malloc_hook)(
-+void* (* volatile __malloc_hook)(
-     size_t size, const void* caller) = tc_ptmalloc_malloc_hook;
- 
- static void* tc_ptmalloc_realloc_hook(
-@@ -383,14 +383,14 @@ static void* tc_ptmalloc_realloc_hook(
-   return tc_realloc(ptr, size);
- }
- 
--void* (*__realloc_hook)(
-+void* (* 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 (* volatile __free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook;
- 
- #endif
- 
-@@ -1584,7 +1584,7 @@ static void *MemalignOverride(size_t ali
-   MallocHook::InvokeNewHook(result, size);
-   return result;
- }
--void *(*__memalign_hook)(size_t, size_t, const void *) = MemalignOverride;
-+void *(* volatile __memalign_hook)(size_t, size_t, const void *) = MemalignOverride;
- #endif  // #ifndef TCMALLOC_FOR_DEBUGALLOCATION
- 
- // ---Double free() debugging implementation -----------------------------------

srcpkgs/chromium/template

@@ -1,13 +1,13 @@
 # Template file for 'chromium'
 pkgname=chromium
-version=12.0.742.100
+version=13.0.782.112
 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 <xtraeme@gmail.com>"
 homepage="http://www.chromium.org/"
 license="BSD"
-checksum=58f51ace0ad420357491953ad9a4b3421e830cf9dcdebfe8da3ed672eea2a6ed
+checksum=fb1ba09eaa5b33a5d0674f3a0dff666542f84f3545613dcda5bd8fec3b52b6ed
 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.
@@ -19,7 +19,6 @@ long_desc="
  This package contains the Chromium browser."
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-nostrip=yes
 
 Add_dependency run libX11
 Add_dependency run glibc
@@ -53,63 +52,45 @@ Add_dependency run libXtst
 Add_dependency run pam
 Add_dependency run libstdc++
 Add_dependency run libgcc
+Add_dependency run libvpx
 
 Add_dependency build pkg-config
-Add_dependency build coreutils
 Add_dependency build yasm
 Add_dependency build flex
 Add_dependency build gperf
-Add_dependency build perl	">=0"
-Add_dependency build python
-Add_dependency build libX11-devel
-Add_dependency build glibc-devel
 Add_dependency build libXrender-devel
 Add_dependency build libXScrnSaver-devel
-Add_dependency build libXext-devel
 Add_dependency build gtk+-devel
-Add_dependency build pango-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build libpng-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build glib-devel
 Add_dependency build libevent-devel
 Add_dependency build icu-devel
-Add_dependency build zlib-devel
-Add_dependency build jpeg-devel
 Add_dependency build nss-devel
-Add_dependency build nspr-devel
-Add_dependency build libxml2-devel
 Add_dependency build libxslt-devel
-Add_dependency build bzip2-devel
 Add_dependency build alsa-lib-devel
-Add_dependency build expat-devel
 Add_dependency build libflac-devel
 Add_dependency build dbus-glib-devel
-Add_dependency build dbus-devel
 Add_dependency build libXdamage-devel
 Add_dependency build libXtst-devel
 Add_dependency build pam-devel
 Add_dependency build libgnome-keyring-devel
+Add_dependency build libvpx-devel
 
 Add_dependency full desktop-file-utils
 Add_dependency full hicolor-icon-theme
 
-do_build()
+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 -f make build/all.gyp --depth=. \
+	build/gyp_chromium --depth=. -fmake build/all.gyp \
-		-Dgcc_version=45 \
+		--ignore-environment \
-		-Dno_strict_aliasing=1 \
 		-Dwerror= \
 		-Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
-		-Dlinux_strip_binary=1 \
-		-Drelease_extra_cflags="$CFLAGS" \
 		-Dffmpeg_branding=Chrome \
 		-Dproprietary_codecs=1 \
 		-Duse_system_libjpeg=1 \
@@ -125,31 +106,36 @@ do_build()
 		-Duse_system_flac=1 \
 		-Duse_system_icu=1 \
 		-Duse_system_xdg_utils=1 \
+		-Duse_system_libvpx=1 \
 		-Duse_gconf=0 \
 		-Duse_cups=0
+}
 
-	make ${makejobs} chrome chrome_sandbox BUILDTYPE=Release
+do_build()
+{
+	make BUILDTYPE=Release ${makejobs} chrome chrome_sandbox
 }
 
 do_install()
 {
-	install -D out/Release/chrome ${DESTDIR}/usr/lib/chromium/chromium
+	vinstall out/Release/chrome 755 usr/lib/${pkgname} ${pkgname}
-	install -Dm4755 out/Release/chrome_sandbox \
+	vinstall out/Release/chrome_sandbox 4755 usr/lib/${pkgname} ${pkgname}-sandbox
-		${DESTDIR}/usr/lib/chromium/chromium-sandbox
+	vinstall out/Release/chrome.pak 644 usr/lib/${pkgname}
-	install -Dm644 out/Release/chrome.pak ${DESTDIR}/usr/lib/chromium/chrome.pak
+	vinstall out/Release/resources.pak 644 usr/lib/${pkgname}
-	install -Dm644 out/Release/resources.pak \
+	vinstall out/Release/libffmpegsumo.so 755 usr/lib/${pkgname}
-		${DESTDIR}/usr/lib/chromium/resources.pak
+	vinstall out/Release/libppGoogleNaClPluginChrome.so 755 usr/lib/${pkgname}
-	install -D out/Release/libffmpegsumo.so \
+	vcopy "out/Release/nacl_irt_x86_*.nexe" usr/lib/${pkgname}
-		${DESTDIR}/usr/lib/chromium/libffmpegsumo.so
+
-	cp -a out/Release/locales out/Release/resources ${DESTDIR}/usr/lib/chromium/
+	for f in locales resources; do
+		vcopy out/Release/${f} usr/lib/chromium
+	done
 	find ${DESTDIR}/usr/lib/chromium/ -name '*.d' -type f -delete
-	install -Dm644 out/Release/chrome.1 ${DESTDIR}/usr/share/man/man1/chromium.1
+	vinstall out/Release/chrome.1 644 usr/share/man/man1 chromium.1
-	install -Dm644 ${FILESDIR}/chromium.desktop \
+	vinstall ${FILESDIR}/chromium.desktop 644 usr/share/applications
-		${DESTDIR}/usr/share/applications/chromium.desktop
 	for size in 16 22 24 32 48 64 128 256; do
 		install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
 		${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
 	done
-	install -D ${FILESDIR}/chromium.sh ${DESTDIR}/usr/bin/chromium
+	vinstall ${FILESDIR}/chromium.sh 755 usr/bin chromium
-	install -Dm644 LICENSE ${DESTDIR}/usr/share/licenses/chromium/LICENSE
+	vinstall LICENSE 644 usr/share/licenses/${pkgname}
 }