Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=backporting.git;a=commitdiff;h=75af27b11e07412150b7b8718fe0b048c9e9de8c
commit 75af27b11e07412150b7b8718fe0b048c9e9de8c Author: kikadf <[email protected]> Date: Wed Apr 23 23:52:03 2014 +0200 chromium-browser-34.0.1847.118-1arcturus1-x86_64 * Version bump, backported from -current diff --git a/source/xapps-extra/chromium-browser/FrugalBuild b/source/xapps-extra/chromium-browser/FrugalBuild index 82964bb..c8b96ab 100644 --- a/source/xapps-extra/chromium-browser/FrugalBuild +++ b/source/xapps-extra/chromium-browser/FrugalBuild @@ -1,19 +1,19 @@ -# Compiling Time: 20.50 SBU +# Compiling Time: 26.46 SBU # Maintainer: DeX77 <[email protected]> options+=('asneeded') pkgname=chromium-browser -pkgver=29.0.1547.57 -pkgrel=1 +pkgver=34.0.1847.118 +pkgrel=1arcturus1 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' \ - 'libgcrypt' 'dejavu-ttf' 'gnutls>=2.12.12' 'libtasn1' 'gdk-pixbuf2' \ - 'systemd>=188' 'libcups' 'openssl' 'libxml2' 'speech-dispatcher') -makedepends=('python' 'perl' 'gperf' 'yasm' 'libgl' 'libgnome-keyring' 'cups' 'krb5' \ - 'elfutils' 'subversion' 'gtk+2') +depends=('nss>=3.15.4' 'alsa-lib' 'hicolor-icon-theme' 'libxslt>=1.1.28' 'ffmpeg>=1.0' \ + 'libevent>=2.0.21' 'libxscrnsaver' 'libpng=1.4.8-1' 'gtk+2-libs' 'libxtst' \ + 'gnutls>=3.2.12.1' 'libgcrypt>=1.6.1' 'dejavu-ttf' 'libtasn1>=3.4-1' 'gdk-pixbuf2' \ + 'systemd>=208-3' 'libcups' 'openssl' 'libxml2' 'speech-dispatcher' 'libpulse>=5.0' \ + 'gconf' 'opus' 'libmtp>=1.1.6-2' 'nspr>=4.10.4' 'libgnome-keyring>=3.10.1-2') +makedepends=('python' 'perl' 'gperf' 'yasm' 'libgl' 'cups' 'krb5' 'elfutils' 'subversion' 'gtk+2' 'ninja') license=('BSD') groups=('xapps-extra') archs=('i686' 'x86_64') @@ -21,14 +21,19 @@ _F_gnome_iconcache="y" Finclude gnome-scriptlet _F_archive_name="chromium" up2date="lynx -dump 'http://googlechromereleases.blogspot.de/search/label/Stable%20updates' | \ - egrep -o -m 1 'Stable channel has been updated to ([0123456789.]*)' | \ + egrep -o -m 1 'has been updated to ([0123456789.]*)' | \ egrep -o '([0123456789.]*)'" source=(http://commondatastorage.googleapis.com/chromium-browser-official/$_F_archive_name-$pkgver.tar.xz \ + chromium-gn-r1.patch \ + chromium-depot-tools-r0.patch \ $pkgname.desktop \ $pkgname.sh) -sha1sums=('5f580fb171bc64f4cf3c296b376495b07d9a664e' \ +sha1sums=('f52cc2cf697c4f91fb4a513cf77257d41b177a4b' \ + '5d0d092c11e8852bfe468d0a0d022907b7a0baf4' \ + '9dfadb8620ca39c7316d1fb624ab6b4d9093d95c' \ '78ed8913b8a598de6a9e45d206973a846dbe8a51' \ - 'e06de4aee77b3deb77e3b08ebb175ec02da42ced') + '3c7b4c5830d690c89b50c5bce6956eb78ff6765c') + CXXFLAGS="$CXXFLAGS -fpermissive" # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -41,103 +46,105 @@ _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 + -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=0 + -Duse_system_yasm=1 + -Duse_pulseaudio=1 + -Dlinux_link_libpci=1 + -Dlinux_link_gnome_keyring=1 + -Dlinux_link_gsettings=1 + -Dlinux_link_libgps=1 + -Dlinux_link_kerberos=1 + -Djavascript_engine=v8 + -Dlinux_use_gold_binary=0 + -Dlinux_use_gold_flags=0 + -Dgoogle_api_key=$_google_api_key + -Dgoogle_default_client_id=$_google_default_client_id + -Dgoogle_default_client_secret=$_google_default_client_secret" + + if [ $CARCH = x86_64 ]; then + myconf+=" -Dtarget_arch=x64" fi - - make chrome chrome_sandbox BUILDTYPE=Release || Fdie + + + build/linux/unbundle/replace_gyp_files.py $myconf -Drelease_extra_cflags="$CFLAGS" || Fdie + + ./build/gyp_chromium --no-parallel --depth . $myconf || Fdie + ninja -C out/Release chrome || Fdie + + # Build the required SUID_SANDBOX helper + ninja -C out/Release chrome_sandbox || Fdie + + # Build the ChromeDriver test suite + ninja -C out/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 + cp out/Release/libffmpegsumo.so "$Fdestdir/usr/lib/chromium/" || Fdie + cp -a out/Release/locales out/Release/resources \ + $Fdestdir/usr/lib/chromium/ || Fdie - cp out/Release/*.pak "$Fdestdir/usr/lib/chromium/" || Fdie - cp out/Release/libffmpegsumo.so "$Fdestdir/usr/lib/chromium/" || Fdie + cp out/Release/icudtl.dat "$Fdestdir/usr/lib/chromium" || Fdie - cp -a out/Release/locales out/Release/resources \ - $Fdestdir/usr/lib/chromium/ || Fdie find $Fdestdir/usr/lib/chromium/ -name '*.d' -type f -delete Finstallrel 644 out/Release/chrome.1 usr/share/man/man1/chromium.1 Finstall 644 $pkgname.desktop usr/share/applications/$pkgname.desktop for size in 22 24 48 64 256; do - install -m 0644 -D \ - chrome/app/theme/chromium/product_logo_${size}.png \ - $Fdestdir/usr/share/icons/hicolor/${size}x${size}/apps/$pkgname.png + install -m 0644 -D \ + chrome/app/theme/chromium/product_logo_${size}.png \ + $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 } diff --git a/source/xapps-extra/chromium-browser/chromium-browser.sh b/source/xapps-extra/chromium-browser/chromium-browser.sh index 14205a8..c9cd4f6 100644 --- a/source/xapps-extra/chromium-browser/chromium-browser.sh +++ b/source/xapps-extra/chromium-browser/chromium-browser.sh @@ -1,4 +1,15 @@ #!/bin/sh export CHROME_WRAPPER=/usr/lib/chromium/chromium export CHROME_DESKTOP=chromium-browser.desktop -exec /usr/lib/chromium/chromium $@ + +if [ -e "/usr/lib/chromium/PepperFlash/libpepflashplayer.so" ] +then + CHROME_USER_FLAGS+="--ppapi-flash-path=/usr/lib/chromium/PepperFlash/libpepflashplayer.so " +fi + +if [ -e "/usr/lib/chromium/PepperFlash/manifest.json" ] +then + CHROME_USER_FLAGS+="--ppapi-flash-version=`grep version /usr/lib/chromium/PepperFlash/manifest.json | egrep -o '[0-9.]+'` " +fi + +exec /usr/lib/chromium/chromium $CHROME_USER_FLAGS $@ diff --git a/source/xapps-extra/chromium-browser/chromium-depot-tools-r0.patch b/source/xapps-extra/chromium-browser/chromium-depot-tools-r0.patch new file mode 100644 index 0000000..19b92ce --- /dev/null +++ b/source/xapps-extra/chromium-browser/chromium-depot-tools-r0.patch @@ -0,0 +1,11 @@ +--- build/gyp_chromium.orig 2014-01-29 01:22:52.527247671 +0000 ++++ build/gyp_chromium 2014-01-29 01:23:49.857623290 +0000 +@@ -38,8 +38,6 @@ + sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit', + 'Source', 'build', 'scripts')) + +-import find_depot_tools +- + # On Windows, Psyco shortens warm runs of build/gyp_chromium by about + # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70 + # seconds. Conversely, memory usage of build/gyp_chromium with Psyco diff --git a/source/xapps-extra/chromium-browser/chromium-gn-r1.patch b/source/xapps-extra/chromium-browser/chromium-gn-r1.patch new file mode 100644 index 0000000..9d3071d --- /dev/null +++ b/source/xapps-extra/chromium-browser/chromium-gn-r1.patch @@ -0,0 +1,11 @@ +--- build/gyp_chromium.orig 2014-01-16 22:55:50.292718339 +0000 ++++ build/gyp_chromium 2014-01-16 23:15:17.890248708 +0000 +@@ -370,8 +370,6 @@ + args.append('--check') + + supplemental_includes = GetSupplementalFiles() +- if not RunGN(supplemental_includes): +- sys.exit(1) + args.extend( + ['-I' + i for i in additional_include_files(supplemental_includes, args)]) + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
