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

Evangelos Foutras foutrelis at archlinux.org
Fri Apr 6 02:32:37 EDT 2012


    Date: Friday, April 6, 2012 @ 02:32:37
  Author: foutrelis
Revision: 155755

upgpkg: chromium 18.0.1025.151-1

New upstream release.

Added:
  chromium/trunk/chromium-gcc46.patch
    (from rev 154559, chromium/trunk/gcc-4.6.patch)
  chromium/trunk/chromium-gcc47.patch
Modified:
  chromium/trunk/PKGBUILD
Deleted:
  chromium/trunk/gcc-4.6.patch

----------------------+
 PKGBUILD             |   17 +++++++--
 chromium-gcc46.patch |   88 +++++++++++++++++++++++++++++++++++++++++++++++++
 chromium-gcc47.patch |   53 +++++++++++++++++++++++++++++
 gcc-4.6.patch        |   88 -------------------------------------------------
 4 files changed, 154 insertions(+), 92 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-06 00:24:13 UTC (rev 155754)
+++ PKGBUILD	2012-04-06 06:32:37 UTC (rev 155755)
@@ -9,7 +9,7 @@
 # build time.
 
 pkgname=chromium
-pkgver=18.0.1025.142
+pkgver=18.0.1025.151
 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')
@@ -30,14 +30,16 @@
         http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip
         chromium.desktop
         chromium.sh
-        gcc-4.6.patch
+        chromium-gcc46.patch
+        chromium-gcc47.patch
         chromium-media-no-sse-r0.patch
         chromium-revert-jpeg-swizzle-r2.patch)
