[arch-commits] Commit in chromium/trunk (PKGBUILD chromium-gcc46.patch)

Evangelos Foutras foutrelis at archlinux.org
Sun Apr 8 05:44:35 EDT 2012


    Date: Sunday, April 8, 2012 @ 05:44:34
  Author: foutrelis
Revision: 155873

upgpkg: chromium 18.0.1025.151-3

Rebuild with GCC 4.6 as a workaround for FS#29309.

Modified:
  chromium/trunk/PKGBUILD
Deleted:
  chromium/trunk/chromium-gcc46.patch

----------------------+
 PKGBUILD             |   22 +++++-------
 chromium-gcc46.patch |   88 -------------------------------------------------
 2 files changed, 10 insertions(+), 100 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-08 07:25:46 UTC (rev 155872)
+++ PKGBUILD	2012-04-08 09:44:34 UTC (rev 155873)
@@ -10,7 +10,7 @@
 
 pkgname=chromium
 pkgver=18.0.1025.151
-pkgrel=1
+pkgrel=3
 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
 arch=('i686' 'x86_64')
 url="http://www.chromium.org/"
@@ -18,8 +18,12 @@
 depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent'
          'libxss' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils'
          'hicolor-icon-theme')
+# Building with GCC 4.7 causes segfaults; build with 4.6 for the time being
+# https://bugs.archlinux.org/task/29309
+# Mirror snapshop before GCC 4.7 moved to [core]:
+# Server = http://arm.konnichi.com/2012/04/02/$repo/os/$arch
 makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
-             'elfutils')
+             'elfutils' 'gcc<4.7')
 optdepends=('kdebase-kdialog: needed for file dialogs in KDE')
 # Needed for the NaCl toolchain
 [[ $CARCH == x86_64 ]] && makedepends+=('lib32-zlib')
@@ -30,7 +34,6 @@
         http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip
         chromium.desktop
         chromium.sh
-        chromium-gcc46.patch
         chromium-gcc47.patch
         chromium-media-no-sse-r0.patch
         chromium-revert-jpeg-swizzle-r2.patch)
@@ -38,7 +41,6 @@
             '8cf762587e547588b9461686f7d2655d5a23d09e1260b5f97137fa7d41c767a9'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
             'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3'
-            '50268dafd436813f846ea174d19c447c64d198c3937bd56910d87c5206306977'
             'f607347ba8477d3c8e60eb3803d26f3c9869f77fd49986c60887c59a6aa7d30d'
             '71751bf5913da1eec3c88c433044224c869b0abd5a29172cf239bddbb4eff761'
             'd99162aa6bae562f116a42347254bbec3752464f0a3e4d8675e2b287b2a838a2')
@@ -46,16 +48,12 @@
 build() {
   cd "$srcdir/chromium-$pkgver"
 
-  # Fix build with gcc 4.6
-  # http://code.google.com/p/chromium/issues/detail?id=80071
-  patch -Np0 -i "$srcdir/chromium-gcc46.patch"
-
   # Fix build with gcc 4.7 (patch from openSUSE)
-  patch -Np2 -i "$srcdir/chromium-gcc47.patch"
+  #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
+  #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"

Deleted: chromium-gcc46.patch
===================================================================
--- chromium-gcc46.patch	2012-04-08 07:25:46 UTC (rev 155872)
+++ chromium-gcc46.patch	2012-04-08 09:44:34 UTC (rev 155873)
@@ -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