[arch-commits] Commit in chromium/trunk (2 files)

[Evangelos Foutras]

    Date: Tuesday, January 28, 2014 @ 12:44:53
  Author: foutrelis
Revision: 204835

upgpkg: chromium 32.0.1700.102-1

New upstream release.

Modified:
  chromium/trunk/PKGBUILD
Deleted:
  chromium/trunk/chromium-32.0.1700.76-diff-to-32.0.1700.77.patch

--------------------------------------------------+
 PKGBUILD                                         |   19 ++------
 chromium-32.0.1700.76-diff-to-32.0.1700.77.patch |   47 ---------------------
 2 files changed, 6 insertions(+), 60 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-28 09:00:12 UTC (rev 204834)
+++ PKGBUILD	2014-01-28 11:44:53 UTC (rev 204835)
@@ -5,8 +5,7 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=chromium
-pkgver=32.0.1700.77
-_srcver=32.0.1700.76
+pkgver=32.0.1700.102
 _toolchains_rev=12181
 pkgrel=1
 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
@@ -24,7 +23,7 @@
 backup=('etc/chromium/default')
 options=('!strip')
 install=chromium.install
-source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$_srcver.tar.xz
+source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
         naclsdk_nacl_linux_x86-$_toolchains_rev.tgz::https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/$_toolchains_rev/naclsdk_linux_x86.tgz
         naclsdk_pnacl_linux_x86-$_toolchains_rev.tgz::https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/$_toolchains_rev/naclsdk_pnacl_linux_x86.tgz
         naclsdk_pnacl_translator-$_toolchains_rev.tgz::https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/$_toolchains_rev/naclsdk_pnacl_translator.tgz
@@ -31,12 +30,11 @@
         naclsdk_pnacl_translator-$_toolchains_rev.tgz.sha1hash::https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/$_toolchains_rev/naclsdk_pnacl_translator.tgz.sha1hash
         chromium.desktop
         chromium.default
-        chromium-32.0.1700.76-diff-to-32.0.1700.77.patch
         chromium.sh)
 noextract=(naclsdk_nacl_linux_x86-$_toolchains_rev.tgz
            naclsdk_pnacl_linux_x86-$_toolchains_rev.tgz
            naclsdk_pnacl_translator-$_toolchains_rev.tgz)
-sha256sums=('4aad8c69dd575f76b8490142f55f8a620fbdd5567e54d3510ae6243358a08d1e'
+sha256sums=('da13d46517053541fc110acbbdc3b529f96a31a68f7d9b75dc1198c64e83bc4b'
             'cb4ac159f61de5e75d339813c0fc74f986156310a2c43a30ba40125951e72450'
             'ad229b69a5af72a9fa7cf2167ee48560cc11049206e4ef919cb31d1273d6409f'
             'fdb8309ef2b1c8600d63c4420ac02d66d85ab9befe98d99e9706828870730077'
@@ -43,7 +41,6 @@
             '162cf456b0a1cb4ce505004f828a09164ee3e3c8274739c6d5e972bf0ef1cfe9'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
             '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
-            '3b167d9480a6472c60ad9493f9a92b0cf79785a029bd0e886ab275f923b510df'
             '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -55,12 +52,8 @@
 _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
 
 prepare() {
-  cd "$srcdir/$pkgname-$_srcver"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  # Source tarball for 32.0.1700.77 is currently missing so we might as well
-  # patch 32.0.1700.76 with the single change before 32.0.1700.77 was tagged
-  patch -Np1 -i "$srcdir/chromium-32.0.1700.76-diff-to-32.0.1700.77.patch"
-
   # Use Python 2
   find . -type f -exec sed -i -r \
     -e 's|/usr/bin/python$|&2|g' \
@@ -83,7 +76,7 @@
 }
 
 build() {
-  cd "$srcdir/$pkgname-$_srcver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   export PATH="$srcdir/python2-path:$PATH"
 
@@ -137,7 +130,7 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-$_srcver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium"
 

Deleted: chromium-32.0.1700.76-diff-to-32.0.1700.77.patch
===================================================================
--- chromium-32.0.1700.76-diff-to-32.0.1700.77.patch	2014-01-28 09:00:12 UTC (rev 204834)
+++ chromium-32.0.1700.76-diff-to-32.0.1700.77.patch	2014-01-28 11:44:53 UTC (rev 204835)
@@ -1,47 +0,0 @@
-Index: src/chrome/VERSION
-===================================================================
---- src/chrome/VERSION	(revision 244501)
-+++ src/chrome/VERSION	(revision 244503)
-@@ -1,4 +1,4 @@
- MAJOR=32
- MINOR=0
- BUILD=1700
--PATCH=76
-+PATCH=77
-Index: src/chrome/browser/browser_process_impl.cc
-===================================================================
---- src/chrome/browser/browser_process_impl.cc	(revision 244501)
-+++ src/chrome/browser/browser_process_impl.cc	(revision 244503)
-@@ -882,7 +882,6 @@
-       prefs::kMetricsReportingEnabled,
-       base::Bind(&BrowserProcessImpl::ApplyMetricsReportingPolicy,
-                  base::Unretained(this)));
--  ApplyMetricsReportingPolicy();
- #endif
- 
-   int max_per_proxy = local_state_->GetInteger(prefs::kMaxConnectionsPerProxy);
-@@ -912,6 +911,10 @@
-   if (local_state_->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled))
-     ApplyDefaultBrowserPolicy();
- 
-+#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
-+  ApplyMetricsReportingPolicy();
-+#endif
-+
- #if defined(ENABLE_PLUGINS)
-   PluginService* plugin_service = PluginService::GetInstance();
-   plugin_service->SetFilter(ChromePluginServiceFilter::GetInstance());
-@@ -1037,11 +1040,11 @@
- 
- void BrowserProcessImpl::ApplyMetricsReportingPolicy() {
- #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
--  BrowserThread::PostTask(
-+  CHECK(BrowserThread::PostTask(
-       BrowserThread::FILE, FROM_HERE,
-       base::Bind(
-           base::IgnoreResult(&GoogleUpdateSettings::SetCollectStatsConsent),
--          local_state()->GetBoolean(prefs::kMetricsReportingEnabled)));
-+          local_state()->GetBoolean(prefs::kMetricsReportingEnabled))));
- #endif
- }
-