chromium 37.0.2062.94

2025-01-24 01:42:13 +08:00 · 2014-08-26 21:07:51 +00:00 · 2014-08-26 21:07:51 +00:00 · e869e7209e
commit e869e7209e
parent ce84a6c520
8 changed files with 2917 additions and 17 deletions
--- a/chromium/PKGBUILD
+++ b/chromium/PKGBUILD
@ -3,7 +3,7 @@
 #

 pkgname=chromium
-pkgver=36.0.1985.143
+pkgver=37.0.2062.94
 pkgrel=1
 _verbld=${pkgver}-1 # used for libpdf and pepper-flash
 _pepperflashver=14.0.0.177
@ -27,15 +27,15 @@ source=(http://commondatastorage.googleapis.com/chromium-browser-official/${pkgn
        prepopulated_engines_json.diff
        chromium-nacl-bootstrap-cflags.patch)

-sha1sums=('6fcd725e2d36f89f0623068e5571907e53115d3e'
+sha1sums=('a18b8d920307c7304d31aeaf64b742b1175f794e'
          '64726324d432af438a9d16e6c7243ce0a56a40e3'
          'f78c3d5f420d52460b2d59f7c47e32989b3e1780'
          '3ab45403f3e8ddfeeba6a5aee9f683d57883fb90'
          '19eff765ec1316f4ae057d48919b2fdd6b3a5bea'
          '11332bcd0318d573bea1aa0744213a5d006aecc4'
-          '5909b423f8fe672c276af5891d1f1ddf3ae657fd'
-          '51065e45d0060374346f3c756a6b1cd0d1fb1323'
-          '4ac33284c534b5117741b551cc531589cfa08d75'
+          'bda4e1c18cc16dbbd7e69980c4408d47686c5c40'
+          'abeb1e424b35bbca954a5afea39418a5e198ac64'
+          '79fc829d740183d85fb147a3a44e572a8f304dbe'
          'ca2f1c4797987ddf248bd94feb06cad66927355e')

 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
--- a/chromium/PKGBUILD_
+++ b/chromium/PKGBUILD_
@ -0,0 +1,225 @@
+#
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+
+pkgname=chromium
+pkgver=35.0.1916.153
+pkgrel=4
+_verbld=${pkgver}-1 # used for libpdf and pepper-flash
+_pepperflashver=14.0.0.125
+
+# https://build.opensuse.org/package/view_file/network:chromium/chromium/chromium.spec
+_pnacl_version=12919
+_nacl_version=12790
+_glibc_version=12831
+
+pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser. Include PepperFlash and libpdf plugins"
+arch=('x86_64')
+url="http://www.chromium.org/"
+license=('BSD')
+depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'libgcrypt' 'ttf-dejavu' 'dbus' 'desktop-file-utils' 'hicolor-icon-theme' 'systemd' 'speech-dispatcher' 'flac' 'opus' 'libxml2' 'libpulse' 'icu' 'zlib' 'harfbuzz' 'glib2')
+makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' 'elfutils' 'lib32-gcc-libs' 'subversion' 'ninja' 'clang')
+install=chromium.install
+source=(http://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${pkgver}.tar.xz                 
+        #http://dl.google.com/linux/chrome/rpm/stable/${CARCH}/google-chrome-stable-${_verbld}.x86_64.rpm
+        https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm
+        license.html::http://www.google.com/chrome/intl/en/eula_text.html
+        naclsdk_nacl_linux_x86-$_nacl_version.tgz::https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/$_nacl_version/naclsdk_linux_x86.tgz
+        naclsdk_pnacl_linux_x86-$_pnacl_version.tgz::https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/$_pnacl_version/naclsdk_pnacl_linux_x86.tgz
+        naclsdk_pnacl_translator-$_pnacl_version.tgz::https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/$_pnacl_version/naclsdk_pnacl_translator.tgz
+        naclsdk_pnacl_translator-$_pnacl_version.tgz.sha1hash::https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/$_pnacl_version/naclsdk_pnacl_translator.tgz.sha1hash
+        toolchain_linux_x86-$_glibc_version.tar.bz2::https://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$_glibc_version/toolchain_linux_x86.tar.bz2
+        chromium.desktop
+        chromium.sh
+        chromium.default
+        template_url_prepopulate_data.diff
+        search_engine_type.diff
+        prepopulated_engines_json.diff
+        chromium-nacl-bootstrap-cflags.patch)
+        
+noextract=(naclsdk_nacl_linux_x86-$_nacl_version.tgz
+           naclsdk_pnacl_linux_x86-$_pnacl_version.tgz
+           naclsdk_pnacl_translator-$_pnacl_version.tgz
+           toolchain_linux_x86-$_glibc_version.tar.bz2)
+
+sha1sums=('b67959f8c2f1e154810e6470825bac2670cf536b'
+          '64726324d432af438a9d16e6c7243ce0a56a40e3'
+          'f78c3d5f420d52460b2d59f7c47e32989b3e1780'
+          '2cc54f1a182155da8f6d410e83a1eeb827e01e98'
+          '717082e1815ffa63b83bf6d3beecd363bffd32a9'
+          'e3828757ebce11e25b76044d7cdee4d35d9fd941'
+          '5a0afc5ae5c8da88ff45fcd8d155e75cb46f2e76'
+          'dde61c04276f61b9ed5198a9f153186f71648de3'
+          '3ab45403f3e8ddfeeba6a5aee9f683d57883fb90'
+          '19eff765ec1316f4ae057d48919b2fdd6b3a5bea'
+          '11332bcd0318d573bea1aa0744213a5d006aecc4'
+          'e961181b294a51fb1f6406a9820c372e947d9d82'
+          '51065e45d0060374346f3c756a6b1cd0d1fb1323'
+          '4ac33284c534b5117741b551cc531589cfa08d75'
+          'ca2f1c4797987ddf248bd94feb06cad66927355e')
+
+# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+# Note: These are for Chakra Linux use ONLY. For your own distribution, please
+# get your own set of keys.
+_google_api_key=AIzaSyA33sdKPff0x3KBByOhpzc1i7RS2A1mEpY
+_google_default_client_id=3502044743.apps.googleusercontent.com
+_google_default_client_secret=TPvjII_2SwZn_9Ic0kRKqjtG
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+ 
+  # Filter out -fstack-protector-strong for nacl_helper_bootstrap
+  # https://code.google.com/p/chromium/issues/detail?id=104569
+  patch -Np0 -i "$srcdir/chromium-nacl-bootstrap-cflags.patch"
+  
+  # Set DDG as default search
+  patch -p1 -i "$srcdir/template_url_prepopulate_data.diff"
+  patch -p1 -i "$srcdir/search_engine_type.diff"
+  patch -p1 -i "$srcdir/prepopulated_engines_json.diff"
+
+  # Prepare NaCL toolchain
+  mkdir native_client/toolchain/{.tars,pnacl_translator}
+  ln -s "$srcdir/naclsdk_nacl_linux_x86-$_nacl_version.tgz" \
+    native_client/toolchain/.tars/naclsdk_linux_x86.tgz
+  ln -s "$srcdir/naclsdk_pnacl_linux_x86-$_pnacl_version.tgz" \
+    native_client/toolchain/.tars/naclsdk_pnacl_linux_x86.tgz
+  ln -s "$srcdir/naclsdk_pnacl_translator-$_pnacl_version.tgz" \
+    native_client/toolchain/.tars/naclsdk_pnacl_translator.tgz
+  ln -s "$srcdir/naclsdk_pnacl_translator-$_pnacl_version.tgz.sha1hash" \
+    native_client/toolchain/pnacl_translator/SOURCE_SHA1
+  ln -s "$srcdir/toolchain_linux_x86-$_glibc_version/.tar.bz2" \
+    native_client/toolchain/.tars/toolchain_linux_x86.tar.bz2
+
+  # Build with clang as a temporary solution to startup crash with GCC 4.9
+  mkdir -p third_party/llvm-build/Release+Asserts/bin
+  ln -s /usr/bin/clang third_party/llvm-build/Release+Asserts/bin/
+  ln -s /usr/bin/clang++ third_party/llvm-build/Release+Asserts/bin/
+  ln -s /usr/bin/llvm-symbolizer third_party/llvm-build/Release+Asserts/bin/
+  # clang 3.4 doesn't support this option
+  sed -i '/-Wno-absolute-value/d' build/common.gypi
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # activate ninja compile method
+  export GYP_GENERATORS='ninja'
+  
+  # CFLAGS are passed through release_extra_cflags below
+  export -n CFLAGS CXXFLAGS
+  
+  # fix clang issue: error: use of undeclared identifier '__float128'
+  CXX=clang++
+  CXXFLAGS+="-D__STRICT_ANSI__  -std=c++0x "
+  
+  # NOTE
+  # -Dremove_webcore_debug_symbols=1  speed up the build by removing debug symbols for webkit
+  
+  local _chromium_conf=(
+    -Dgoogle_api_key=$_google_api_key
+    -Dgoogle_default_client_id=$_google_default_client_id
+    -Dgoogle_default_client_secret=$_google_default_client_secret
+    -Dwerror=
+    -Dclang=1
+    -Dclang_use_chrome_plugins=0
+    -Dpython_ver=2.7
+    -Dlinux_link_libpci=1
+    -Dlinux_link_libspeechd=1
+    -Dlinux_link_pulseaudio=1
+    -Dlinux_strip_binary=1
+    -Dlinux_use_gold_binary=0
+    -Dlinux_use_gold_flags=0
+    -Dlogging_like_official_build=1
+    -Drelease_extra_cflags="$CFLAGS"
+    -Dlibspeechd_h_prefix=speech-dispatcher/
+    -Dffmpeg_branding=Chrome
+    -Dproprietary_codecs=1
+    -Dremove_webcore_debug_symbols=1
+    -Duse_system_bzip2=1
+    -Duse_system_flac=1
+    -Duse_system_ffmpeg=0
+    -Duse_system_harfbuzz=1
+    -Duse_system_icu=0
+    -Duse_system_libevent=1
+    -Duse_system_libjpeg=1
+    -Duse_system_libpng=1
+    -Duse_system_libxml=1
+    -Duse_system_opus=1
+    -Duse_system_snappy=0
+    -Duse_system_ssl=0
+    -Duse_system_xdg_utils=1
+    -Duse_system_yasm=1
+    -Duse_system_zlib=0
+    -Duse_system_v8=0
+    -Duse_mojo=0
+    -Duse_gconf=0
+    -Dtarget_arch=x64
+    -Dffmpeg_target_arch=x64
+    -Ddisable_nacl=0
+    -Ddisable_glibc=1
+    -Ddisable_pnacl=0
+    -Ddisable_newlib_untar=0
+    -Ddisable_fatal_linker_warnings=1
+    -Ddisable_sse2=1)
+
+  build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}"
+  #build/gyp_chromium -f make --depth=. "${_chromium_conf[@]}"
+  build/gyp_chromium build/all.gyp --depth=. "${_chromium_conf[@]}"
+  
+  #make BUILDTYPE=Release chrome chrome_sandbox
+  
+  # Build chrome base
+  ninja -C out/Release chrome
+  # Build the required SUID_SANDBOX helper
+  ninja -C out/Release chrome_sandbox
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  install -D out/Release/chrome ${pkgdir}/usr/lib/chromium/chromium
+
+  install -Dm4755 -o root -g root out/Release/chrome_sandbox \
+    "$pkgdir/usr/lib/chromium/chrome-sandbox"
+
+  cp out/Release/{*.pak,libffmpegsumo.so,nacl_helper{,_bootstrap}} \
+    out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
+    "$pkgdir/usr/lib/chromium/"
+
+  # override command-line options
+  install -Dm644 "$srcdir/chromium.default" "$pkgdir/etc/chromium/default"
+
+  cp -a out/Release/locales out/Release/icudtl.dat "$pkgdir/usr/lib/chromium/"
+
+  find "$pkgdir/usr/lib/chromium/" -name '*.d' -type f -delete
+
+  install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1"
+
+  install -Dm644 "$srcdir/chromium.desktop" \
+    "$pkgdir/usr/share/applications/chromium.desktop"
+
+  for size in 22 24 48 64 128 256; do
+    install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
+      "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+  done
+  
+  for size in 16 32; do
+    install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \
+      "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+  done
+
+  install -D "$srcdir/chromium.sh" "$pkgdir/usr/bin/chromium"
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE"
+  
+  #### PepperFlash ####
+  cd "$srcdir"
+  install -d "$pkgdir/usr/lib/PepperFlash"
+  install -m644 opt/google/chrome/PepperFlash/* "$pkgdir/usr/lib/PepperFlash"
+  sed -i "s/flashver=.*/flashver=$_pepperflashver/" "$startdir/chromium.install"
+  install -Dm644 "$srcdir/license.html" "$pkgdir/usr/share/licenses/$pkgname/license.html"
+  
+  #### libpdf ####
+  install -d "${pkgdir}/usr/lib/chromium"
+  install -m644 opt/google/chrome/libpdf.so "${pkgdir}/usr/lib/chromium"
+}
--- a/chromium/chromium.install
+++ b/chromium/chromium.install
@ -1,6 +1,6 @@
 [ -f etc/chromium-browser/default ] && _default='etc/chromium-browser/default'
 [ -f etc/chromium/default ] && _default='etc/chromium/default'
