[arch-commits] Commit in chromium/trunk (PKGBUILD PNGImageDecoder.patch)

[Bartłomiej Piotrowski]

    Date: Thursday, May 26, 2016 @ 22:29:04
  Author: bpiotrowski
Revision: 268609

upgpkg: chromium 51.0.2704.63-1

new upstream release

Added:
  chromium/trunk/PNGImageDecoder.patch
Modified:
  chromium/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   16 +++++++++-------
 PNGImageDecoder.patch |   11 +++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-26 20:16:56 UTC (rev 268608)
+++ PKGBUILD	2016-05-26 20:29:04 UTC (rev 268609)
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=chromium
-pkgver=50.0.2661.102
+pkgver=51.0.2704.63
 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,11 +27,13 @@
 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-widevine.patch)
-sha256sums=('12135ef890c2bd13b653a06e2a44e8f251a65fe9e91404c792d27e346c5d57c6'
+        chromium-widevine.patch
+        PNGImageDecoder.patch)
+sha256sums=('b243e46e0ebaf8f60d1c37a0d99f1fdd80e1597667be4776a1862bb004e4eee9'
             '8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28'
             '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9'
-            '4660344789c45c9b9e52cb6d86f7cb6edb297b39320d04f6947e5216d6e5f64c')
+            '4660344789c45c9b9e52cb6d86f7cb6edb297b39320d04f6947e5216d6e5f64c'
+            'd9fd982ba6d50edb7743db6122b975ad1d3da5a9ad907c8ab7cf574395b186cd')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
 # Note: These are for Arch Linux use ONLY. For your own distribution, please
@@ -56,9 +58,6 @@
   # 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
-
   # 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")
@@ -65,6 +64,9 @@
   sed "s/@WIDEVINE_VERSION@/Pinkie Pie/" ../chromium-widevine.patch |
     patch -Np1
 
+  # Chromium 51 won't build without this patch. Not reported upstream yet AFAIK.
+  patch -p1 -i "$srcdir"/PNGImageDecoder.patch
+
   # Commentception – use bundled ICU due to build failures (50.0.2661.75)
   # See https://crbug.com/584920 and https://crbug.com/592268
   # ---

Added: PNGImageDecoder.patch
===================================================================
--- PNGImageDecoder.patch	                        (rev 0)
+++ PNGImageDecoder.patch	2016-05-26 20:29:04 UTC (rev 268609)
@@ -0,0 +1,11 @@
+--- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cppg	2016-05-01 15:22:46.103607522 +0800
++++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp	2016-05-01 15:25:14.459753876 +0800
+@@ -234,7 +234,7 @@
+ #endif
+             png_uint_32 profileLength = 0;
+             if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
+-                setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */);
++                setColorProfileAndTransform((const char*)profile, profileLength, imageHasAlpha, false /* useSRGB */);
+             }
+         }
+ #endif // PNG_iCCP_SUPPORTED