-sha256sums=('911a4ee2e30ed617c4148c84dcddfd1affa4b2fc02dc5e95ac4a4afeeda24b1d'
+sha256sums=('d920a0e70eaae9496e6f6499fcf0f8e5d8bdae8ce4a6f38a969946355fb73387'
             '8cf762587e547588b9461686f7d2655d5a23d09e1260b5f97137fa7d41c767a9'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
             'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3'
             '50268dafd436813f846ea174d19c447c64d198c3937bd56910d87c5206306977'
+            'f607347ba8477d3c8e60eb3803d26f3c9869f77fd49986c60887c59a6aa7d30d'
             '71751bf5913da1eec3c88c433044224c869b0abd5a29172cf239bddbb4eff761'
             'd99162aa6bae562f116a42347254bbec3752464f0a3e4d8675e2b287b2a838a2')
 
@@ -46,8 +48,15 @@
 
   # Fix build with gcc 4.6
   # http://code.google.com/p/chromium/issues/detail?id=80071
-  patch -Np0 -i "$srcdir/gcc-4.6.patch"
+  patch -Np0 -i "$srcdir/chromium-gcc46.patch"
 
+  # Fix build with gcc 4.7 (patch from openSUSE)
+  patch -Np2 -i "$srcdir/chromium-gcc47.patch"
+  # Add missing include that defines OS_POSIX
+  sed -i '1 i\
+    #include "build/build_config.h"' \
+    chrome/browser/diagnostics/diagnostics_main.cc
+
   # Remove unconditional use of SSE3 (patch from Gentoo)
   patch -Np0 -i "$srcdir/chromium-media-no-sse-r0.patch"
 

Copied: chromium/trunk/chromium-gcc46.patch (from rev 154559, chromium/trunk/gcc-4.6.patch)
===================================================================
--- chromium-gcc46.patch	                        (rev 0)
+++ chromium-gcc46.patch	2012-04-06 06:32:37 UTC (rev 155755)
@@ -0,0 +1,88 @@
+diff -u -r chrome/browser/search_engines/template_url_prepopulate_data.h chrome/browser/search_engines/template_url_prepopulate_data.h
+--- chrome/browser/search_engines/template_url_prepopulate_data.h	2011-04-13 13:23:41.000000000 +0400
++++ chrome/browser/search_engines/template_url_prepopulate_data.h	2011-04-20 19:32:58.000000000 +0400
+@@ -7,6 +7,7 @@
+ #pragma once
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ class GURL;
+ class PrefService;
+diff -u -r gpu/command_buffer/common/types.h gpu/command_buffer/common/types.h
+--- gpu/command_buffer/common/types.h	2011-04-13 13:22:57.000000000 +0400
++++ gpu/command_buffer/common/types.h	2011-04-20 19:32:58.000000000 +0400
+@@ -11,6 +11,7 @@
+ #include <stdint.h>
+ #endif
+ #include <string>
++#include <cstddef>
+ 
+ typedef signed char         schar;
+ typedef signed char         int8;
+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
+@@ -5,6 +5,7 @@
+ #include "os2.h"
+ 
+ #include "head.h"
++#include <cstddef>
+ 
+ // OS/2 - OS/2 and Windows Metrics
+ // http://www.microsoft.com/opentype/otspec/os2.htm
+diff -u -r third_party/tcmalloc/chromium/src/base/stl_allocator.h third_party/tcmalloc/chromium/src/base/stl_allocator.h
+--- third_party/tcmalloc/chromium/src/base/stl_allocator.h	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/base/stl_allocator.h	2011-04-20 19:32:58.000000000 +0400
+@@ -38,6 +38,7 @@
+ #include <config.h>
+ 
+ #include <limits>
++#include <cstddef>
+ 
+ #include "base/basictypes.h"
+ #include "base/logging.h"
+diff -u -r third_party/tcmalloc/chromium/src/base/vdso_support.h third_party/tcmalloc/chromium/src/base/vdso_support.h
+--- third_party/tcmalloc/chromium/src/base/vdso_support.h	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/base/vdso_support.h	2011-04-20 19:32:58.000000000 +0400
+@@ -37,6 +37,7 @@
+ 
+ #define HAVE_VDSO_SUPPORT 1
+ 
++#include <cstddef>
+ #include <stdlib.h>     // for NULL
+ #include <link.h>  // for ElfW
+ #include "base/basictypes.h"
+diff -u -r third_party/tcmalloc/chromium/src/common.cc third_party/tcmalloc/chromium/src/common.cc
+--- 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 "config.h"
+ #include "common.h"
+ #include "system-alloc.h"
++#include <cstddef>
+ 
+ namespace tcmalloc {
+ 
+diff -u -r third_party/tcmalloc/chromium/src/symbolize.h third_party/tcmalloc/chromium/src/symbolize.h
+--- third_party/tcmalloc/chromium/src/symbolize.h	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/symbolize.h	2011-04-20 19:32:58.000000000 +0400
+@@ -38,6 +38,7 @@
+ #include <stdint.h>  // for uintptr_t
+ #endif
+ #include <map>
++#include <cstddef>
+ 
+ using std::map;
+ 
+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
+@@ -7,6 +7,7 @@
+ #pragma once
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ class SkBitmap;
+ 

Added: chromium-gcc47.patch
===================================================================
--- chromium-gcc47.patch	                        (rev 0)
+++ chromium-gcc47.patch	2012-04-06 06:32:37 UTC (rev 155755)
@@ -0,0 +1,53 @@
+--- chromium-17.0.963.46/src/base/message_pump_libevent.cc.gcc47	2012-02-17 14:52:00.527217354 -0500
++++ chromium-17.0.963.46/src/base/message_pump_libevent.cc	2012-02-17 14:52:10.172135400 -0500
+@@ -6,6 +6,7 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include "base/auto_reset.h"
+ #include "base/compiler_specific.h"
+--- chromium-17.0.963.46/src/chrome/browser/policy/policy_path_parser_linux.cc.gcc47	2012-02-17 15:26:32.086746278 -0500
++++ chromium-17.0.963.46/src/chrome/browser/policy/policy_path_parser_linux.cc	2012-02-17 15:26:53.039544290 -0500
+@@ -3,6 +3,7 @@
+ // found in the LICENSE file.
+ 
+ #include <pwd.h>
++#include <unistd.h>
+ 
+ #include "chrome/browser/policy/policy_path_parser.h"
+ 
+--- chromium-17.0.963.46/src/ipc/ipc_channel.h.gcc47	2012-01-27 03:02:07.000000000 -0500
++++ chromium-17.0.963.46/src/ipc/ipc_channel.h	2012-02-17 14:46:31.821010460 -0500
+@@ -9,6 +9,7 @@
+ #include "base/process.h"
+ #include "ipc/ipc_channel_handle.h"
+ #include "ipc/ipc_message.h"
++#include <sys/types.h>
+ 
+ namespace IPC {
+ 
+--- chromium-17.0.963.46/src/ipc/ipc_platform_file.cc.gcc47	2012-01-27 03:02:07.000000000 -0500
++++ chromium-17.0.963.46/src/ipc/ipc_platform_file.cc	2012-02-17 14:46:31.824010435 -0500
+@@ -3,10 +3,7 @@
+ // found in the LICENSE file.
+ 
+ #include "ipc/ipc_platform_file.h"
+-
+-#if defined(OS_ANDROID)
+ #include <unistd.h>
+-#endif
+ 
+ namespace IPC {
+ 
+--- chromium-17.0.963.46/src/seccompsandbox/library.h.gcc47	2012-01-27 03:03:35.000000000 -0500
++++ chromium-17.0.963.46/src/seccompsandbox/library.h	2012-02-17 14:46:31.826010418 -0500
+@@ -12,6 +12,7 @@
+ #include <string>
+ #include <string.h>
+ #include <sys/mman.h>
++#include <sys/types.h>
+ 
+ #include "maps.h"
+ 

Deleted: gcc-4.6.patch
===================================================================
--- gcc-4.6.patch	2012-04-06 00:24:13 UTC (rev 155754)
+++ gcc-4.6.patch	2012-04-06 06:32:37 UTC (rev 155755)
@@ -1,88 +0,0 @@
-diff -u -r chrome/browser/search_engines/template_url_prepopulate_data.h chrome/browser/search_engines/template_url_prepopulate_data.h
---- chrome/browser/search_engines/template_url_prepopulate_data.h	2011-04-13 13:23:41.000000000 +0400
-+++ chrome/browser/search_engines/template_url_prepopulate_data.h	2011-04-20 19:32:58.000000000 +0400
-@@ -7,6 +7,7 @@
- #pragma once
- 
- #include <vector>
-+#include <cstddef>
- 
- class GURL;
- class PrefService;
-diff -u -r gpu/command_buffer/common/types.h gpu/command_buffer/common/types.h
---- gpu/command_buffer/common/types.h	2011-04-13 13:22:57.000000000 +0400
-+++ gpu/command_buffer/common/types.h	2011-04-20 19:32:58.000000000 +0400
-@@ -11,6 +11,7 @@
- #include <stdint.h>
- #endif
- #include <string>
-+#include <cstddef>
- 
- typedef signed char         schar;
- typedef signed char         int8;
-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
-@@ -5,6 +5,7 @@
- #include "os2.h"
- 
- #include "head.h"
-+#include <cstddef>
- 
- // OS/2 - OS/2 and Windows Metrics
- // http://www.microsoft.com/opentype/otspec/os2.htm
-diff -u -r third_party/tcmalloc/chromium/src/base/stl_allocator.h third_party/tcmalloc/chromium/src/base/stl_allocator.h
---- third_party/tcmalloc/chromium/src/base/stl_allocator.h	2011-04-13 13:23:04.000000000 +0400
-+++ third_party/tcmalloc/chromium/src/base/stl_allocator.h	2011-04-20 19:32:58.000000000 +0400
-@@ -38,6 +38,7 @@
- #include <config.h>
- 
- #include <limits>
-+#include <cstddef>
- 
- #include "base/basictypes.h"
- #include "base/logging.h"
-diff -u -r third_party/tcmalloc/chromium/src/base/vdso_support.h third_party/tcmalloc/chromium/src/base/vdso_support.h
---- third_party/tcmalloc/chromium/src/base/vdso_support.h	2011-04-13 13:23:04.000000000 +0400
-+++ third_party/tcmalloc/chromium/src/base/vdso_support.h	2011-04-20 19:32:58.000000000 +0400
-@@ -37,6 +37,7 @@
- 
- #define HAVE_VDSO_SUPPORT 1
- 
-+#include <cstddef>
- #include <stdlib.h>     // for NULL
- #include <link.h>  // for ElfW
- #include "base/basictypes.h"
-diff -u -r third_party/tcmalloc/chromium/src/common.cc third_party/tcmalloc/chromium/src/common.cc
---- 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 "config.h"
- #include "common.h"
- #include "system-alloc.h"
-+#include <cstddef>
- 
- namespace tcmalloc {
- 
-diff -u -r third_party/tcmalloc/chromium/src/symbolize.h third_party/tcmalloc/chromium/src/symbolize.h
---- third_party/tcmalloc/chromium/src/symbolize.h	2011-04-13 13:23:04.000000000 +0400
-+++ third_party/tcmalloc/chromium/src/symbolize.h	2011-04-20 19:32:58.000000000 +0400
-@@ -38,6 +38,7 @@
- #include <stdint.h>  // for uintptr_t
- #endif
- #include <map>
-+#include <cstddef>
- 
- using std::map;
- 
-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
-@@ -7,6 +7,7 @@
- #pragma once
- 
- #include <vector>
-+#include <cstddef>
- 
- class SkBitmap;
- 



More information about the arch-commits mailing list