-flashver=14.0.0.125
+flashver=14.0.0.177

 instructions() {

--- a/chromium/patch/template_url_prepopulate_data.cc
+++ b/chromium/patch/template_url_prepopulate_data.cc
--- a/chromium/patch/template_url_prepopulate_data.cc.orig
+++ b/chromium/patch/template_url_prepopulate_data.cc.orig
--- a/chromium/prepopulated_engines_json.diff
+++ b/chromium/prepopulated_engines_json.diff
@ -1,5 +1,5 @@
--- a/chrome/browser/search_engines/prepopulated_engines.json	2013-02-22 11:04:47.043248397 -0500
-+++ b/chrome/browser/search_engines/prepopulated_engines_new.json	2013-02-22 11:05:02.036900238 -0500
+--- a/components/search_engines/prepopulated_engines.json	2013-02-22 11:04:47.043248397 -0500
+++ b/components/search_engines/prepopulated_engines_new.json	2013-02-22 11:05:02.036900238 -0500
@@ -788,6 +788,15 @@
       "type": "SEARCH_ENGINE_DELFI",
       "id": 45
--- a/chromium/search_engine_type.diff
+++ b/chromium/search_engine_type.diff
@ -1,5 +1,5 @@
--- a/chrome/browser/search_engines/search_engine_type.h	2013-10-01 21:46:34.152459395 +0000
-+++ a/chrome/browser/search_engines/search_engine_type.h	2013-10-01 21:47:04.238963149 +0000
+--- a/components/search_engines/search_engine_type.h	2013-10-01 21:46:34.152459395 +0000
+++ a/components/search_engines/search_engine_type.h	2013-10-01 21:47:04.238963149 +0000
@@ -23,6 +23,7 @@ enum SearchEngineType {
   SEARCH_ENGINE_DELFI,
   SEARCH_ENGINE_DELTA,
--- a/chromium/template_url_prepopulate_data.diff
+++ b/chromium/template_url_prepopulate_data.diff
@ -1,6 +1,6 @@
--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc	2014-05-20 20:08:31.000000000 +0000
-+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc	2014-05-20 20:20:50.892967521 +0000
-@@ -52,435 +52,435 @@ namespace {
+--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc    2014-08-20 21:02:12.000000000 +0200
+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc    2014-08-26 22:00:59.059520205 +0200
+@@ -49,435 +49,435 @@ namespace {
 
 // Default (for countries with no better engine set)
 const PrepopulatedEngine* engines_default[] =
@ -544,7 +544,7 @@
 
 // A list of all the engines that we know about.
 const PrepopulatedEngine* kAllEngines[] = {
-@@ -513,6 +513,9 @@ const PrepopulatedEngine* kAllEngines[]
+@@ -510,6 +510,9 @@ const PrepopulatedEngine* kAllEngines[]
   &search_results, &searchnu,   &snapdo,       &softonic,     &sweetim,
   &terra_ar,     &terra_es,     &tut,          &walla,        &wp,
   &zoznam,
@ -553,6 +553,4 @@
 +  &duckduckgo,
 };
 
- const struct LogoURLs {
-  
- }
+ // Please refer to ISO 3166-1 for information about the two-character country