From 1079fd3cf4b71f304b721a3b9e78effdb735921c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 22 Feb 2012 17:38:34 +0100 Subject: [PATCH] chromium: update to 17.0.963.56. --- srcpkgs/chromium/chromium.rshlibs | 4 +- .../chromium/{patches => files}/gcc-4.6.patch | 0 .../patches/chromium-system-vpx-r4.patch | 10 ---- srcpkgs/chromium/template | 58 ++++++++++++++----- 4 files changed, 45 insertions(+), 27 deletions(-) rename srcpkgs/chromium/{patches => files}/gcc-4.6.patch (100%) delete mode 100644 srcpkgs/chromium/patches/chromium-system-vpx-r4.patch diff --git a/srcpkgs/chromium/chromium.rshlibs b/srcpkgs/chromium/chromium.rshlibs index fa1fcb5e2c7..b9d8f3680cc 100644 --- a/srcpkgs/chromium/chromium.rshlibs +++ b/srcpkgs/chromium/chromium.rshlibs @@ -37,9 +37,9 @@ libbz2.so.1 libexpat.so.1 libFLAC.so.8 libspeex.so.1 -libdbus-glib-1.so.2 libdbus-1.so.3 libstdc++.so.6 libgcc_s.so.1 libc.so.6 -libvpx.so.0 +libXfixes.so.3 +ld-linux-x86-64.so.2 diff --git a/srcpkgs/chromium/patches/gcc-4.6.patch b/srcpkgs/chromium/files/gcc-4.6.patch similarity index 100% rename from srcpkgs/chromium/patches/gcc-4.6.patch rename to srcpkgs/chromium/files/gcc-4.6.patch diff --git a/srcpkgs/chromium/patches/chromium-system-vpx-r4.patch b/srcpkgs/chromium/patches/chromium-system-vpx-r4.patch deleted file mode 100644 index 35500654ba1..00000000000 --- a/srcpkgs/chromium/patches/chromium-system-vpx-r4.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- remoting/remoting.gyp.orig 2011-03-10 14:43:29.000000000 +0000 -+++ remoting/remoting.gyp 2011-03-10 14:44:50.000000000 +0000 -@@ -127,6 +127,7 @@ - '../ui/gfx/gfx.gyp:gfx', - '../media/media.gyp:media', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', -+ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', - '../third_party/libvpx/libvpx.gyp:libvpx_include', - '../third_party/zlib/zlib.gyp:zlib', - 'chromoting_jingle_glue', diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index c45f8f086b6..0e939101eea 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,13 +1,18 @@ # Template file for 'chromium' pkgname=chromium -version=14.0.835.202 -revision=3 -distfiles="http://build.chromium.org/official/$pkgname-$version.tar.bz2" +version=17.0.963.56 +wrksrc=$pkgname +create_wrksrc=yes +distfiles=" +http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$version.tar.bz2 +http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip" short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="Juan RP " homepage="http://www.chromium.org/" license="BSD" -checksum=8fcbeda57e45c990257c0ef2a021fad5e58dca1686688ffaccc2d6fa421fe0db +checksum=" +270be138d499c6c2092644af69acab8310cb05c3d06c3afe7891e488c29b020f +964fe3a5ec56f2505649aba00f900abe4205674b7fdaa16772647d347173bb01" 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. @@ -24,11 +29,16 @@ Add_dependency run desktop-file-utils Add_dependency run hicolor-icon-theme Add_dependency build pkg-config +Add_dependency build unzip Add_dependency build yasm Add_dependency build flex Add_dependency build gperf +Add_dependency build perl ">=0" +Add_dependency build python ">=0" +Add_dependency build mit-krb5-devel Add_dependency build libXrender-devel Add_dependency build libXScrnSaver-devel +Add_dependency build libXcomposite-devel Add_dependency build gtk+-devel Add_dependency build libevent-devel Add_dependency build icu-devel @@ -45,17 +55,35 @@ Add_dependency build libvpx-devel Add_dependency build speex-devel Add_dependency build libwebp-devel Add_dependency build pulseaudio-devel +if [ "$XBPS_MACHINE" = "x86_64" ]; then + Add_dependency build zlib32 + Add_dependency build libstdc++32 +fi + +pre_configure() { + # Build NaCL. + cd $wrksrc/nacl_sdk + ./naclsdk update pepper_16 + + ln -s $wrksrc/nacl_sdk/pepper_16/toolchain/linux_x86_newlib \ + $wrksrc/$pkgname-$version/native_client/toolchain/linux_x86_newlib + + cd $wrksrc/$pkgname-$version + patch -Np0 -i ${FILESDIR}/gcc-4.6.patch +} + +do_configure() { + cd $wrksrc/$pkgname-$version -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) # # XXX: Disable CUPS until a package exists. - build/gyp_chromium --depth=. -fmake build/all.gyp \ + build/gyp_chromium -f make build/all.gyp --depth=. \ -Dwerror= \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ + -Drelease_extra_cflags="$CFLAGS" \ -Dffmpeg_branding=Chrome \ -Dproprietary_codecs=1 \ -Duse_system_libjpeg=1 \ @@ -75,24 +103,24 @@ do_configure() -Duse_system_speex=1 \ -Duse_system_libwebp=1 \ -Duse_gconf=0 \ - -Duse_cups=0 \ - -Ddisable_nacl=1 + -Duse_cups=0 } -do_build() -{ +do_build() { + cd $wrksrc/$pkgname-$version make BUILDTYPE=Release ${makejobs} chrome chrome_sandbox } -do_install() -{ +do_install() { + cd $wrksrc/$pkgname-$version + vinstall out/Release/chrome 755 usr/lib/${pkgname} ${pkgname} vinstall out/Release/chrome_sandbox 4755 usr/lib/${pkgname} ${pkgname}-sandbox 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} + vcopy "out/Release/nacl_irt_x86_*.nexe" usr/lib/${pkgname} for f in locales resources; do vcopy out/Release/${f} usr/lib/chromium