Date: Thursday, February 11, 2010 @ 18:45:07 Author: pierre Revision: 68240
upgpkg: chromium 5.0.307.7-1 switch to new beta branch Modified: chromium/trunk/PKGBUILD chromium/trunk/createSource chromium/trunk/drop_sse2.patch chromium/trunk/ffmpeg_branding_mime.patch chromium/trunk/libpng-1.4.patch ----------------------------+ PKGBUILD | 24 +++++++++++++----------- createSource | 5 +++-- drop_sse2.patch | 6 +++--- ffmpeg_branding_mime.patch | 10 +++++----- libpng-1.4.patch | 43 +++++++++++++++++++++++++++++-------------- 5 files changed, 53 insertions(+), 35 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-02-11 21:38:46 UTC (rev 68239) +++ PKGBUILD 2010-02-11 23:45:07 UTC (rev 68240) @@ -2,28 +2,27 @@ # Maintainer: Pierre Schmitz <[email protected]> pkgname=chromium -pkgver=4.0.249.78 -pkgrel=3 +pkgver=5.0.307.7 +pkgrel=1 pkgdesc='An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web' arch=('i686' 'x86_64') url='http://www.chromium.org/' license=('BSD') -depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libxslt' 'ffmpeg') -makedepends=('python' 'perl' 'gperf') +depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libxslt' 'ffmpeg' + 'libevent' 'libxss') +makedepends=('python' 'perl' 'gperf' 'yasm' 'mesa') provides=('chromium-browser') conflicts=('chromium-browser') install='chromium.install' -# downgrade from 4.0.267.0-2 -options=('force') source=("ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz"; 'chromium.desktop' 'chromium.sh' 'drop_sse2.patch' 'ffmpeg_branding_mime.patch' 'libpng-1.4.patch') -md5sums=('15d2cdc31d1c41eebf02eab3323dab3c' +md5sums=('916fa2a672086ab105dc7acacfb96987' '897de25e9c25a01f8b1b67abe554a6b7' '93cd6f5f53b15546dc9d3de49118534c' - 'ddc1d741d50e8d46765a6b76e8faad32' - '95567a364197237dcefa3fabb5631822' - 'ac1da2e538ed1e16235b206ff9ba9407') + 'dfbc18bb26dffa2dc6d4d3a857730902' + 'ae9e26e6c2d164e6af0e513dae2273a3' + 'e3b482665b179e06ff852c58463706a8') build() { cd ${srcdir}/chromium-${pkgver} @@ -42,12 +41,15 @@ use_system_bzip2=1 \ use_system_libpng=1 \ use_system_ffmpeg=1 \ - werror=" + use_system_yasm=1 \ + use_system_libevent=1 \ + use_system_ssl=1" patch -p0 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1 # i686 does not include SSE2 # see http://code.google.com/p/chromium/issues/detail?id=9007 patch -p0 -i ${srcdir}/drop_sse2.patch || return 1 + # see http://codereview.chromium.org/569009/show patch -p0 -i ${srcdir}/libpng-1.4.patch || return 1 export PATH=./depot_tools/:$PATH Modified: createSource =================================================================== --- createSource 2010-02-11 21:38:46 UTC (rev 68239) +++ createSource 2010-02-11 23:45:07 UTC (rev 68240) @@ -21,7 +21,8 @@ mkdir -p $tmp/chromium-$pkgver cd $tmp/chromium-$pkgver -svn co -r34500 http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools +# this should be updated to a more recent revision on major updates +svn co -r38382 -q http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools export PATH=./depot_tools/:$PATH gclient.py config http://src.chromium.org/svn/releases/$pkgver @@ -47,7 +48,7 @@ find . -iname '*.nexe' -delete cd .. -bsdtar cvJf $current/chromium-$pkgver.tar.xz chromium-$pkgver +bsdtar cJf $current/chromium-$pkgver.tar.xz chromium-$pkgver cd $current rm -rf $tmp Modified: drop_sse2.patch =================================================================== --- drop_sse2.patch 2010-02-11 21:38:46 UTC (rev 68239) +++ drop_sse2.patch 2010-02-11 23:45:07 UTC (rev 68240) @@ -1,6 +1,6 @@ ---- src/build/common.gypi 2009-12-17 01:57:20.000000000 +0100 -+++ src/build/common.gypi 2009-12-17 02:37:05.663568345 +0100 -@@ -652,15 +652,6 @@ +--- src/build/common.gypi 2010-02-11 19:30:43.000000000 +0100 ++++ src/build/common.gypi 2010-02-11 21:07:58.505011143 +0100 +@@ -759,15 +759,6 @@ # used during computation does not change depending on how the # compiler optimized the code, since the value is always kept # in its specified precision. Modified: ffmpeg_branding_mime.patch =================================================================== --- ffmpeg_branding_mime.patch 2010-02-11 21:38:46 UTC (rev 68239) +++ ffmpeg_branding_mime.patch 2010-02-11 23:45:07 UTC (rev 68240) @@ -1,5 +1,5 @@ ---- src/net/base/mime_util.cc 2009-12-13 19:09:26.467781732 +0100 -+++ src/net/base/mime_util.cc 2009-12-13 19:10:14.967931404 +0100 +--- src/net/base/mime_util.cc 2010-02-11 20:07:33.939537145 +0100 ++++ src/net/base/mime_util.cc 2010-02-11 20:07:33.955373468 +0100 @@ -188,7 +188,6 @@ "audio/ogg", "application/ogg", @@ -8,15 +8,15 @@ // MPEG-4. "video/mp4", "video/x-m4v", -@@ -198,7 +197,6 @@ - // MP3. +@@ -199,7 +198,6 @@ "audio/mp3", "audio/x-mp3", + "audio/mpeg", -#endif }; // List of supported codecs when passed in with <source type="...">. -@@ -206,10 +204,8 @@ +@@ -207,10 +205,8 @@ // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support // for more information. static const char* const supported_media_codecs[] = { Modified: libpng-1.4.patch =================================================================== --- libpng-1.4.patch 2010-02-11 21:38:46 UTC (rev 68239) +++ libpng-1.4.patch 2010-02-11 23:45:07 UTC (rev 68240) @@ -1,28 +1,43 @@ ---- src/app/gfx/codec/orig/png_codec.cc 2009-11-19 12:14:46.000000000 -0800 -+++ src/app/gfx/codec/png_codec.cc 2009-11-19 12:15:56.000000000 -0800 -@@ -350,9 +350,9 @@ +--- src/app/gfx/codec/png_codec.cc ++++ src/app/gfx/codec/png_codec.cc +@@ -190,7 +190,7 @@ void DecodeInfoCallback(png_struct* png_ptr, png_info* info_ptr) { + unsigned long long total_size = + static_cast<unsigned long long>(w) * static_cast<unsigned long long>(h); + if (total_size > ((1 << 29) - 1)) +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + state->width = static_cast<int>(w); + state->height = static_cast<int>(h); + +@@ -279,7 +279,7 @@ void DecodeInfoCallback(png_struct* png_ptr, png_info* info_ptr) { + } + } else { + NOTREACHED() << "Unknown input channels"; +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + if (state->bitmap) { +@@ -349,10 +349,7 @@ bool BuildPNGStruct(const unsigned char* input, size_t input_size, + if (png_sig_cmp(const_cast<unsigned char*>(input), 0, 8) != 0) return false; - *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, +- *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, - png_voidp_NULL, - png_error_ptr_NULL, - png_error_ptr_NULL); -+ 0, -+ 0, -+ 0); ++ *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (!*png_ptr) return false; -@@ -574,9 +574,9 @@ +@@ -574,9 +571,7 @@ bool PNGCodec::Encode(const unsigned char* input, ColorFormat format, DCHECK(input_color_components * w <= row_byte_width); png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, - png_voidp_NULL, - png_error_ptr_NULL, - png_error_ptr_NULL); -+ 0, -+ 0, -+ 0); ++ NULL, NULL, NULL); if (!png_ptr) return false; png_info* info_ptr = png_create_info_struct(png_ptr); @@ -35,9 +50,9 @@ - png_voidp_NULL, - png_error_ptr_NULL, - png_error_ptr_NULL); -+ 0, -+ 0, -+ 0); ++ NULL, ++ NULL, ++ NULL); if (!pngPtr) return false;
