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

[Evangelos Foutras]

    Date: Thursday, March 3, 2016 @ 08:38:11
  Author: foutrelis
Revision: 260569

upgpkg: chromium 49.0.2623.75-1

New upstream release.

Modified:
  chromium/trunk/PKGBUILD
Deleted:
  chromium/trunk/chromium-fix-print-preview-on-en_GB-locale.patch
  chromium/trunk/chromium-use-non-versioned-icu-namespace.patch

--------------------------------------------------+
 PKGBUILD                                         |   15 +++------------
 chromium-fix-print-preview-on-en_GB-locale.patch |   17 -----------------
 chromium-use-non-versioned-icu-namespace.patch   |   14 --------------
 3 files changed, 3 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-03 07:18:38 UTC (rev 260568)
+++ PKGBUILD	2016-03-03 07:38:11 UTC (rev 260569)
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=chromium
-pkgver=48.0.2564.116
+pkgver=49.0.2623.75
 pkgrel=1
 _launcher_ver=3
 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
@@ -27,14 +27,10 @@
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
         chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
         chromium.desktop
-        chromium-use-non-versioned-icu-namespace.patch
-        chromium-fix-print-preview-on-en_GB-locale.patch
         chromium-widevine.patch)
-sha256sums=('6a1eb9b4c853f15eeec0a55af7ac3b41835f0fc592ba6c0a500873cb12a84d0f'
+sha256sums=('a4fd4c85b12b021789d8afc33b27555396e47d9f67c8a062ee3609c4d6b582f5'
             '8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28'
             '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9'
-            'e4192446cc0ab6a5c540599c8a149f4f2208f0014da2786ada6c9544913d7426'
-            '6fff45aafa31fb35a032b4e2175a341e08f9d2a9b37c5cf080c318180f558378'
             '4660344789c45c9b9e52cb6d86f7cb6edb297b39320d04f6947e5216d6e5f64c')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -63,12 +59,6 @@
   # https://code.google.com/p/chromium/issues/detail?id=541273
   sed -i "/'target_name': 'libvpx'/s/libvpx/&_new/" build/linux/unbundle/libvpx.gyp
 
-  # https://codereview.chromium.org/1505763002
-  patch -Np1 -i ../chromium-use-non-versioned-icu-namespace.patch
-
-  # https://code.google.com/p/chromium/issues/detail?id=480415
-  patch -Np1 -i ../chromium-fix-print-preview-on-en_GB-locale.patch
-
   # Enable support for the Widevine CDM plugin
   # libwidevinecdm.so is not included, but can be copied over from Chrome
   # (Version string doesn't seem to matter so let's go with "Pinkie Pie")
@@ -147,6 +137,7 @@
     -Dusb_ids_path=/usr/share/hwdata/usb.ids
     -Duse_mojo=0
     -Duse_gconf=0
+    -Duse_sysroot=0
     -Denable_hangout_services_extension=1
     -Denable_widevine=1
     -Ddisable_fatal_linker_warnings=1

Deleted: chromium-fix-print-preview-on-en_GB-locale.patch
===================================================================
--- chromium-fix-print-preview-on-en_GB-locale.patch	2016-03-03 07:18:38 UTC (rev 260568)
+++ chromium-fix-print-preview-on-en_GB-locale.patch	2016-03-03 07:38:11 UTC (rev 260569)
@@ -1,17 +0,0 @@
-Index: chrome/browser/ui/webui/print_preview/print_preview_handler.cc
-diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
-index 6cfd861387c9f8b145fb33472b10025537986213..c936a9c1dadb13c00418e8ae79a8a1987c1d36cd 100644
---- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
-+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
-@@ -1222,7 +1222,10 @@ void PrintPreviewHandler::GetNumberFormatAndMeasurementSystem(
-   UErrorCode errorCode = U_ZERO_ERROR;
-   const char* locale = g_browser_process->GetApplicationLocale().c_str();
-   UMeasurementSystem system = ulocdata_getMeasurementSystem(locale, &errorCode);
--  if (errorCode > U_ZERO_ERROR || system == UMS_LIMIT)
-+  // On error, assume the units are SI.
-+  // Since the only measurement units print preview's WebUI cares about are
-+  // those for measuring distance, assume anything non-US is SI.
-+  if (errorCode > U_ZERO_ERROR || system != UMS_US)
-     system = UMS_SI;
- 
-   // Getting the number formatting based on the locale and writing to

Deleted: chromium-use-non-versioned-icu-namespace.patch
===================================================================
--- chromium-use-non-versioned-icu-namespace.patch	2016-03-03 07:18:38 UTC (rev 260568)
+++ chromium-use-non-versioned-icu-namespace.patch	2016-03-03 07:38:11 UTC (rev 260569)
@@ -1,14 +0,0 @@
-Index: components/autofill/core/common/autofill_l10n_util.cc
-diff --git a/components/autofill/core/common/autofill_l10n_util.cc b/components/autofill/core/common/autofill_l10n_util.cc
-index 2ee517faf82b1feb224f83ae533092ae3b31f5af..c29b0a299b7215895874adf9241e4705247161ab 100644
---- a/components/autofill/core/common/autofill_l10n_util.cc
-+++ b/components/autofill/core/common/autofill_l10n_util.cc
-@@ -22,7 +22,7 @@ CaseInsensitiveCompare::CaseInsensitiveCompare(const icu::Locale& locale) {
-     // library. This could be due to a device-specific issue (has been seen in
-     // the wild on Android devices). In the failure case, |collator_| will be
-     // null. See http://crbug.com/558625.
--    icu_54::UnicodeString name;
-+    icu::UnicodeString name;
-     std::string locale_name;
-     locale.getDisplayName(name).toUTF8String(locale_name);
-     LOG(ERROR) << "Failed to initialize the ICU Collator for "