[arch-commits] Commit in chromium/trunk (3 files)

[Evangelos Foutras]

    Date: Thursday, July 14, 2011 @ 19:30:37
  Author: foutrelis
Revision: 131773

upgpkg: chromium 12.0.742.124-1
New upstream release.

Added:
  chromium/trunk/make-hash-tools-use-if-instead-of-switch.patch
Modified:
  chromium/trunk/PKGBUILD
  chromium/trunk/gcc-4.6.patch

------------------------------------------------+
 PKGBUILD                                       |   18 +++++++----
 gcc-4.6.patch                                  |   29 ------------------
 make-hash-tools-use-if-instead-of-switch.patch |   37 +++++++++++++++++++++++
 3 files changed, 49 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-14 19:07:30 UTC (rev 131772)
+++ PKGBUILD	2011-07-14 23:30:37 UTC (rev 131773)
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=chromium
-pkgver=12.0.742.112
+pkgver=12.0.742.124
 pkgrel=1
 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
 arch=('i686' 'x86_64')
@@ -22,12 +22,14 @@
         chromium.desktop
         chromium.sh
         gcc-4.6.patch
-        glibc-2.14.patch)
-md5sums=('8a5b7b4b30f5fe8de10fcf7d984321b8'
+        glibc-2.14.patch
+        make-hash-tools-use-if-instead-of-switch.patch)
+md5sums=('37a53e0dd2ba031c508cdd4f94b4912e'
          '075c3c2fa5902e16b8547dd31d437191'
          '096a46ef386817988250d2d7bddd1b34'
-         'fb4b7b6871876a9180215c580fcf2cf5'
-         '543a32b09f138fd47858b9a4a7c82dfb')
+         'ec0b4e4ca4cf970a18a080ec2776c252'
+         '543a32b09f138fd47858b9a4a7c82dfb'
+         '9d9e66c8365d7333e55305796b49fd77')
 
 build() {
   cd "$srcdir/chromium-$pkgver"
@@ -37,11 +39,15 @@
   # http://code.google.com/p/chromium/issues/detail?id=70746
   # http://code.google.com/p/chromium/issues/detail?id=46411
   patch -Np0 -i "$srcdir/gcc-4.6.patch"
-  
+
   # Fix build with glibc 2.14
   # http://code.google.com/p/chromium/issues/detail?id=86646
   patch -Np2 -i "$srcdir/glibc-2.14.patch"
 
+  # Fix build with Perl 5.14
+  patch -d third_party/WebKit -Np2 -i \
+    "$srcdir/make-hash-tools-use-if-instead-of-switch.patch"
+
 ### Configure
 
   # Use Python 2

Modified: gcc-4.6.patch
===================================================================
--- gcc-4.6.patch	2011-07-14 19:07:30 UTC (rev 131772)
+++ gcc-4.6.patch	2011-07-14 23:30:37 UTC (rev 131773)
@@ -129,32 +129,3 @@
  #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 at 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 at apple.com>
- 

Added: make-hash-tools-use-if-instead-of-switch.patch
===================================================================
--- make-hash-tools-use-if-instead-of-switch.patch	                        (rev 0)
+++ make-hash-tools-use-if-instead-of-switch.patch	2011-07-14 23:30:37 UTC (rev 131773)
@@ -0,0 +1,37 @@
+Index: /trunk/Source/WebCore/make-hash-tools.pl
+===================================================================
+--- /trunk/Source/WebCore/make-hash-tools.pl	(revision 72664)
++++ /trunk/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.";
++}