[packages/chromium-browser: 10/10] up to 44.0.2403.107 stable

glen glen at pld-linux.org
Mon Jul 27 08:24:48 CEST 2015


commit 87143ae367f0aeaf7f1de68d1d7ecd35beeb0e6b
Merge: 72c57d7 f0db7b9
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jul 27 09:23:33 2015 +0300

    up to 44.0.2403.107 stable
    
    Merge branch 'dev-44'
    
    Conflicts:
    	chromium-browser.spec

 chromium-browser.spec        | 23 +++++++-------
 clean-source.sh              |  7 +++++
 ffmpeg-generate-errors.patch | 72 ++++++++++++++++++++++++++++++++++++++++++++
 ffmpeg-generate.patch        | 22 ++++++++++++++
 system-libvpx.patch          | 10 ------
 5 files changed, 113 insertions(+), 21 deletions(-)
---
diff --cc chromium-browser.spec
index 487408e,1b64c71..d7b1bdd
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@@ -18,7 -18,7 +18,7 @@@
  %bcond_without	system_flac		# system flac
  %bcond_with	system_ffmpeg	# system ffmpeg instead of ffmpegsumo
  %bcond_without	system_harfbuzz	# system harfbuzz
- %bcond_without	system_icu	# system icu
 -%bcond_with	system_icu	# system icu, disabled: http://bugs.icu-project.org/trac/ticket/11358)
++%bcond_with	system_icu	# system icu, disabled: http://bugs.icu-project.org/trac/ticket/11358
  %bcond_without	system_jsoncpp	# system jsoncpp
  %bcond_without	system_libexif	# system libexif
  %bcond_without	system_libmtp	# system libmtp
@@@ -88,10 -87,10 +87,10 @@@ Release:	
  License:	BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
  Group:		X11/Applications/Networking
  Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
- # Source0-md5:	4aa590c1965817cfb693df7f8404e0b6
+ # Source0-md5:	8686c4033cb1d25d0c60c9b6e09c65e1
  %if "%{?patchver}" != ""
  Patch0:		http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 -# Patch0-md5:	4265bb63c75457923cdbaa15a49a22ae
 +# Patch0-md5:	0cfc52a089350571474c308dab1327ee
  %endif
  Source1:	%{name}.default
  Source2:	%{name}.sh
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/87143ae367f0aeaf7f1de68d1d7ecd35beeb0e6b



More information about the pld-cvs-commit mailing list