commit 29f07c8c6219e47e0d28c10c1f4ad66488e75798
Merge: b0f560c ff7c827
Author: Elan Ruusamäe <[email protected]>
Date: Wed Dec 2 13:51:56 2015 +0200
up to 47.0.2526.73
Merge branch 'dev-47'
chromium-browser.spec | 27 ++++++++++++++--------
clean-source.sh | 55 ++++++++++++++++++++++++++------------------
ffmpeg-generate-errors.patch | 26 ++++++++-------------
ffmpeg-generate.patch | 8 +++----
nacl-verbose.patch | 18 +++++++--------
system-ffmpeg.patch | 54 +++++++++++++++++++++++++++++++++++++++++++
6 files changed, 126 insertions(+), 62 deletions(-)
---
diff --cc chromium-browser.spec
index e266d97,d45dfaf..e852509
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@@ -72,9 -72,9 +72,9 @@@
# - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
# - to look for new tarball, use update-source.sh script
- %define branch 44.0.2403
- %define basever 107
- %define patchver 157
+ %define branch 47.0.2526
-%define basever 69
++%define basever 73
+ #define patchver 130
%define gyp_rev 1014
Summary: A WebKit powered web browser
Name: chromium-browser
@@@ -86,11 -86,11 +86,11 @@@ Version: %{branch}.%{basever
Release: 1
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.gz
-# Source0-md5: fd02450421899fb410fa70352a611c31
+Source0:
http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
- # Source0-md5: 8686c4033cb1d25d0c60c9b6e09c65e1
++# Source0-md5: 54a013e6b0ea5b6ecacbf283844f962a
%if "%{?patchver}" != ""
Patch0:
http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
-# Patch0-md5: 02973b87b9564ed36220497b4bf83109
+# Patch0-md5: e62038af53ab3be30a4b75eaf20d0e4b
%endif
Source1: %{name}.default
Source2: %{name}.sh
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/29f07c8c6219e47e0d28c10c1f4ad66488e75798
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
