Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0041f7d6866d6b09510be279357ed86e1cc8904e
commit 0041f7d6866d6b09510be279357ed86e1cc8904e Author: DeX77 <de...@frugalware.org> Date: Sun Oct 6 23:48:33 2013 +0200 chromium-browser-30.0.1599.66-1-x86_64 * version bump * cleanup build process * prepare NaCL diff --git a/source/xapps-extra/chromium-browser/FrugalBuild b/source/xapps-extra/chromium-browser/FrugalBuild index 82964bb..26cf181 100644 --- a/source/xapps-extra/chromium-browser/FrugalBuild +++ b/source/xapps-extra/chromium-browser/FrugalBuild @@ -1,17 +1,18 @@ -# Compiling Time: 20.50 SBU +# Compiling Time: 26.46 SBU # Maintainer: DeX77 <de...@frugalware.org> options+=('asneeded') pkgname=chromium-browser -pkgver=29.0.1547.57 +pkgver=30.0.1599.66 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' url='http://www.chromium.org/' -depends=('nss' 'alsa-lib' 'hicolor-icon-theme' 'libxslt' 'ffmpeg>=1.0' \ - 'libevent>=2.0.10' 'libxscrnsaver' 'libpng=1.4.8-1' 'gtk+2-libs' 'libxtst' \ +depends=('nss>=3.15.2' 'alsa-lib' 'hicolor-icon-theme' 'libxslt' 'ffmpeg>=1.0' \ + 'libevent>=2.0.21' 'libxscrnsaver' 'libpng=1.4.8-1' 'gtk+2-libs' 'libxtst' \ 'libgcrypt' 'dejavu-ttf' 'gnutls>=2.12.12' 'libtasn1' 'gdk-pixbuf2' \ - 'systemd>=188' 'libcups' 'openssl' 'libxml2' 'speech-dispatcher') + 'systemd>=188' 'libcups' 'openssl' 'libxml2' 'speech-dispatcher' \ + 'protobuf' 'gconf' 'opus' 'libmtp' 'nspr>=4.10.1') makedepends=('python' 'perl' 'gperf' 'yasm' 'libgl' 'libgnome-keyring' 'cups' 'krb5' \ 'elfutils' 'subversion' 'gtk+2') license=('BSD') @@ -26,7 +27,7 @@ up2date="lynx -dump 'http://googlechromereleases.blogspot.de/search/label/Stable source=(http://commondatastorage.googleapis.com/chromium-browser-official/$_F_archive_name-$pkgver.tar.xz \ $pkgname.desktop \ $pkgname.sh) -sha1sums=('5f580fb171bc64f4cf3c296b376495b07d9a664e' \ +sha1sums=('b6970ad5972906ac9cf482700d54209ffda50ea2' \ '78ed8913b8a598de6a9e45d206973a846dbe8a51' \ 'e06de4aee77b3deb77e3b08ebb175ec02da42ced') CXXFLAGS="$CXXFLAGS -fpermissive" @@ -41,80 +42,90 @@ _google_default_client_secret="2bNvMsN-57D44Q5ireW62LcZ" build() { Fcd + Fpatchall - sed -i '1 i\ - #include "build/build_config.h"' \ - chrome/browser/diagnostics/diagnostics_main.cc - Fpatchall - - if [ $CARCH = i686 ]; then - build/gyp_chromium -f make --depth=. \ - -Dgoogle_api_key=$_google_api_key \ - -Dgoogle_default_client_id=$_google_default_client_id \ - -Dgoogle_default_client_secret=$_google_default_client_secret \ - -Dlinux_use_gold_binary=0 \ - -Dlinux_use_gold_flags=0 \ - -Ddisable_glibc=1 \ - -Dwerror= \ - -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ - -Dlinux_strip_binary=1 \ - -Drelease_extra_cflags="$CFLAGS" \ - -Dffmpeg_branding=Chrome \ - -Dproprietary_codecs=1 \ - -Duse_system_bzip2=1 \ - -Dlogging_like_official_build=1 \ - -Duse_system_ffmpeg=0 \ - -Duse_system_libevent=1 \ - -Duse_system_libjpeg=1 \ - -Duse_system_libpng=0 \ - -Duse_system_libxml=0 \ - -Ddisable_pnacl=1 \ - -Duse_system_ssl=0 \ - -Duse_system_yasm=1 \ - -Duse_system_zlib=0 \ - -Ddisable_nacl=1 \ - -Duse_gconf=0 \ - -Dlinux_use_tcmalloc=0 \ - -Duse_pulseaudio=1 - elif [ $CARCH = x86_64 ]; then - build/gyp_chromium -f make --depth=. \ - -Dgoogle_api_key=$_google_api_key \ - -Dgoogle_default_client_id=$_google_default_client_id \ - -Dgoogle_default_client_secret=$_google_default_client_secret \ - -Dlinux_use_gold_binary=0 \ - -Dlinux_use_gold_flags=0 \ - -Ddisable_glibc=1 \ - -Dwerror= \ - -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ - -Dlinux_strip_binary=1 \ - -Drelease_extra_cflags="$CFLAGS" \ - -Dffmpeg_branding=Chrome \ - -Dproprietary_codecs=1 \ - -Duse_system_bzip2=1 \ - -Dlogging_like_official_build=1 \ - -Duse_system_ffmpeg=0 \ - -Duse_system_libevent=1 \ - -Duse_system_libjpeg=1 \ - -Duse_system_libpng=0 \ - -Duse_system_libxml=0 \ - -Ddisable_pnacl=1 \ - -Duse_system_ssl=0 \ - -Duse_system_yasm=1 \ - -Duse_system_zlib=0 \ - -Ddisable_nacl=1 \ - -Duse_gconf=0 \ - -Dlinux_use_tcmalloc=0 \ - -Duse_pulseaudio=1 \ - -Ddisable_sse2=1 + # Extract the NaCl tarballs + #python ./build/download_nacl_toolchains.py --keep \ + # --base-url=http://commondatastorage.googleapis.com/nativeclient-archive2 \ + # --base-once-url=http://commondatastorage.googleapis.com/nativeclient-once/object || Fdie + + myconf+="-Dwerror= + -Ddisable_nacl=1 + -Ddisable_glibc=1 + -Ddisable_pnacl=1 + -Ddisable_newlib_untar=0 + -Duse_openssl=0 + -Duse_system_ffmpeg=0 + -Dbuild_ffmpegsumo=1 + -Dremove_webcore_debug_symbols=1 + -Dproprietary_codecs=1 + -Dffmpeg_branding=Chrome + -Dlinux_fpic=1 + -Dlogging_like_official_build=1 + -Ddisable_sse2=1" + + if [ $CARCH = x86_64 ]; then + myconf+=" -Dtarget_arch=x64" fi - - make chrome chrome_sandbox BUILDTYPE=Release || Fdie + + myconf+=" -Duse_system_flac=1 + -Duse_system_speex=1 + -Duse_system_libexif=1 + -Duse_system_libevent=1 + -Duse_system_libmtp=1 + -Duse_system_opus=1 + -Duse_system_bzip2=1 + -Duse_system_icu=0 + -Duse_system_harfbuzz=1 + -Duse_system_libjpeg=1 + -Duse_system_libpng=0 + -Duse_system_libxslt=1 + -Duse_system_libyuv=1 + -Duse_system_nspr=1 + -Duse_system_protobuf=1 + -Duse_system_yasm=1" + + myconf+=" -Duse_pulseaudio=1 + -Dlinux_link_libpci=1 + -Dlinux_link_gnome_keyring=1 + -Dlinux_link_gsettings=1 + -Dlinux_link_libgps=1" + + myconf+="-Dlinux_link_kerberos=1" + + + myconf+="-Djavascript_engine=v8 + -Dlinux_use_gold_binary=0 + -Dlinux_use_gold_flags=0" + + + myconf+="-Dgoogle_api_key=$_google_api_ke + -Dgoogle_default_client_id=$_google_default_client_id + -Dgoogle_default_client_secret=$_google_default_client_secret" + + build/linux/unbundle/replace_gyp_files.py $myconf -Drelease_extra_cflags="$CFLAGS" || Fdie + + #export GYP_GENERATORS='ninja' + ./build/gyp_chromium -f make --depth . $myconf || Fdie + make BUILDTYPE=Release chrome || Fdie + + # Build the required SUID_SANDBOX helper + make BUILDTYPE=Release chrome_sandbox || Fdie + + # Build the ChromeDriver test suite + make BUILDTYPE=Release chromedriver || Fdie + + # NaCl + #Fcp nacl_helper usr/lib/chromium/ + #Fcp nacl_helper_bootstrap usr/lib/chromium/ + #Fcp nacl_irt_*.nexe usr/lib/chromium/ + #Fcp libppGoogleNaClPluginChrome.so usr/lib/chromium/ Fmkdir usr/lib/chromium Fexerel out/Release/chrome usr/lib/chromium/chromium - Finstallrel 4555 out/Release/chrome_sandbox usr/lib/chromium/chromium-sandbox - Ffileschown usr/lib/chromium/chromium-sandbox root root + Finstallrel 4755 out/Release/chrome_sandbox usr/lib/chromium/chrome-sandbox + Ffileschown usr/lib/chromium/chrome-sandbox root root cp out/Release/*.pak "$Fdestdir/usr/lib/chromium/" || Fdie @@ -132,12 +143,12 @@ build() { $Fdestdir/usr/share/icons/hicolor/${size}x${size}/apps/$pkgname.png done - Fdirschmod usr/lib/chromium/locales 755 + Fdirschmod usr/lib/chromium/locales 755 Fexe $pkgname.sh usr/bin/$pkgname - + Frm usr/lib/chromium/ressources Fdocrel LICENSE - Fbuild_gnome_scriptlet + Fbuild_gnome_scriptlet } _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git