chromium: update to 20.0.1132.43.
This commit is contained in:
Juan RP
parent
bea8006be2
commit
245d583047
4 changed files with 33 additions and 31 deletions
|
|
@ -36,9 +36,9 @@ libgcc_s.so.1
|
|||
libc.so.6
|
||||
libXfixes.so.3
|
||||
ld-linux-x86-64.so.2
|
||||
libresolv.so.2
|
||||
libXcomposite.so.1
|
||||
libcups.so.2
|
||||
libgcrypt.so.11
|
||||
libFLAC.so.8
|
||||
libudev.so.1
|
||||
libatk-1.0.so.0
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- chromium-19.0.1084.46/base/message_pump_libevent.cc.gcc47 2012-02-17 14:52:00.527217354 -0500
|
||||
+++ chromium-19.0.1084.46/base/message_pump_libevent.cc 2012-02-17 14:52:10.172135400 -0500
|
||||
--- chromium-20.0.1132.43/base/message_pump_libevent.cc.gcc47 2012-02-17 14:52:00.527217354 -0500
|
||||
+++ chromium-20.0.1132.43/base/message_pump_libevent.cc 2012-02-17 14:52:10.172135400 -0500
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
#include <errno.h>
|
||||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
#include "base/auto_reset.h"
|
||||
#include "base/compiler_specific.h"
|
||||
--- chromium-19.0.1084.46/chrome/browser/policy/policy_path_parser_linux.cc.gcc47 2012-02-17 15:26:32.086746278 -0500
|
||||
+++ chromium-19.0.1084.46/chrome/browser/policy/policy_path_parser_linux.cc 2012-02-17 15:26:53.039544290 -0500
|
||||
--- chromium-20.0.1132.43/chrome/browser/policy/policy_path_parser_linux.cc.gcc47 2012-02-17 15:26:32.086746278 -0500
|
||||
+++ chromium-20.0.1132.43/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.
|
||||
|
||||
|
|
@ -18,8 +18,8 @@
|
|||
|
||||
#include "chrome/browser/policy/policy_path_parser.h"
|
||||
|
||||
--- chromium-19.0.1084.46/ipc/ipc_channel.h.gcc47 2012-01-27 03:02:07.000000000 -0500
|
||||
+++ chromium-19.0.1084.46/ipc/ipc_channel.h 2012-02-17 14:46:31.821010460 -0500
|
||||
--- chromium-20.0.1132.43/ipc/ipc_channel.h.gcc47 2012-01-27 03:02:07.000000000 -0500
|
||||
+++ chromium-20.0.1132.43/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"
|
||||
|
|
@ -28,8 +28,8 @@
|
|||
|
||||
namespace IPC {
|
||||
|
||||
--- chromium-19.0.1084.46/ipc/ipc_platform_file.cc.gcc47 2012-01-27 03:02:07.000000000 -0500
|
||||
+++ chromium-19.0.1084.46/ipc/ipc_platform_file.cc 2012-02-17 14:46:31.824010435 -0500
|
||||
--- chromium-20.0.1132.43/ipc/ipc_platform_file.cc.gcc47 2012-01-27 03:02:07.000000000 -0500
|
||||
+++ chromium-20.0.1132.43/ipc/ipc_platform_file.cc 2012-02-17 14:46:31.824010435 -0500
|
||||
@@ -3,10 +3,7 @@
|
||||
// found in the LICENSE file.
|
||||
|
||||
|
|
@ -41,8 +41,8 @@
|
|||
|
||||
namespace IPC {
|
||||
|
||||
--- chromium-19.0.1084.46/seccompsandbox/library.h.gcc47 2012-01-27 03:03:35.000000000 -0500
|
||||
+++ chromium-19.0.1084.46/seccompsandbox/library.h 2012-02-17 14:46:31.826010418 -0500
|
||||
--- chromium-20.0.1132.43/seccompsandbox/library.h.gcc47 2012-01-27 03:03:35.000000000 -0500
|
||||
+++ chromium-20.0.1132.43/seccompsandbox/library.h 2012-02-17 14:46:31.826010418 -0500
|
||||
@@ -12,6 +12,7 @@
|
||||
#include <string>
|
||||
#include <string.h>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- chromium-19.0.1084.46/third_party/sqlite/src/ext/fts3/fts3_write.c.orig 2012-05-08 21:05:03.000000000 +0300
|
||||
+++ chromium-19.0.1084.46/third_party/sqlite/src/ext/fts3/fts3_write.c 2012-05-08 21:07:08.000000000 +0300
|
||||
--- chromium-20.0.1132.43/third_party/sqlite/src/ext/fts3/fts3_write.c.orig 2012-05-08 21:05:03.000000000 +0300
|
||||
+++ chromium-20.0.1132.43/third_party/sqlite/src/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 */
|
||||
){
|
||||
|
|
|
|||
|
|
@ -1,17 +1,20 @@
|
|||
# Template file for 'chromium'
|
||||
pkgname=chromium
|
||||
version=19.0.1084.46
|
||||
revision=3
|
||||
version=20.0.1132.43
|
||||
revision=1
|
||||
wrksrc=$pkgname
|
||||
create_wrksrc=yes
|
||||
create_srcdir=yes
|
||||
build_requires=27
|
||||
build_wrksrc=${pkgname}-${version}
|
||||
distfiles="
|
||||
http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$version.tar.bz2"
|
||||
#http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/$version/naclsdk_linux.bz2"
|
||||
depends="desktop-file-utils hicolor-icon-theme"
|
||||
makedepends="pkg-config which unzip yasm flex gperf perl python libudev-devel>=138 libpng-devel>=1.5.10 libgcrypt-devel libelf-devel mit-krb5-devel libXrender-devel libXScrnSaver-devel libXcomposite-devel libX11-devel libXi-devel gtk+-devel libevent-devel nss-devel alsa-lib-devel dbus-glib-devel libXdamage-devel libXtst-devel pam-devel libgnome-keyring-devel libvpx-devel speex-devel libwebp-devel pulseaudio-devel cups-devel hunspell-devel libflac-devel"
|
||||
makedepends="pkg-config which unzip yasm flex gperf perl python
|
||||
libudev-devel>=138 libpng-devel>=1.5.10 libgcrypt-devel libelf-devel
|
||||
mit-krb5-devel libXrender-devel libXScrnSaver-devel libXcomposite-devel
|
||||
libX11-devel libXi-devel gtk+-devel libevent-devel nss-devel alsa-lib-devel
|
||||
dbus-glib-devel libXdamage-devel libXtst-devel pam-devel libgnome-keyring-devel
|
||||
libvpx-devel speex-devel libwebp-devel pulseaudio-devel cups-devel
|
||||
hunspell-devel libflac-devel subversion"
|
||||
if [ "$XBPS_MACHINE" = "x86_64" ]; then
|
||||
makedepends="${makedepends} gcc-multilib"
|
||||
fi
|
||||
|
|
@ -20,9 +23,12 @@ short_desc="Google's attempt at creating a safer, faster, and more stable browse
|
|||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://www.chromium.org/"
|
||||
license="BSD"
|
||||
distfiles="
|
||||
http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$version.tar.bz2
|
||||
http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/$version/naclsdk_linux.bz2"
|
||||
checksum="
|
||||
2fb77e5d155343a828bd04b6b9d4469fce3033dc6b9f8b53e34a9d02c464639f"
|
||||
#2256327dc58792309911fe88996527925b79ddc7729ec78548b4adf5e4983d42"
|
||||
c21bdee0ec136102e10c527a0d98e3a29e40406d8f7eb63e8e0ac23801722824
|
||||
aa836ba493e659f028e8624764ba7662ef4eccd609be4c6812a7901eaf63f6e4"
|
||||
long_desc="
|
||||
Chromium is an open-source browser project that aims to build a safer,
|
||||
faster, and more stable way for all Internet users to experience the web.
|
||||
|
|
@ -33,23 +39,18 @@ long_desc="
|
|||
|
||||
This package contains the Chromium browser."
|
||||
|
||||
#XXX: nacl disabled for i686 (temporary)
|
||||
|
||||
pre_configure() {
|
||||
# http://code.google.com/p/chromium/issues/detail?id=109527
|
||||
sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc
|
||||
|
||||
# Unpack nacl, file is a real POSIX tar archive compressed with bzip2.
|
||||
# tar xf $wrksrc/naclsdk_linux -C $wrksrc
|
||||
tar xf $wrksrc/naclsdk_linux -C $wrksrc
|
||||
|
||||
ln -s $wrksrc/pepper_${version%%.*}/toolchain/linux_x86_newlib \
|
||||
native_client/toolchain/linux_x86_newlib
|
||||
}
|
||||
|
||||
do_configure() {
|
||||
# We need to disable system_ssl until "next protocol negotiation" support is
|
||||
# available in our nss package.
|
||||
# (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312)
|
||||
build/gyp_chromium -f make build/all.gyp --depth=. \
|
||||
-Dwerror= -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
|
||||
-Drelease_extra_cflags="$CFLAGS" -Dlinux_use_gold_binary=0 \
|
||||
|
|
@ -61,8 +62,7 @@ do_configure() {
|
|||
-Duse_system_libevent=1 -Duse_system_ssl=0 \
|
||||
-Duse_system_xdg_utils=1 -Duse_system_vpx=1 \
|
||||
-Duse_system_speex=1 -Duse_system_libwebp=1 \
|
||||
-Duse_hunspell=1 -Duse_system_flac=1 -Duse_gconf=0 \
|
||||
-Ddisable_nacl=1
|
||||
-Duse_hunspell=1 -Duse_system_flac=1 -Duse_gconf=0
|
||||
}
|
||||
|
||||
do_build() {
|
||||
|
|
@ -75,8 +75,10 @@ do_install() {
|
|||
vinstall out/Release/chrome.pak 644 usr/lib/${pkgname}
|
||||
vinstall out/Release/resources.pak 644 usr/lib/${pkgname}
|
||||
vinstall out/Release/libffmpegsumo.so 755 usr/lib/${pkgname}
|
||||
# vinstall out/Release/libppGoogleNaClPluginChrome.so 755 usr/lib/${pkgname}
|
||||
# vcopy "out/Release/nacl_irt_x86_*.nexe" usr/lib/${pkgname}
|
||||
vinstall out/Release/libppGoogleNaClPluginChrome.so 755 usr/lib/${pkgname}
|
||||
vinstall out/Release/nacl_helper 755 usr/lib/$pkgname
|
||||
vinstall out/Release/nacl_helper_bootstrap 755 usr/lib/$pkgname
|
||||
vcopy "out/Release/nacl_irt_*.nexe" usr/lib/${pkgname}
|
||||
|
||||
for f in locales resources; do
|
||||
vcopy out/Release/${f} usr/lib/chromium
|
||||
|
|
|
|||
Loading…
Reference in a new issue