[arch-commits] Commit in chromium/trunk (4 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed Aug 1 10:00:53 UTC 2012
Date: Wednesday, August 1, 2012 @ 06:00:53
Author: foutrelis
Revision: 164503
upgpkg: chromium 21.0.1180.57-1
New upstream release.
Added:
chromium/trunk/chromium-ppapi-r0.patch
Modified:
chromium/trunk/PKGBUILD
Deleted:
chromium/trunk/chromium-gcc47.patch
chromium/trunk/sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch
--------------------------------------------------------+
PKGBUILD | 51 +++++++-------
chromium-gcc47.patch | 53 ---------------
chromium-ppapi-r0.patch | 11 +++
sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch | 26 -------
4 files changed, 37 insertions(+), 104 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-08-01 09:59:07 UTC (rev 164502)
+++ PKGBUILD 2012-08-01 10:00:53 UTC (rev 164503)
@@ -9,8 +9,9 @@
# build time.
pkgname=chromium
-pkgver=20.0.1132.57
-pkgrel=2
+pkgver=21.0.1180.57
+_nacl_sdk=20.0.1132.47
+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/"
@@ -28,30 +29,25 @@
backup=('etc/chromium/default')
install=chromium.install
source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2
- naclsdk_linux-$pkgver.tar.bz2::http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/$pkgver/naclsdk_linux.bz2
+ naclsdk_linux-$_nacl_sdk.tar.bz2::http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/$_nacl_sdk/naclsdk_linux.bz2
chromium.desktop
chromium.default
chromium.sh
- chromium-gcc47.patch
+ chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
chromium-20.0.1132.57-bison-2.6-fix.patch
- chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
- sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch)
-sha256sums=('1225c6b6306e89c8892bc0d18e94567d6081d777dee9b8c90efd0da9f6f2641b'
- '0137e738cad095aeb03da0e4eb92df4ab8f4693c81d462eb5a413de6ecd875d1'
+ chromium-ppapi-r0.patch)
+sha256sums=('311ba95249ea994747355596885c9ad583e55bcbe7220a47ea096898e7aeb145'
+ 'ac371e9e8312f01856e892b29c788acfa03cbb79aaabe0b5a3ae0cd2f8399a91'
'09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
'478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
'4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
- 'f607347ba8477d3c8e60eb3803d26f3c9869f77fd49986c60887c59a6aa7d30d'
+ 'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615'
'd7aecc17e1eb582fe791c3e5fb2ca3f0efcb9bf5379309c1c27be35be4363bba'
- 'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615'
- 'a700aa054800d1b21d84eaba27c38a703dfa023e9226d11a942690c2a0630aff')
+ '1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd')
build() {
cd "$srcdir/chromium-$pkgver"
- # Fix build with gcc 4.7 (patch from openSUSE)
- patch -Np2 -i "$srcdir/chromium-gcc47.patch"
-
# Fix build with glibc 2.16
patch -Np1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch"
@@ -60,15 +56,12 @@
patch -d third_party/WebKit -Np1 -i \
"$srcdir/chromium-20.0.1132.57-bison-2.6-fix.patch"
+ # Fix build without NaCl glibc toolchain (patch from Gentoo)
+ patch -Np0 -i "$srcdir/chromium-ppapi-r0.patch"
+
# http://code.google.com/p/chromium/issues/detail?id=109527
sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc
- # 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)
- patch -i "$srcdir/sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch" \
- third_party/sqlite/amalgamation/sqlite3.c
-
# Use Python 2
find . -type f -exec sed -i -r \
-e 's|/usr/bin/python$|&2|g' \
@@ -79,7 +72,7 @@
ln -s /usr/bin/python2 "$srcdir/python2-path/python"
export PATH="$srcdir/python2-path:$PATH"
- ln -s "$srcdir/pepper_${pkgver%%.*}/toolchain/linux_x86_newlib" \
+ ln -s "$srcdir/pepper_${_nacl_sdk%%.*}/toolchain/linux_x86_newlib" \
native_client/toolchain/linux_x86_newlib
# CFLAGS are passed through release_extra_cflags below
@@ -107,6 +100,7 @@
-Duse_system_yasm=1 \
-Duse_system_zlib=1 \
-Duse_gconf=0 \
+ -Ddisable_glibc=1 \
-Ddisable_sse2=1
make chrome chrome_sandbox BUILDTYPE=Release
@@ -124,23 +118,30 @@
out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
"$pkgdir/usr/lib/chromium/"
+ if [[ $CARCH == i686 ]]; then
+ rm "$pkgdir/usr/lib/chromium/nacl_irt_x86_64.nexe"
+ fi
+
# Allow users to override command-line options
install -Dm644 "$srcdir/chromium.default" "$pkgdir/etc/chromium/default"
- cp -a out/Release/locales out/Release/resources "$pkgdir/usr/lib/chromium/"
+ cp -a out/Release/locales "$pkgdir/usr/lib/chromium/"
- find "$pkgdir/usr/lib/chromium/" -name '*.d' -type f -delete
-
install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1"
install -Dm644 "$srcdir/chromium.desktop" \
"$pkgdir/usr/share/applications/chromium.desktop"
- for size in 16 22 24 32 48 64 128 256; do
+ for size in 22 24 48 64 128 256; do
install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
"$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
done
+ for size in 16 32; do
+ install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \
+ "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+ done
+
install -D "$srcdir/chromium.sh" "$pkgdir/usr/bin/chromium"
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE"
Deleted: chromium-gcc47.patch
===================================================================
--- chromium-gcc47.patch 2012-08-01 09:59:07 UTC (rev 164502)
+++ chromium-gcc47.patch 2012-08-01 10:00:53 UTC (rev 164503)
@@ -1,53 +0,0 @@
---- 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"
-
Added: chromium-ppapi-r0.patch
===================================================================
--- chromium-ppapi-r0.patch (rev 0)
+++ chromium-ppapi-r0.patch 2012-08-01 10:00:53 UTC (rev 164503)
@@ -0,0 +1,11 @@
+--- ppapi/ppapi_untrusted.gyp.orig 2012-06-12 10:20:16.000000000 +0200
++++ ppapi/ppapi_untrusted.gyp 2012-06-12 10:20:52.000000000 +0200
+@@ -80,7 +80,7 @@
+ ],
+ },
+ 'conditions': [
+- ['target_arch!="arm"', {
++ ['target_arch!="arm" and disable_glibc==0', {
+ 'variables': {
+ 'build_glibc': 1,
+ # NOTE: Use /lib, not /lib64 here; it is a symbolic link which
Deleted: sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch
===================================================================
--- sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch 2012-08-01 09:59:07 UTC (rev 164502)
+++ sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch 2012-08-01 10:00:53 UTC (rev 164503)
@@ -1,26 +0,0 @@
---- ext/fts3/fts3_write.c.orig 2012-05-08 21:05:03.000000000 +0300
-+++ ext/fts3/fts3_write.c 2012-05-08 21:07:08.000000000 +0300
-@@ -1238,13 +1238,13 @@ int sqlite3Fts3SegReaderPending(
- Fts3SegReader **ppReader /* OUT: SegReader for pending-terms */
- ){
- Fts3SegReader *pReader = 0; /* Fts3SegReader object to return */
-+ Fts3HashElem *pE; /* Iterator variable */
- Fts3HashElem **aElem = 0; /* Array of term hash entries to scan */
- int nElem = 0; /* Size of array at aElem */
- int rc = SQLITE_OK; /* Return Code */
-
- if( isPrefix ){
- int nAlloc = 0; /* Size of allocated array at aElem */
-- Fts3HashElem *pE = 0; /* Iterator variable */
-
- for(pE=fts3HashFirst(&p->pendingTerms); pE; pE=fts3HashNext(pE)){
- char *zKey = (char *)fts3HashKey(pE);
-@@ -1276,7 +1276,7 @@ int sqlite3Fts3SegReaderPending(
- }
-
- }else{
-- Fts3HashElem *pE = fts3HashFindElem(&p->pendingTerms, zTerm, nTerm);
-+ pE = fts3HashFindElem(&p->pendingTerms, zTerm, nTerm);
- if( pE ){
- aElem = &pE;
- nElem = 1;
More information about the arch-commits
mailing list