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

Evangelos Foutras foutrelis at archlinux.org
Wed Feb 8 16:17:25 EST 2012


    Date: Wednesday, February 8, 2012 @ 16:17:24
  Author: foutrelis
Revision: 149632

upgpkg: chromium 17.0.963.46-1

New upstream release.

Added:
  chromium/trunk/chromium-media-no-sse-r0.patch
Modified:
  chromium/trunk/PKGBUILD
  chromium/trunk/nacl-cflags-remove-fstack-protector.patch
Deleted:
  chromium/trunk/fix-downloads-on-ntfs.patch

-------------------------------------------+
 PKGBUILD                                  |   34 ++++++++++++----------------
 chromium-media-no-sse-r0.patch            |   17 ++++++++++++++
 fix-downloads-on-ntfs.patch               |   26 ---------------------
 nacl-cflags-remove-fstack-protector.patch |   28 ++++++++++++++---------
 4 files changed, 49 insertions(+), 56 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-08 20:57:56 UTC (rev 149631)
+++ PKGBUILD	2012-02-08 21:17:24 UTC (rev 149632)
@@ -9,8 +9,8 @@
 # build time.
 
 pkgname=chromium
-pkgver=16.0.912.77
-pkgrel=2
+pkgver=17.0.963.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/"
@@ -31,15 +31,15 @@
         chromium.desktop
         chromium.sh
         gcc-4.6.patch
-        fix-downloads-on-ntfs.patch
-        nacl-cflags-remove-fstack-protector.patch)
-sha256sums=('fc84e9a96d00a95c44beb6539b9ffe7224dc3ca51afef6486e0e7ad705445a32'
+        nacl-cflags-remove-fstack-protector.patch
+        chromium-media-no-sse-r0.patch)
+sha256sums=('9f9a3799dee3f998b8e629edeb686976567fc145d659e5bb744af8a425d26879'
             '964fe3a5ec56f2505649aba00f900abe4205674b7fdaa16772647d347173bb01'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
             'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3'
             '9c5e0803904d1a0e71ab7444c92a7046a34a9518eeba7a70f2eec7abecb8bf4e'
-            '6364c464d1885b2ec21076f01f993725925ccc066805f1ecbbeaf6f79b93c209'
-            '406f06a1a18fad4ba9e5d4e142509f1ac1512d176cc36c1744a7abf949991e2e')
+            '59e732880314333d6e9acf6ac99de467c98e8a92aa5c5292ae808a805e0f8d76'
+            '71751bf5913da1eec3c88c433044224c869b0abd5a29172cf239bddbb4eff761')
 
 build() {
   cd "$srcdir/chromium-$pkgver"
@@ -48,18 +48,14 @@
   # http://code.google.com/p/chromium/issues/detail?id=80071
   patch -Np0 -i "$srcdir/gcc-4.6.patch"
 
-  # Fix build with CUPS 1.5
-  sed -i '/#include <cups\/cups.h>/ a #include <cups/ppd.h>' \
-    chrome/browser/ui/webui/print_preview_handler.cc
-
-  # Fix downloading on NTFS partitions
-  # http://code.google.com/p/chromium/issues/detail?id=102200
-  patch -Np2 -i "$srcdir/fix-downloads-on-ntfs.patch"
-
   # Filter -fstack-protector out of cflags for nacl_helper_bootstrap
   # http://code.google.com/p/chromium/issues/detail?id=104569
-  patch -Np2 -i "$srcdir/nacl-cflags-remove-fstack-protector.patch"
+  patch -d native_client -Np1 -i \
+    "$srcdir/nacl-cflags-remove-fstack-protector.patch"
 
+  # Remove unconditional use of SSE3 (patch from Gentoo)
+  patch -Np0 -i "$srcdir/chromium-media-no-sse-r0.patch"
+
   # Use Python 2
   find . -type f -exec sed -i -r \
     -e 's|/usr/bin/python$|&2|g' \
@@ -71,10 +67,10 @@
   export PATH="$srcdir/python2-path:$PATH"
 
   pushd "$srcdir/nacl_sdk"
-  ./naclsdk update pepper_15
+  ./naclsdk update pepper_16
   popd
 
-  ln -s "$srcdir/nacl_sdk/pepper_15/toolchain/linux_x86_newlib" \
+  ln -s "$srcdir/nacl_sdk/pepper_16/toolchain/linux_x86_newlib" \
     native_client/toolchain/linux_x86_newlib
 
   # We need to disable system_ssl until "next protocol negotiation" support is
@@ -95,7 +91,7 @@
     -Duse_system_bzip2=1 \
     -Duse_system_ffmpeg=0 \
     -Duse_system_libevent=1 \
-    -Duse_system_libjpeg=1 \
+    -Duse_system_libjpeg=0 \
     -Duse_system_libpng=1 \
     -Duse_system_libxml=0 \
     -Duse_system_ssl=0 \

Added: chromium-media-no-sse-r0.patch
===================================================================
--- chromium-media-no-sse-r0.patch	                        (rev 0)
+++ chromium-media-no-sse-r0.patch	2012-02-08 21:17:24 UTC (rev 149632)
@@ -0,0 +1,17 @@
+--- 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: fix-downloads-on-ntfs.patch
===================================================================
--- fix-downloads-on-ntfs.patch	2012-02-08 20:57:56 UTC (rev 149631)
+++ fix-downloads-on-ntfs.patch	2012-02-08 21:17:24 UTC (rev 149632)
@@ -1,26 +0,0 @@
---- trunk/src/content/browser/download/base_file.cc	2011/11/03 00:57:14	108379
-+++ trunk/src/content/browser/download/base_file.cc	2011/11/03 00:57:22	108380
-@@ -332,16 +332,19 @@
-     int stat_error = stat(new_path.value().c_str(), &st);
-     bool stat_succeeded = (stat_error == 0);
-     if (!stat_succeeded)
--      return LOG_ERROR("stat", net::MapSystemError(errno));
-+      LOG_ERROR("stat", net::MapSystemError(errno));
- 
-     // TODO(estade): Move() falls back to copying and deleting when a simple
-     // rename fails. Copying sucks for large downloads. crbug.com/8737
-     if (!file_util::Move(full_path_, new_path))
-       return LOG_ERROR("Move", net::MapSystemError(errno));
- 
--    int chmod_error = chmod(new_path.value().c_str(), st.st_mode);
--    if (chmod_error < 0)
--      return LOG_ERROR("chmod", net::MapSystemError(errno));
-+    if (stat_succeeded) {
-+      // On Windows file systems (FAT, NTFS), chmod fails.  This is OK.
-+      int chmod_error = chmod(new_path.value().c_str(), st.st_mode);
-+      if (chmod_error < 0)
-+        LOG_ERROR("chmod", net::MapSystemError(errno));
-+    }
-   }
- #endif
- 

