diff options
| author | piernov <piernov@piernov.org> | 2011-09-21 15:48:29 +0200 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2011-09-21 15:48:29 +0200 |
| commit | b2536d12986c1ad07fb9af8f02e0413373d3325d (patch) | |
| tree | 5f5865e2212044a21212ddb10ddc41e4c810d47e /extra/chromium/Pkgfile | |
| parent | 39e8f68d0603026dbb1f8026e60840b795c94748 (diff) | |
| parent | e7884f5a8bb0a182393fbf86a38a20abacfdd2c1 (diff) | |
| download | nutyx-extra-b2536d12986c1ad07fb9af8f02e0413373d3325d.tar.gz nutyx-extra-b2536d12986c1ad07fb9af8f02e0413373d3325d.tar.bz2 nutyx-extra-b2536d12986c1ad07fb9af8f02e0413373d3325d.tar.xz nutyx-extra-b2536d12986c1ad07fb9af8f02e0413373d3325d.zip | |
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe
Diffstat (limited to 'extra/chromium/Pkgfile')
| -rw-r--r-- | extra/chromium/Pkgfile | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/extra/chromium/Pkgfile b/extra/chromium/Pkgfile index 55735d813..c1386ff34 100644 --- a/extra/chromium/Pkgfile +++ b/extra/chromium/Pkgfile @@ -6,21 +6,25 @@ # Run on: gtk,dbus-glib,nss,alsa-lib,xdg-utils,bzip2,libevent,dejavu-ttf,desktop-file-utils,hicolor-icon-theme,keyutils name=chromium -version=12.0.742.100 +version=14.0.835.186 +#12.0.742.100 release=1 source=(http://build.chromium.org/official/chromium-$version.tar.bz2 chromium.desktop chromium.sh - chromium-gcc-4.6.patch) + chromium-gcc-4.6.patch + webrtc-r240-r242-make-pulseaudio-optional.patch) build() { - cd "$SRC/chromium-$version" + cd $SRC/chromium-$version + + patch -Np0 -i $SRC/chromium-gcc-4.6.patch + + sed -i '/#include <cups\/cups.h>/ a #include <cups/ppd.h>' \ + chrome/browser/ui/webui/print_preview_handler.cc - # Patches to fix gcc 4.6 compilation from - # http://code.google.com/p/chromium/issues/detail?id=80071 - # http://code.google.com/p/chromium/issues/detail?id=70746 - # http://code.google.com/p/chromium/issues/detail?id=46411 - patch -Np0 -i "$SRC/chromium-gcc-4.6.patch" + patch -d third_party/webrtc -Np1 -i \ + $SRC/webrtc-r240-r242-make-pulseaudio-optional.patch ### Configure @@ -39,7 +43,6 @@ build() { # (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312) build/gyp_chromium -f make build/all.gyp --depth=. \ - -Dgcc_version=45 \ -Dno_strict_aliasing=1 \ -Dwerror= \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ @@ -47,19 +50,20 @@ build() { -Drelease_extra_cflags="$CFLAGS" \ -Dffmpeg_branding=Chrome \ -Dproprietary_codecs=1 \ - -Duse_system_libjpeg=1 \ - -Duse_system_libxslt=0 \ - -Duse_system_libxml=0 \ -Duse_system_bzip2=1 \ - -Duse_system_zlib=1 \ - -Duse_system_libpng=0 \ -Duse_system_ffmpeg=0 \ - -Duse_system_yasm=1 \ -Duse_system_libevent=1 \ + -Duse_system_libjpeg=1 \ + -Duse_system_libpng=1 \ + -Duse_system_libxml=0 \ -Duse_system_ssl=0 \ + -Duse_system_yasm=1 \ + -Duse_system_zlib=1 \ -Duse_gconf=0 \ + -Ddisable_nacl=1 \ $([[ $CARCH == i686 ]] && echo '-Ddisable_sse2=1') + make chrome chrome_sandbox BUILDTYPE=Release cd $SRC/chromium-$version |