chromium: update to 26.0.1410.63
This commit is contained in:
ojab
parent
39cba5b15f
commit
86d6b879e9
4 changed files with 95 additions and 81 deletions
|
|
@ -1,12 +1,13 @@
|
|||
--- chromium-23.0.1271.95/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300
|
||||
+++ chromium-23.0.1271.95/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300
|
||||
diff -upr third_party/tcmalloc/chromium/src/base/linux_syscall_support.h third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
|
||||
--- third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300
|
||||
+++ third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300
|
||||
@@ -243,14 +243,13 @@ struct kernel_rusage {
|
||||
long ru_nivcsw;
|
||||
};
|
||||
|
||||
|
||||
-struct siginfo;
|
||||
#if defined(__i386__) || defined(__arm__) || defined(__PPC__)
|
||||
|
||||
|
||||
/* include/asm-{arm,i386,mips,ppc}/signal.h */
|
||||
struct kernel_old_sigaction {
|
||||
union {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
--- build/linux/system.gyp.orig 2013-04-02 00:42:20.645560574 +0000
|
||||
+++ build/linux/system.gyp 2013-04-02 00:43:15.615870417 +0000
|
||||
@@ -491,7 +491,7 @@
|
||||
'--name', 'LibSpeechdLoader',
|
||||
'--output-h', '<(output_h)',
|
||||
'--output-cc', '<(output_cc)',
|
||||
- '--header', '<libspeechd.h>',
|
||||
+ '--header', '<speech-dispatcher/libspeechd.h>',
|
||||
'--link-directly=<(linux_link_libspeechd)',
|
||||
'spd_open',
|
||||
'spd_say',
|
||||
38
srcpkgs/chromium/patches/chromium_fix_json_headers.patch
Normal file
38
srcpkgs/chromium/patches/chromium_fix_json_headers.patch
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
--- third_party/jsoncpp/jsoncpp.gyp.orig 2013-04-22 21:42:14.720741254 +0400
|
||||
+++ third_party/jsoncpp/jsoncpp.gyp 2013-04-22 21:42:55.616648298 +0400
|
||||
@@ -52,15 +52,15 @@
|
||||
'variables': {
|
||||
'headers_root_path': 'source/include',
|
||||
'header_filenames': [
|
||||
- 'json/assertions.h',
|
||||
- 'json/autolink.h',
|
||||
- 'json/config.h',
|
||||
- 'json/features.h',
|
||||
- 'json/forwards.h',
|
||||
- 'json/json.h',
|
||||
- 'json/reader.h',
|
||||
- 'json/value.h',
|
||||
- 'json/writer.h',
|
||||
+ 'jsoncpp/json/assertions.h',
|
||||
+ 'jsoncpp/json/autolink.h',
|
||||
+ 'jsoncpp/json/config.h',
|
||||
+ 'jsoncpp/json/features.h',
|
||||
+ 'jsoncpp/json/forwards.h',
|
||||
+ 'jsoncpp/json/json.h',
|
||||
+ 'jsoncpp/json/reader.h',
|
||||
+ 'jsoncpp/json/value.h',
|
||||
+ 'jsoncpp/json/writer.h',
|
||||
],
|
||||
},
|
||||
'includes': [
|
||||
--- third_party/libjingle/source/talk/base/json.h.orig 2013-04-22 23:06:06.051857164 +0400
|
||||
+++ third_party/libjingle/source/talk/base/json.h 2013-04-22 23:06:13.860853852 +0400
|
||||
@@ -32,7 +32,7 @@
|
||||
#include <vector>
|
||||
|
||||
#ifdef JSONCPP_RELATIVE_PATH
|
||||
-#include "json/json.h"
|
||||
+#include "jsoncpp/json/json.h"
|
||||
#else
|
||||
#include "third_party/jsoncpp/json.h"
|
||||
#endif
|
||||
|
|
@ -1,24 +1,15 @@
|
|||
# Template file for 'chromium'
|
||||
#
|
||||
# Disable NaCL for now, broken with glibc-2.16.
|
||||
#_build_nacl=1
|
||||
pkgname=chromium
|
||||
#See http://www.chromium.org/developers/calendar for the latest version
|
||||
version=23.0.1271.95
|
||||
patch_args="-Np0"
|
||||
revision=2
|
||||
version=26.0.1410.63
|
||||
revision=1
|
||||
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://www.chromium.org/"
|
||||
license="BSD"
|
||||
_url_base="http://commondatastorage.googleapis.com"
|
||||
distfiles="${_url_base}/chromium-browser-official/${pkgname}-${version}.tar.bz2"
|
||||
checksum="30097d21dfff134cbdc0ebe6bb848558d4854f725322aa26b25f83741279f13c"
|
||||
|
||||
if [ -n "${_build_nacl}" ]; then
|
||||
distfiles="${distfiles} ${_url_base}/nacl/nacl_sdk/${version}/naclsdk_linux.tar.bz2"
|
||||
checksum="${checksum} 85d0a9e2903a1d82b40c5e5a54350df6a5171eb1831f42e1f0e22f3a42e3ca13"
|
||||
fi
|
||||
distfiles="${_url_base}/${pkgname}-browser-official/${pkgname}-${version}.tar.xz"
|
||||
checksum="7af8f70745992afdee0196039b5beab1b86b6de7fa70ca4f4a04dc335f034b3f"
|
||||
|
||||
long_desc="
|
||||
Chromium is an open-source browser project that aims to build a safer,
|
||||
|
|
@ -29,71 +20,50 @@ long_desc="
|
|||
auto-updater system."
|
||||
|
||||
disable_debug=yes
|
||||
wrksrc=${pkgname}
|
||||
create_wrksrc=yes
|
||||
create_srcdir=yes
|
||||
build_wrksrc=${pkgname}-${version}
|
||||
|
||||
makedepends="pkg-config which unzip yasm bison flex gperf perl python
|
||||
libudev-devel>=138 libpng-devel>=1.5.10 libgcrypt-devel elfutils-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>=0.2.0 pulseaudio-devel cups-devel
|
||||
hunspell-devel libflac-devel icu-devel libxslt-devel libusb-devel v8-devel
|
||||
libXrandr-devel"
|
||||
makedepends="python pkg-config gtk+-devel nss-devel GConf-devel pciutils-devel
|
||||
libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
|
||||
libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
|
||||
gperf bison libXScrnSaver-devel alsa-lib-devel icu-devel which protobuf-devel
|
||||
libxml2-devel libxslt-devel sqlite-devel yasm opus-devel ffmpeg-devel
|
||||
libvpx-devel libflac-devel speex-devel libusb-devel libmtp-devel
|
||||
libjpeg-turbo-devel libevent-devel v8-devel json-c-devel re2-devel
|
||||
libwebp-devel minizip-devel libsrtp-devel jsoncpp-devel"
|
||||
|
||||
if [ "$XBPS_MACHINE" = "x86_64" ]; then
|
||||
makedepends+=" gcc-multilib"
|
||||
fi
|
||||
|
||||
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
|
||||
|
||||
if [ -n "${_build_nacl}" ]; then
|
||||
ln -s ${wrksrc}/pepper_${version%%.*}/toolchain/linux_x86_newlib \
|
||||
native_client/toolchain/linux_x86_newlib
|
||||
fi
|
||||
}
|
||||
|
||||
do_configure() {
|
||||
unset LD LDFLAGS
|
||||
|
||||
if [ -z "${_build_nacl}" ]; then
|
||||
_nacl="-Ddisable_nacl=1"
|
||||
fi
|
||||
# TODO
|
||||
# See https://crbug.com/28287
|
||||
# use_system_libsrtp=1 (check if https://bugs.gentoo.org/show_bug.cgi?id=459932 reproducible)
|
||||
# use_system_libvpx=1 (http://crbug.com/174287 fixed for chromium-27)
|
||||
# use_system_v8=1 (http://crbug.com/29050 fixed for chromium-27)
|
||||
# use_system_ffmpeg=1 (most likely libvpx-related, check on chromium-27)
|
||||
# use_system_mesa=1 (http://crbug.com/161389 fixed for chromium-27)
|
||||
# disable_pnacl=0 (http://crbug.com/224169)
|
||||
# use_system_sqlite=1 (http://crbug.com/22208)
|
||||
# use_system_ssl=1 (http://crbug.com/58087)
|
||||
# use_system_tcmalloc=1 (https://crbug.com/174634 WontFix?)
|
||||
# use_system_hyphen=1 (http://crbug.com/176285)
|
||||
# use_system_hunspell=1 (likely https://crbug.com/24517)
|
||||
|
||||
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 \
|
||||
-Dlinux_use_gold_flags=0 \
|
||||
-Dffmpeg_branding=Chrome \
|
||||
-Dproprietary_codecs=1 \
|
||||
-Duse_system_libjpeg=1 \
|
||||
-Duse_system_bzip2=1 \
|
||||
-Duse_system_flac=1 \
|
||||
-Duse_system_icu=1 \
|
||||
-Duse_system_libevent=1 \
|
||||
-Duse_system_libjpeg=1 \
|
||||
-Duse_system_libpng=1 \
|
||||
-Duse_system_libusb=1 \
|
||||
-Duse_system_libwebp=1 \
|
||||
-Duse_system_libxml=1 \
|
||||
-Duse_system_speex=1 \
|
||||
-Duse_system_v8=1 \
|
||||
-Duse_system_xdg_utils=1 \
|
||||
-Duse_system_yasm=1 \
|
||||
-Duse_system_vpx=1 \
|
||||
-Duse_system_xdg_utils=1 \
|
||||
-Duse_system_nss=1 \
|
||||
-Duse_system_ssl=0 \
|
||||
-Duse_system_sqlite=0 \
|
||||
-Duse_gconf=0 \
|
||||
-Dlinux_use_tcmalloc=0 \
|
||||
-Dlinux_link_gsettings=1 ${_nacl}
|
||||
|
||||
build/gyp_chromium -f make build/all.gyp --depth=. -Dwerror= \
|
||||
-Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0 \
|
||||
-Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
|
||||
-Ddisable_sse2=1 -Drelease_extra_cflags="$CFLAGS" \
|
||||
-Dffmpeg_branding=Chrome -Dproprietary_codecs=1 \
|
||||
-Duse_gconf=0 -Dlinux_use_tcmalloc=0 -Dlinux_link_gsettings=1 \
|
||||
-Ddisable_nacl=1 -Duse_system_bzip2=1 -Duse_system_expat=1 \
|
||||
-Duse_system_flac=1 -Duse_system_harfbuzz=1 -Duse_system_icu=1 \
|
||||
-Duse_system_jsoncpp=1 -Duse_system_libevent=1 -Duse_system_libexif=1 \
|
||||
-Duse_system_libjpeg=1 -Duse_system_libmtp=1 -Duse_system_libpng=1 \
|
||||
-Duse_system_libsrtp=1 -Duse_system_libusb=1 -Duse_system_libwebp=1 \
|
||||
-Duse_system_libxml=1 -Duse_system_minizip=1 \
|
||||
-Duse_system_nspr=1 -Duse_system_opus=1 -Duse_system_protobuf=1 \
|
||||
-Duse_system_re2=1 -Duse_system_speex=1 -Duse_system_stlport=1 \
|
||||
-Duse_system_yasm=1 -Duse_system_zlib=1 -Duse_system_xdg=1
|
||||
}
|
||||
|
||||
do_build() {
|
||||
|
|
@ -106,12 +76,6 @@ do_install() {
|
|||
|
||||
cp out/Release/{*.pak,libffmpegsumo.so} ${DESTDIR}/usr/lib/chromium
|
||||
|
||||
if [ -n "${_build_nacl}" ]; then
|
||||
cp out/Release/{nacl_helper{,_bootstrap}} \
|
||||
out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
|
||||
${DESTDIR}/usr/lib/chromium
|
||||
fi
|
||||
|
||||
cp -a out/Release/locales ${DESTDIR}/usr/lib/chromium
|
||||
|
||||
vinstall out/Release/chrome.1 644 usr/share/man/man1 chromium.1
|
||||
|
|
|
|||
Loading…
Reference in a new issue