Modified: nacl-cflags-remove-fstack-protector.patch
===================================================================
--- nacl-cflags-remove-fstack-protector.patch	2012-02-08 20:57:56 UTC (rev 149631)
+++ nacl-cflags-remove-fstack-protector.patch	2012-02-08 21:17:24 UTC (rev 149632)
@@ -1,11 +1,17 @@
---- src/chromium-16.0.912.63/chrome/nacl.gypi.orig	2011-12-28 19:10:42.000000000 +0200
-+++ src/chromium-16.0.912.63/chrome/nacl.gypi	2011-12-28 19:11:09.000000000 +0200
-@@ -275,6 +275,8 @@
-               'cflags!': [
-                 '-fasan',
-                 '-w',
-+                '-fstack-protector',
-+                '-fstack-protector-all',
-               ],
-               'conditions': [
-                 ['clang==1', {
+Index: src/trusted/service_runtime/linux/nacl_bootstrap.gyp
+diff --git a/src/trusted/service_runtime/linux/nacl_bootstrap.gyp b/src/trusted/service_runtime/linux/nacl_bootstrap.gyp
+index 66d95ca4dc98653219c965b899dbd5ad35d2960c..083e3fdd24ff4562d2037f8d17a06540e05357b8 100644
+--- a/src/trusted/service_runtime/linux/nacl_bootstrap.gyp
++++ b/src/trusted/service_runtime/linux/nacl_bootstrap.gyp
+@@ -84,6 +84,11 @@
+         '-fasan',
+         '-faddress-sanitizer',
+         '-w',
++        # We filter these out because release_extra_cflags or another
++        # such thing might be adding them in, and those options wind up
++        # coming after the -fno-stack-protector we added above.
++        '-fstack-protector',
++        '-fstack-protector-all',
+       ],
+       'conditions': [
+         ['clang==1', {



More information about the arch-commits mailing list