extra/chromium to 32.0.1700.102-1

extra/chromium/PKGBUILD

@@ -22,8 +22,7 @@
 buildarch=20
 
 pkgname=chromium
-pkgver=32.0.1700.77
-_srcver=32.0.1700.76
+pkgver=32.0.1700.102
 pkgrel=1
 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
 arch=('armv6h' 'armv7h')
@@ -40,19 +39,17 @@ provides=('chromium-browser')
 conflicts=('chromium-browser')
 backup=('etc/chromium/default')
 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
         chromium.desktop
         chromium.default
         chromium.sh
-        chromium-32.0.1700.76-diff-to-32.0.1700.77.patch
         arm-webrtc-fix.patch
         skia.patch
         v6-ffmpeg.patch)
-sha256sums=('4aad8c69dd575f76b8490142f55f8a620fbdd5567e54d3510ae6243358a08d1e'
+sha256sums=('da13d46517053541fc110acbbdc3b529f96a31a68f7d9b75dc1198c64e83bc4b'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
             '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
             '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
-            '3b167d9480a6472c60ad9493f9a92b0cf79785a029bd0e886ab275f923b510df'
             '9db0f01517c52e3236ff52e8a664840542a19144a54923ae6aabea3dcfa92c52'
             '0567b09b91c13389d430630a8dfcda06d5f1a12d6b07f0b48dd418d2543a28d8'
             '3fbabcbd512494b529e0a0e17560735887acf2291a74653750f9b29f5d45774d')
@@ -67,7 +64,7 @@ _google_default_client_id=413772536636.apps.googleusercontent.com
 _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
 
 prepare() {
-  cd "$srcdir/$pkgname-$_srcver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   # Fix WebRTC for ARM
   patch -Np0 -i "$srcdir/arm-webrtc-fix.patch"
@@ -78,9 +75,6 @@ prepare() {
   # Temp fix for skia
   patch -Np0 -i "$srcdir/skia.patch"
 MAKEFLAGS=-j3
-  # 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 \
@@ -94,7 +88,7 @@ MAKEFLAGS=-j3
 }
 
 build() {
-  cd "$srcdir/$pkgname-$_srcver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   export PATH="$srcdir/python2-path:$PATH"
 
@@ -173,7 +167,7 @@ fi
 }
 
 package() {
-  cd "$srcdir/$pkgname-$_srcver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium"
 

extra/chromium/chromium-32.0.1700.76-diff-to-32.0.1700.77.patch

@@ -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
- }
-