diff options
author | Iru Cai | 2016-11-01 13:34:39 +0800 |
---|---|---|
committer | Iru Cai | 2016-11-01 13:34:39 +0800 |
commit | 0f3ab254fd69289d6d51dc769bcbae27048ea00b (patch) | |
tree | 21584cb5b289f49cf24ca71947bf4187f4bf76b3 | |
parent | 66a2a0528bb65b3f0812f440e1991a1c96f19571 (diff) | |
download | aur-0f3ab254fd69289d6d51dc769bcbae27048ea00b.tar.gz |
update to 54.0
-rw-r--r-- | .SRCINFO | 29 | ||||
-rw-r--r-- | PKGBUILD | 239 | ||||
-rw-r--r-- | chromium-52.0.2743.116-unset-madv_free.patch | 4 | ||||
-rw-r--r-- | chromium-53.0.2785.92-last-commit-position.patch | 26 | ||||
-rw-r--r-- | chromium-cups-2.2.patch | 31 | ||||
-rw-r--r-- | chromium-widevine.patch | 43 | ||||
-rw-r--r-- | fix_PNGImageDecoder.patch | 11 |
7 files changed, 148 insertions, 235 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Oct 2 10:40:28 UTC 2016 +# Tue Nov 1 05:33:36 UTC 2016 pkgbase = iridium pkgdesc = a free, open, and libre browser modification of the Chromium code base - pkgver = 51.1 - pkgrel = 4 + pkgver = 54.0 + pkgrel = 1 url = https://iridiumbrowser.de/ arch = i686 arch = x86_64 @@ -37,26 +37,33 @@ pkgbase = iridium depends = perl-file-basedir depends = desktop-file-utils depends = hicolor-icon-theme + depends = flac + depends = libvpx + depends = libxslt + depends = re2 + depends = libwebp + depends = libjpeg + depends = snappy + depends = libpng + depends = harfbuzz-icu optdepends = kdebase-kdialog: needed for file dialogs in KDE optdepends = gnome-keyring: for storing passwords in GNOME keyring optdepends = kwallet: for storing passwords in KWallet conflicts = chromium replaces = chromium options = !strip - source = https://downloads.iridiumbrowser.de/source/iridium-browser-51.1.tar.xz + source = https://downloads.iridiumbrowser.de/source/iridium-browser-54.0.tar.xz source = chromium-launcher-3.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v3.tar.gz source = chromium.desktop source = chromium-widevine.patch source = chromium-52.0.2743.116-unset-madv_free.patch - source = chromium-cups-2.2.patch - source = fix_PNGImageDecoder.patch - sha256sums = 614a7cd4fe0a5ba57495fc7afbd407c0e5e59e8897d98c78f96f859e4c9bf80a + source = chromium-53.0.2785.92-last-commit-position.patch + sha256sums = 0f93beeba06259178fde16948f712b997408b14bd04718c7563a54374811c74e sha256sums = 8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28 sha256sums = 028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9 - sha256sums = 4660344789c45c9b9e52cb6d86f7cb6edb297b39320d04f6947e5216d6e5f64c - sha256sums = ed0229c19fff2fa1867499b5557d815b25ed2b81b21bccb5d10bd27cf747bac4 - sha256sums = 6519cf913cb68e2def1bbf9210ef40a178b45bc9d325297c41b7a784ff57cc8e - sha256sums = 42086dbe5c68744a6bed4e4af6035defbd6e1dfc1c3f32a4711c5c953f938698 + sha256sums = d6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808 + sha256sums = 3b3aa9e28f29e6f539ed1c7832e79463b13128863a02e9c6fecd16c30d61c227 + sha256sums = d3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e pkgname = iridium @@ -1,9 +1,26 @@ # $Id$ # Maintainer: Iru Cai <mytbk920423@gmail.com> +# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py +# Keys are the names in the above script; values are the dependencies in Arch +declare -rgA _system_libs=( + [flac]=flac + [harfbuzz-ng]=harfbuzz-icu + [libjpeg]=libjpeg + [libpng]=libpng + [libvpx]=libvpx + [libwebp]=libwebp + #[libxml]=libxml2 # https://bugs.archlinux.org/task/29939 + [libxslt]=libxslt + [re2]=re2 + [snappy]=snappy + [yasm]= + #[zlib]=zlib # Error during build +) + pkgname=iridium -pkgver=51.1 -pkgrel=4 +pkgver=54.0 +pkgrel=1 _launcher_ver=3 pkgdesc="a free, open, and libre browser modification of the Chromium code base" arch=('i686' 'x86_64') @@ -14,6 +31,7 @@ depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz' 'libsecret' 'libvpx' 'perl' 'perl-file-basedir' 'desktop-file-utils' 'hicolor-icon-theme') +depends+=(${_system_libs[@]}) makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja') # makedepends_x86_64=('lib32-gcc-libs' 'lib32-zlib') optdepends=('kdebase-kdialog: needed for file dialogs in KDE' @@ -28,15 +46,13 @@ source=(https://downloads.iridiumbrowser.de/source/iridium-browser-${pkgver}.tar chromium.desktop chromium-widevine.patch chromium-52.0.2743.116-unset-madv_free.patch - chromium-cups-2.2.patch - fix_PNGImageDecoder.patch) -sha256sums=('614a7cd4fe0a5ba57495fc7afbd407c0e5e59e8897d98c78f96f859e4c9bf80a' + chromium-53.0.2785.92-last-commit-position.patch) +sha256sums=('0f93beeba06259178fde16948f712b997408b14bd04718c7563a54374811c74e' '8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28' '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9' - '4660344789c45c9b9e52cb6d86f7cb6edb297b39320d04f6947e5216d6e5f64c' - 'ed0229c19fff2fa1867499b5557d815b25ed2b81b21bccb5d10bd27cf747bac4' - '6519cf913cb68e2def1bbf9210ef40a178b45bc9d325297c41b7a784ff57cc8e' - '42086dbe5c68744a6bed4e4af6035defbd6e1dfc1c3f32a4711c5c953f938698') + 'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808' + '3b3aa9e28f29e6f539ed1c7832e79463b13128863a02e9c6fecd16c30d61c227' + 'd3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e') # 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 @@ -46,134 +62,98 @@ _google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM _google_default_client_id=413772536636.apps.googleusercontent.com _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 -# We don't build PNaCL in Iridium -_build_nacl=0 -if [[ $CARCH == i686 ]]; then - _build_nacl=0 -fi - prepare() { cd "$srcdir/iridium-browser-$pkgver" - # 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 - - patch -p0 -i ../fix_PNGImageDecoder.patch - # Enable support for the Widevine CDM plugin - # The actual libraries are not included, but can be copied over from Chrome: - # libwidevinecdmadapter.so - # libwidevinecdm.so + # 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") sed "s/@WIDEVINE_VERSION@/Pinkie Pie/" ../chromium-widevine.patch | patch -Np1 - # Commentception – use bundled ICU due to build failures (50.0.2661.75) - # See https://crbug.com/584920 and https://crbug.com/592268 - # --- - ## Remove bundled ICU; its header files appear to get picked up instead of - ## the system ones, leading to errors during the final link stage. - ## https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/BNGvJc08B6Q - #find third_party/icu -type f \! -regex '.*\.\(gyp\|gypi\|isolate\)' -delete - # Disable MADV_FREE (if set by glibc) # https://bugzilla.redhat.com/show_bug.cgi?id=1361157 patch -Np1 -i ../chromium-52.0.2743.116-unset-madv_free.patch - # Fix compiling with CUPS 2.2 backend - patch -Np0 -i ../chromium-cups-2.2.patch + # Disable last_commit_position as we don't build from git repository + patch -Np1 -i ../chromium-53.0.2785.92-last-commit-position.patch + + # Work around bug in blink in which GCC 6 optimizes away null pointer checks + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833524 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68853#c2 + sed -i '/config("compiler")/ a cflags_cc = [ "-fno-delete-null-pointer-checks" ]' \ + build/config/linux/BUILD.gn # Use Python 2 find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} + + # There are still a lot of relative calls which need a workaround - mkdir "$srcdir/python2-path" - ln -s /usr/bin/python2 "$srcdir/python2-path/python" - - # Download the PNaCL toolchain on x86_64; i686 toolchain is no longer provided - if (( $_build_nacl )); then - python2 build/download_nacl_toolchains.py \ - --packages nacl_x86_newlib,pnacl_newlib,pnacl_translator \ - sync --extract - fi + mkdir -p "$srcdir/python2-path" + ln -sf /usr/bin/python2 "$srcdir/python2-path/python" + + # Remove bundled libraries for which we will use the system copies; this + # *should* do what the remove_bundled_libraries.py script does, with the + # added benefit of not having to list all the remaining libraries + local _lib + for _lib in ${!_system_libs[@]} ${_system_libs[libjpeg]+libjpeg_turbo}; do + find -type f -path "*third_party/$_lib/*" \ + \! -path "*third_party/$_lib/chromium/*" \ + \! -path "*third_party/$_lib/google/*" \ + \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \ + -delete + done + + python2 build/linux/unbundle/replace_gn_files.py \ + --system-libraries "${!_system_libs[@]}" + + python2 third_party/libaddressinput/chromium/tools/update-strings.py } build() { - cd "$srcdir/chromium-launcher-$_launcher_ver" - - make PREFIX=/usr + make -C "$srcdir/chromium-launcher-$_launcher_ver" PREFIX=/usr cd "$srcdir/iridium-browser-$pkgver" export PATH="$srcdir/python2-path:$PATH" - - # CFLAGS are passed through release_extra_cflags below - export -n CFLAGS CXXFLAGS - - # Work around bug in v8 in which GCC 6 optimizes away null pointer checks - # https://bugs.chromium.org/p/v8/issues/detail?id=3782 - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69234 - CFLAGS+=' -fno-delete-null-pointer-checks' - - local _chromium_conf=( - -Dgoogle_api_key=$_google_api_key - -Dgoogle_default_client_id=$_google_default_client_id - -Dgoogle_default_client_secret=$_google_default_client_secret - -Dwerror= - -Dclang=0 - -Dpython_ver=2.7 - -Dlinux_link_gsettings=1 - -Dlinux_link_libpci=1 - -Dlinux_link_libspeechd=1 - -Dlinux_link_pulseaudio=1 - -Dlinux_strip_binary=1 - -Dlinux_use_bundled_binutils=0 - -Dlinux_use_bundled_gold=0 - -Dlinux_use_gold_flags=0 - -Dicu_use_data_file_flag=1 - -Dlogging_like_official_build=1 - -Dtracing_like_official_build=1 - -Dfieldtrial_testing_like_official_build=1 - -Drelease_extra_cflags="$CFLAGS" - -Dlibspeechd_h_prefix=speech-dispatcher/ - -Dffmpeg_branding=Chrome - -Dproprietary_codecs=0 - -Duse_gnome_keyring=0 - -Duse_system_bzip2=1 - -Duse_system_flac=1 - -Duse_system_ffmpeg=0 - -Duse_system_harfbuzz=1 - -Duse_system_icu=0 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_libvpx=1 - -Duse_system_libxml=0 - -Duse_system_snappy=1 - -Duse_system_xdg_utils=1 - -Duse_system_yasm=1 - -Duse_system_zlib=0 - -Dusb_ids_path=/usr/share/hwdata/usb.ids - -Duse_mojo=0 - -Duse_gconf=0 - -Duse_sysroot=0 - -Denable_hangout_services_extension=1 - -Ddisable_fatal_linker_warnings=1 - -Ddisable_glibc=1) - - if (( ! $_build_nacl )); then - _chromium_conf+=( - -Ddisable_nacl=1 - -Ddisable_pnacl=1 - ) - fi - - build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}" - build/gyp_chromium --depth=. "${_chromium_conf[@]}" - - ninja -C out/Release chrome chrome_sandbox chromedriver + export TMPDIR="$srcdir/temp" + mkdir -p "$TMPDIR" + + local _flags=( + 'is_clang=false' + 'clang_use_chrome_plugins=false' + 'symbol_level=0' + 'is_debug=false' + 'fatal_linker_warnings=false' + 'treat_warnings_as_errors=false' + 'fieldtrial_testing_like_official_build=true' + 'remove_webcore_debug_symbols=true' + 'ffmpeg_branding="Chrome"' + 'proprietary_codecs=true' + 'link_pulseaudio=true' + 'linux_use_bundled_binutils=false' + 'use_allocator="none"' + 'use_cups=true' + 'use_gconf=false' + 'use_gnome_keyring=false' + 'use_gold=false' + 'use_gtk3=false' + 'use_kerberos=true' + 'use_pulseaudio=true' + 'use_sysroot=false' + 'enable_hangout_services_extension=true' + 'enable_widevine=true' + 'enable_nacl=false' + 'enable_nacl_nonsfi=false' + "google_api_key=\"${_google_api_key}\"" + "google_default_client_id=\"${_google_default_client_id}\"" + "google_default_client_secret=\"${_google_default_client_secret}\"" + ) + + python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args "${_flags[*]}" + out/Release/gn gen out/Release --args="${_flags[*]}" \ + --script-executable=/usr/bin/python2 + + ninja -C out/Release chrome chrome_sandbox chromedriver widevinecdmadapter } package() { @@ -186,30 +166,19 @@ package() { cd "$srcdir/iridium-browser-$pkgver" install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium" + install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1" + install -Dm644 "$srcdir/chromium.desktop" \ + "$pkgdir/usr/share/applications/chromium.desktop" install -Dm4755 out/Release/chrome_sandbox \ "$pkgdir/usr/lib/chromium/chrome-sandbox" - install -D out/Release/chromedriver "$pkgdir/usr/lib/chromium/chromedriver" - - cp out/Release/{*.pak,*.bin} "$pkgdir/usr/lib/chromium/" - - # Manually strip binaries so that 'nacl_irt_*.nexe' is left intact - strip $STRIP_BINARIES "$pkgdir/usr/lib/chromium/"{chromium,chrome-sandbox} \ - "$pkgdir/usr/lib/chromium/chromedriver" - - if (( $_build_nacl )); then - cp out/Release/nacl_helper{,_bootstrap} out/Release/nacl_irt_*.nexe \ - "$pkgdir/usr/lib/chromium/" - strip $STRIP_BINARIES "$pkgdir/usr/lib/chromium/"nacl_helper{,_bootstrap} - fi - - cp -a out/Release/locales "$pkgdir/usr/lib/chromium/" - - install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1" + cp -a out/Release/{*.pak,*.bin,chromedriver,libwidevinecdmadapter.so,icudtl.dat} \ + out/Release/locales \ + out/Release/gen/content/content_resources.pak \ + "$pkgdir/usr/lib/chromium/" - install -Dm644 "$srcdir/chromium.desktop" \ - "$pkgdir/usr/share/applications/chromium.desktop" + ln -s /usr/lib/chromium/chromedriver "$pkgdir/usr/bin/chromedriver" for size in 22 24 48 64 128 256; do install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \ @@ -221,11 +190,7 @@ package() { "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png" done - ln -s /usr/lib/chromium/chromedriver "$pkgdir/usr/bin/chromedriver" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE" - - install -Dm644 out/Release/icudtl.dat "${pkgdir}/usr/lib/chromium/icudtl.dat" } # vim:set ts=2 sw=2 et: diff --git a/chromium-52.0.2743.116-unset-madv_free.patch b/chromium-52.0.2743.116-unset-madv_free.patch index 89659ced658e..2867c7967770 100644 --- a/chromium-52.0.2743.116-unset-madv_free.patch +++ b/chromium-52.0.2743.116-unset-madv_free.patch @@ -1,6 +1,6 @@ diff -up chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp ---- chromium-52.0.2743.116/third_party/WebKit/Source/wtf/PageAllocator.cpp.madv_free 2016-08-15 13:07:29.279655676 -0400 -+++ chromium-52.0.2743.116/third_party/WebKit/Source/wtf/PageAllocator.cpp 2016-08-15 13:08:38.447317416 -0400 +--- chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free 2016-08-15 13:07:29.279655676 -0400 ++++ chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-15 13:08:38.447317416 -0400 @@ -41,6 +41,11 @@ #include <errno.h> #include <sys/mman.h> diff --git a/chromium-53.0.2785.92-last-commit-position.patch b/chromium-53.0.2785.92-last-commit-position.patch new file mode 100644 index 000000000000..700a86e86b61 --- /dev/null +++ b/chromium-53.0.2785.92-last-commit-position.patch @@ -0,0 +1,26 @@ +--- a/tools/gn/gn_main.cc.orig 2015-11-12 11:49:56.260549036 +0000 ++++ b/tools/gn/gn_main.cc 2015-11-12 11:50:14.780931485 +0000 +@@ -11,13 +11,7 @@ + #include "tools/gn/standard_out.h" + #include "tools/gn/switches.h" + +-// Only the GN-generated build makes this header for now. +-// TODO(brettw) consider adding this if we need it in GYP. +-#if defined(GN_BUILD) +-#include "tools/gn/last_commit_position.h" +-#else + #define LAST_COMMIT_POSITION "UNKNOWN" +-#endif + + namespace { + +--- a/tools/gn/BUILD.gn.orig 2015-11-12 11:50:43.513524769 +0000 ++++ b/tools/gn/BUILD.gn 2015-11-12 11:50:57.697817632 +0000 +@@ -227,7 +227,6 @@ + + deps = [ + ":gn_lib", +- ":last_commit_position", + "//base", + "//build/config/sanitizers:deps", + ] diff --git a/chromium-cups-2.2.patch b/chromium-cups-2.2.patch deleted file mode 100644 index 85559e13167f..000000000000 --- a/chromium-cups-2.2.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 5132ca58a0a3ada1aee99732fd30d53ebe5af984 -author saiarcot895 <saiarcot895@gmail.com> Mon Aug 22 18:41:54 2016 -committer Commit bot <commit-bot@chromium.org> Mon Aug 22 18:44:13 2016 -tree b4783f1c90f2fdb001843ad83463e260de9b292c -parent da7b21cac1ded0c70cb330e4f76a1f7915e38ccf - -Fix compiling with CUPS 2.2 backend. - -cupsGetPPD() and cupsGetPPD2() have been moved into the cups/ppd.h -header starting with CUPS 2.2. This header file now needs to be included -to use these functions. The header file also exists on older versions of -CUPS, so a compile error will not occur. - -R=skau@chromium.org, thestig@chromium.org - -Review-Url: https://codereview.chromium.org/2258333004 -Cr-Commit-Position: refs/heads/master@{#413484} - -diff --git printing/backend/cups_helper.h printing/backend/cups_helper.h -index fd7601d..b72903f 100644 ---- printing/backend/cups_helper.h -+++ printing/backend/cups_helper.h - -@@ -6,6 +6,7 @@ - #define PRINTING_BACKEND_CUPS_HELPER_H_ - - #include <cups/cups.h> -+#include <cups/ppd.h> - - #include "base/strings/string_piece.h" - #include "printing/printing_export.h" diff --git a/chromium-widevine.patch b/chromium-widevine.patch index 569ad4c88bfe..a67ae8b1c118 100644 --- a/chromium-widevine.patch +++ b/chromium-widevine.patch @@ -1,46 +1,3 @@ -diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc chromium-48.0.2564.82/chrome/common/chrome_content_client.cc ---- chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc 2016-01-20 22:01:20.000000000 +0200 -+++ chromium-48.0.2564.82/chrome/common/chrome_content_client.cc 2016-01-21 20:02:02.788936626 +0200 -@@ -158,7 +158,12 @@ void ComputeBuiltInPlugins(std::vector<c - #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ - !defined(WIDEVINE_CDM_IS_COMPONENT) - static bool skip_widevine_cdm_file_check = false; -- if (PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) { -+ bool widevine_cdm_present = -+ skip_widevine_cdm_file_check || -+ (PathService::Get(chrome::FILE_WIDEVINE_CDM, &path) && -+ base::PathExists(path)); -+ if (widevine_cdm_present && -+ PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) { - if (skip_widevine_cdm_file_check || base::PathExists(path)) { - content::PepperPluginInfo widevine_cdm; - widevine_cdm.is_out_of_process = true; -diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_paths.cc chromium-48.0.2564.82/chrome/common/chrome_paths.cc ---- chromium-48.0.2564.82.orig/chrome/common/chrome_paths.cc 2016-01-20 22:01:20.000000000 +0200 -+++ chromium-48.0.2564.82/chrome/common/chrome_paths.cc 2016-01-21 19:18:51.287978456 +0200 -@@ -375,6 +375,11 @@ bool PathProvider(int key, base::FilePat - return false; - cur = cur.AppendASCII(kWidevineCdmAdapterFileName); - break; -+ case chrome::FILE_WIDEVINE_CDM: -+ if (!GetInternalPluginsDirectory(&cur)) -+ return false; -+ cur = cur.AppendASCII(kWidevineCdmFileName); -+ break; - #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) - case chrome::FILE_RESOURCES_PACK: - #if defined(OS_MACOSX) && !defined(OS_IOS) -diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_paths.h chromium-48.0.2564.82/chrome/common/chrome_paths.h ---- chromium-48.0.2564.82.orig/chrome/common/chrome_paths.h 2016-01-14 03:49:22.000000000 +0200 -+++ chromium-48.0.2564.82/chrome/common/chrome_paths.h 2016-01-21 19:18:51.287978456 +0200 -@@ -99,6 +99,7 @@ enum { - DIR_COMPONENT_WIDEVINE_CDM, // Directory that contains component-updated - // Widevine CDM files. - FILE_WIDEVINE_CDM_ADAPTER, // Full path to the Widevine CDM adapter file. -+ FILE_WIDEVINE_CDM, // Full path to the Widevine CDM file. - FILE_RESOURCES_PACK, // Full path to the .pak file containing - // binary data (e.g., html files and images - // used by internal pages). diff -upr chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h --- chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h 2016-01-14 01:05:17.000000000 +0200 +++ chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h 2016-01-21 19:18:51.287978456 +0200 diff --git a/fix_PNGImageDecoder.patch b/fix_PNGImageDecoder.patch deleted file mode 100644 index 5f767be35a2e..000000000000 --- a/fix_PNGImageDecoder.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp.orig 2016-05-01 15:22:46.103607522 +0800 -+++ 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 |