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

Evangelos Foutras foutrelis at archlinux.org
Tue May 15 20:23:24 UTC 2012 

    Date: Tuesday, May 15, 2012 @ 16:23:23
  Author: foutrelis
Revision: 159118

Bump to 19.0.1084.46; enable system libxml.

Modified:
  chromium/trunk/PKGBUILD
Deleted:
  chromium/trunk/chromium-media-no-sse-r0.patch
  chromium/trunk/chromium-revert-jpeg-swizzle-r2.patch

---------------------------------------+
 PKGBUILD                              |   35 ++++++------------
 chromium-media-no-sse-r0.patch        |   17 --------
 chromium-revert-jpeg-swizzle-r2.patch |   61 --------------------------------
 3 files changed, 13 insertions(+), 100 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-15 19:51:57 UTC (rev 159117)
+++ PKGBUILD	2012-05-15 20:23:23 UTC (rev 159118)
@@ -9,14 +9,14 @@
 # build time.
 
 pkgname=chromium
-pkgver=18.0.1025.168
-pkgrel=2
+pkgver=19.0.1084.46
+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')
 url="http://www.chromium.org/"
 license=('BSD')
 depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent'
-         'libxss' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils'
+         'libxss' 'libgcrypt' 'libxslt' 'ttf-dejavu' 'desktop-file-utils'
          'hicolor-icon-theme')
 makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
              'elfutils')
@@ -31,37 +31,23 @@
         chromium.desktop
         chromium.sh
         chromium-gcc47.patch
-        sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch
-        chromium-media-no-sse-r0.patch
-        chromium-revert-jpeg-swizzle-r2.patch)
-sha256sums=('1f1fc7bd8066835844a465f9d60c49c21173ff559c40e5d113fe9c4627fc18b9'
-            'f9c5bc8ef4e251769a0609cbca1692682140dc93364c2558aaade3c404f3d987'
+        sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch)
+sha256sums=('2fb77e5d155343a828bd04b6b9d4469fce3033dc6b9f8b53e34a9d02c464639f'
+            '2256327dc58792309911fe88996527925b79ddc7729ec78548b4adf5e4983d42'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
             'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3'
             'f607347ba8477d3c8e60eb3803d26f3c9869f77fd49986c60887c59a6aa7d30d'
-            'a700aa054800d1b21d84eaba27c38a703dfa023e9226d11a942690c2a0630aff'
-            '71751bf5913da1eec3c88c433044224c869b0abd5a29172cf239bddbb4eff761'
-            'd99162aa6bae562f116a42347254bbec3752464f0a3e4d8675e2b287b2a838a2')
+            'a700aa054800d1b21d84eaba27c38a703dfa023e9226d11a942690c2a0630aff')
 
 build() {
   cd "$srcdir/chromium-$pkgver"
 
   # 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
 
   # http://code.google.com/p/chromium/issues/detail?id=109527
   sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc
 
-  # Remove unconditional use of SSE3 (patch from Gentoo)
-  patch -Np0 -i "$srcdir/chromium-media-no-sse-r0.patch"
-
-  # Fix JPEG image rendering problem (patch from Gentoo bug #393471)
-  patch -Np0 -i "$srcdir/chromium-revert-jpeg-swizzle-r2.patch"
-
   # SQLite: Fix a problem in fts3_write.c causing stack memory to be referenced
   # after it is out of scope (http://www.sqlite.org/src/info/f9c4a7c8f4)
   # (http://code.google.com/p/chromium/issues/detail?id=122525)
@@ -88,10 +74,15 @@
   # CFLAGS are passed through release_extra_cflags below
   export -n CFLAGS CXXFLAGS
 
+  # Silence "identifier 'nullptr' is a keyword in C++11" warnings
+  CFLAGS+=' -Wno-c++0x-compat'
+
   build/gyp_chromium --depth=. \
     -Dwerror= \
     -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
     -Dlinux_strip_binary=1 \
+    -Dlinux_use_gold_binary=0 \
+    -Dlinux_use_gold_flags=0 \
     -Drelease_extra_cflags="$CFLAGS" \
     -Dffmpeg_branding=Chrome \
     -Dproprietary_codecs=1 \
@@ -100,7 +91,7 @@
     -Duse_system_libevent=1 \
     -Duse_system_libjpeg=1 \
     -Duse_system_libpng=1 \
-    -Duse_system_libxml=0 \
+    -Duse_system_libxml=1 \
     -Duse_system_ssl=0 \
     -Duse_system_yasm=1 \
     -Duse_system_zlib=1 \

Deleted: chromium-media-no-sse-r0.patch
===================================================================
--- chromium-media-no-sse-r0.patch	2012-05-15 19:51:57 UTC (rev 159117)
+++ chromium-media-no-sse-r0.patch	2012-05-15 20:23:23 UTC (rev 159118)
@@ -1,17 +0,0 @@
---- media/media.gyp.orig	2012-02-02 10:03:41.000000000 +0100
-+++ media/media.gyp	2012-02-02 10:04:09.000000000 +0100
-@@ -467,14 +467,6 @@
-         [ 'os_posix == 1 and OS != "mac" and OS != "android"', {
-           'cflags': [
-             '-msse2',
--            '-msse3',
--            '-mssse3',
--          ],
--        }],
--        [ 'OS == "openbsd"', {
--          # OpenBSD's gcc (4.2.1) does not support -mssse3
--          'cflags!': [
--            '-mssse3',
-           ],
-         }],
-         [ 'OS == "mac"', {

Deleted: chromium-revert-jpeg-swizzle-r2.patch
===================================================================
--- chromium-revert-jpeg-swizzle-r2.patch	2012-05-15 19:51:57 UTC (rev 159117)
+++ chromium-revert-jpeg-swizzle-r2.patch	2012-05-15 20:23:23 UTC (rev 159118)
@@ -1,61 +0,0 @@
-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) {

More information about the arch-commits mailing list