From 39dd65a018a382e28b33cf3e4e93f8524aeb8ada Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 24 Jun 2013 16:33:07 +0200 Subject: [PATCH] chromium: update to 28.0.1500.52. --- .../chromium-speech-dispatcher-0.8-r0.patch | 11 ------ .../patches/chromium_fix_json_headers.patch | 38 ------------------- srcpkgs/chromium/template | 29 +++++--------- 3 files changed, 10 insertions(+), 68 deletions(-) delete mode 100644 srcpkgs/chromium/patches/chromium-speech-dispatcher-0.8-r0.patch delete mode 100644 srcpkgs/chromium/patches/chromium_fix_json_headers.patch diff --git a/srcpkgs/chromium/patches/chromium-speech-dispatcher-0.8-r0.patch b/srcpkgs/chromium/patches/chromium-speech-dispatcher-0.8-r0.patch deleted file mode 100644 index 57de16a67d4..00000000000 --- a/srcpkgs/chromium/patches/chromium-speech-dispatcher-0.8-r0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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', '', -+ '--header', '', - '--link-directly=<(linux_link_libspeechd)', - 'spd_open', - 'spd_say', diff --git a/srcpkgs/chromium/patches/chromium_fix_json_headers.patch b/srcpkgs/chromium/patches/chromium_fix_json_headers.patch deleted file mode 100644 index 739479e0a77..00000000000 --- a/srcpkgs/chromium/patches/chromium_fix_json_headers.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- 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 - - #ifdef JSONCPP_RELATIVE_PATH --#include "json/json.h" -+#include "jsoncpp/json/json.h" - #else - #include "third_party/jsoncpp/json.h" - #endif diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 6582190c501..eb71a1b31be 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium #See http://www.chromium.org/developers/calendar for the latest version -version=27.0.1453.93 +version=28.0.1500.52 revision=1 short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="Juan RP " @@ -9,7 +9,7 @@ homepage="http://www.chromium.org/" license="BSD" _url_base="http://commondatastorage.googleapis.com" distfiles="${_url_base}/${pkgname}-browser-official/${pkgname}-${version}.tar.xz" -checksum="6dd8c01a4d72acc512652332d67e92ff9bcb3533b621f2b281c30f00ce26ad40" +checksum="7b3cbfbb9e5b9d21ffab23d39173611ddb0ba49488795b6db46a62be354518b4" long_desc=" Chromium is an open-source browser project that aims to build a safer, @@ -19,45 +19,36 @@ long_desc=" (name and logo) with very few additions such as usage tracking and an auto-updater system." -hostmakedepends="python pkg-config perl gperf bison" +hostmakedepends="which yasm python pkg-config perl gperf bison" makedepends="libpng-devel>=1.6 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 - libXScrnSaver-devel alsa-lib-devel icu-devel which protobuf-devel - libxml2-devel libxslt-devel sqlite-devel yasm opus-devel ffmpeg-devel + libXScrnSaver-devel alsa-lib-devel icu-devel protobuf-devel snappy-devel + libxml2-devel libxslt-devel opus-devel hunspell-devel pulseaudio-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 pulseaudio-devel - MesaLib-devel" + libjpeg-turbo-devel libevent-devel json-c-devel re2-devel harfbuzz-devel + libwebp-devel minizip-devel libsrtp-devel jsoncpp-devel" do_configure() { unset LD LDFLAGS # TODO # See https://crbug.com/28287 - # use_system_libsrtp=1 (check if https://bugs.gentoo.org/show_bug.cgi?id=459932 reproducible) # use_system_v8=1 (http://crbug.com/29050 fixed for chromium-27) - # use_system_libvpx=1 (http://crbug.com/174287 fixed for chromium-27) # use_system_ffmpeg=1 (most likely libvpx-related, check on 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) - - if [ "$XBPS_TARGET_MACHINE" != "i686" ]; then - # XXX disable system mesa for now. - # /usr/include/GL/glext.h:6153:19: error: 'GLsizeiptr' has a previous declaration as 'typedef ptrdiff_t GLsizeiptr' - # ./gpu/command_buffer/common/gles2_cmd_format.h:40:26: error: conflicting declaration 'typedef khronos_intptr_t GLintptr' - local _system_mesa="-Duse_system_mesa=1" - fi 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 \ + -Dlinux_link_libpci=1 -Dlinux_link_pulseaudio=1 \ + -Dlinux_link_libspeechd=1 -Dlibspeechd_h_prefix=speech-dispatcher/ \ -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 \ @@ -68,7 +59,7 @@ do_configure() { -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 \ - ${_system_mesa} + -Duse_system_libvpx=1 -Duse_system_hunspell=1 -Duse_system_snappy=1 } do_build() {