[packages/chromium-browser: 2/2] Merge branch 'dev-29': up to stable 29.0.1547.57

glen glen at pld-linux.org
Thu Aug 22 22:30:45 CEST 2013


commit 5c001b321d6ba34802dcce14eb16629774803102
Merge: 63333d2 7158118
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Aug 22 22:58:39 2013 +0300

    Merge branch 'dev-29': up to stable 29.0.1547.57

 chromium-browser.spec                           |  22 ++--
 chromium_useragent.patch.in                     |   6 +-
 clean-source.sh                                 |  40 ++++---
 disable_dlog_and_dcheck_in_release_builds.patch |  11 --
 get-source.sh                                   |   3 +-
 get-webkit_revision.patch                       |  26 -----
 harfbuzz-icu.patch                              |  44 --------
 nacl-no-untar.patch                             |  80 ++++---------
 nss.patch                                       |  30 -----
 sync-session-name.patch                         | 104 -----------------
 system-ffmpeg.patch                             | 142 +++++++++++++-----------
 11 files changed, 139 insertions(+), 369 deletions(-)
---
diff --cc chromium-browser.spec
index 393ed7d,9099330..a2ccfb5
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@@ -73,8 -73,8 +73,8 @@@ 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/beta/%{name}-%{branch}.%{basever}.tar.gz
 -# Source0-md5:	040b9e7d8ae75d20d63621aca84962bf
 +Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
- # Source0-md5:	040b9e7d8ae75d20d63621aca84962bf
++# Source0-md5:	fcdeb8cb650d64e326d4ae84ca491432
  %if "%{?patchver}" != ""
  Patch0:		http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
  # Patch0-md5:	120491e7e2df40182793081b7ea7e41a
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/5c001b321d6ba34802dcce14eb16629774803102



More information about the pld-cvs-commit mailing list