Date: Wednesday, December 2, 2015 @ 02:01:53 Author: foutrelis Revision: 252107
upgpkg: chromium 47.0.2526.73-1 - New upstream release. - Apply patch that fixes print preview with the en_GB locale. - Replace kdeutils-kwalletmanager optdep with kwallet (FS#47139). Added: chromium/trunk/chromium-fix-print-preview-on-en_GB-locale.patch Modified: chromium/trunk/PKGBUILD --------------------------------------------------+ PKGBUILD | 14 +++++++++++--- chromium-fix-print-preview-on-en_GB-locale.patch | 17 +++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-12-01 23:37:54 UTC (rev 252106) +++ PKGBUILD 2015-12-02 01:01:53 UTC (rev 252107) @@ -5,7 +5,7 @@ # Contributor: Daniel J Griffiths <ghost1...@archlinux.us> pkgname=chromium -pkgver=46.0.2490.86 +pkgver=47.0.2526.73 pkgrel=1 _launcher_ver=3 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" @@ -21,17 +21,19 @@ makedepends_x86_64=('lib32-gcc-libs' 'lib32-zlib') optdepends=('kdebase-kdialog: needed for file dialogs in KDE' 'gnome-keyring: for storing passwords in GNOME keyring' - 'kdeutils-kwalletmanager: for storing passwords in KWallet') + 'kwallet: for storing passwords in KWallet') options=('!strip') install=chromium.install 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-fix-print-preview-on-en_GB-locale.patch 0001-Add-FPDFAPIJPEG_-prefix-to-more-libjpeg-functions.patch chromium-widevine.patch) -sha256sums=('ee18d28ac80ff958e8a6c770bfc0d7d770b55452ed91a87f731e1b432a7d1d92' +sha256sums=('6d66d01c8ddff6562ff13d30ed65ef0cdc2888d9e4924be615d576b7eb15f4f5' '8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28' '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9' + '6fff45aafa31fb35a032b4e2175a341e08f9d2a9b37c5cf080c318180f558378' 'd114def156d60d5f4c9e42f2955ba19bdebe38037a330ef947af24ace25db39d' '379b746e187de28f80f5a7cd19edcfa31859656826f802a1ede054fcb6dfb221') @@ -58,6 +60,12 @@ # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion touch chrome/test/data/webui/i18n_process_css_test.html + # https://code.google.com/p/chromium/issues/detail?id=541273 + sed -i "/'target_name': 'libvpx'/s/libvpx/&_new/" build/linux/unbundle/libvpx.gyp + + # https://code.google.com/p/chromium/issues/detail?id=480415 + patch -Np1 -i ../chromium-fix-print-preview-on-en_GB-locale.patch + # https://code.google.com/p/chromium/issues/detail?id=505226 patch -d third_party/pdfium -Np1 <../0001-Add-FPDFAPIJPEG_-prefix-to-more-libjpeg-functions.patch Added: chromium-fix-print-preview-on-en_GB-locale.patch =================================================================== --- chromium-fix-print-preview-on-en_GB-locale.patch (rev 0) +++ chromium-fix-print-preview-on-en_GB-locale.patch 2015-12-02 01:01:53 UTC (rev 252107) @@ -0,0 +1,17 @@ +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