[packages/chromium-browser/stable-26: 35/35] merge update to stable 26.0.1410.43

glen glen at pld-linux.org
Wed Mar 27 11:23:01 CET 2013 

commit 9d8fb756bde43460e51ba3338e865d39aa73f4f3
Merge: e920d86 b2c4ae3
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Mar 27 12:19:01 2013 +0200

    merge update to stable 26.0.1410.43

 chromium-browser.spec       | 137 ++++++++++++------------
 clean-source.sh             |  55 ++++++----
 get-source.sh               | 137 +++++++++++-------------
 gnome3-volume-control.patch |  24 ++---
 master-prefs-path.patch     |  14 ++-
 nacl-no-untar.patch         |   4 +-
 no-pnacl.patch              |  31 ------
 speechd-0.8.patch           |  11 ++
 system-ffmpeg.patch         | 196 +++++++++++++++++++++++++++++++----
 system-jsoncpp.patch        | 118 +++------------------
 system-libpng.patch         |  11 --
 system-mesa.patch           | 247 ++++++++++++++++++++++++++++++++++++++++++++
 system-opus.patch           |  26 -----
 update-source.sh            |  23 +++--
 14 files changed, 655 insertions(+), 379 deletions(-)
---
diff --cc chromium-browser.spec
index b80402b,c0b8c73..4e462a6
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@@ -56,9 -63,9 +63,9 @@@
  # http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf
  # http://carme.pld-linux.org/~glen/chromium-browser/th/i686/chromium-nightly.conf
  
- %define		branch		25.0.1364
- %define		basever		97
- %define		patchver	172
+ %define		branch		26.0.1410
 -%define		basever		40
++%define		basever		43
+ #define		patchver	70
  %define		gyp_rev	1014
  Summary:	A WebKit powered web browser
  Name:		chromium-browser
@@@ -67,14 -74,14 +74,14 @@@ Version:	%{branch}.%{patchver
  %else
  Version:	%{branch}.%{basever}
  %endif
 -Release:	0.35
 +Release:	1
  License:	BSD, 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:	e42f86208205701bd23b34ba963e7d83
 +Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
- # Source0-md5:	d005fc9e50c28a2e3c71eee7310417f4
++# Source0-md5:	eafd6a919faadc8a7446cd673f460c4c
  %if "%{?patchver}" != ""
  Patch0:		http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 -# Patch0-md5:	37675cd75c578d26d6210259877f3947
 +# Patch0-md5:	7e2f26d76ca6241961276a328a9230cf
  %endif
  Source1:	%{name}.default
  Source2:	%{name}.sh
diff --cc get-source.sh
index 5fa6fe9,daeb5ea..e4a3ec3
--- a/get-source.sh
+++ b/get-source.sh
@@@ -33,96 -36,87 +36,82 @@@ f
  
  set -x
  
- # consider lockfile stale after 3h
- if ! lockfile -l 10800 $LOCKFILE; then
- 	exit 1
- fi
- 
- trap "rm -f $LOCKFILE" EXIT
+ (
+ 	flock -n 9 || { echo "$PROGRAM: locked"; exit 1; }
  
- TMP_DIR=$(mktemp -d $WORK_DIR/$PACKAGE_NAME-$CHANNEL-$VERSION-_XXXXXX)
- LOGFILE=$TMP_DIR/$PACKAGE_NAME-$VERSION.log
+ 	TMP_DIR=$(mktemp -d $WORK_DIR/$PACKAGE_NAME-$CHANNEL-$VERSION-_XXXXXX)
+ 	LOGFILE=$TMP_DIR/$PACKAGE_NAME-$VERSION.log
  
- (
- cd "$TMP_DIR"
- srctarball=$PACKAGE_NAME-$VERSION.tar.bz2
- if [ "$CHANNEL" = "dev" ]; then
- 	wget -c -nv -O $srctarball "$OFFICIAL_URL/chromium-$VERSION.tar.bz2"
- else
- 	wget -c -nv -O $srctarball "$OFFICIAL_URL/chromium-$VERSION.tar.bz2"
- fi
+ 	(
+ 	cd "$TMP_DIR"
 -	if [ "$CHANNEL" != "stable" ]; then
 -		srctarball=$PACKAGE_NAME-$VERSION.tar.xz
 -		wget -c -nv -O $srctarball "$OFFICIAL_URL/chromium-$VERSION.tar.xz"
 -	else
 -		srctarball=$PACKAGE_NAME-$VERSION.tar.bz2
 -		wget -c -nv -O $srctarball "$OFFICIAL_URL/chromium-$VERSION.tar.bz2"
 -	fi
++	srctarball=$PACKAGE_NAME-$VERSION.tar.xz
++	wget -c -nv -O $srctarball "$OFFICIAL_URL/chromium-$VERSION.tar.xz"
  
- # repackage cleaned up tarball
- test -d $PACKAGE_NAME-$VERSION || {
- 	tar xjvf $srctarball
- 	install -d $PACKAGE_NAME-$VERSION
- 	# relocate to src dir (needed to workaround some gyp bug)
- 	mv chromium-$VERSION $PACKAGE_NAME-$VERSION/src
- }
+ 	# repackage cleaned up tarball
+ 	test -d $PACKAGE_NAME-$VERSION || {
+ 		tar xvf $srctarball
+ 		mv chromium-$VERSION $PACKAGE_NAME-$VERSION
+ 	}
  
- ls -lh $srctarball
- rm $srctarball
+ 	ls -lh $srctarball
+ 	rm $srctarball
  
- cd $PACKAGE_NAME-$VERSION/src
- du -sh .
+ 	cd $PACKAGE_NAME-$VERSION
+ 	du -sh .
  
- awk 'NR=1 {print $NF; exit}' v8/ChangeLog | tee -a v8.txt
+ 	awk 'NR=1 {print $NF; exit}' v8/ChangeLog | tee -a v8.txt
  
- # keep v8 in sources if branch is not stable
- if [ "$CHANNEL" = "stable" ]; then
- 	v8=0
- else
- 	v8=0
- fi
+ 	if [ "$CHANNEL" != "dev" ]; then
+ 		sh -x $WORK_DIR/clean-source.sh emptydirs=1 v8=0 libvpx=0 mesa=0 re2=0
+ 	fi
  
- if [ "$CHANNEL" != "dev" ]; then
- 	sh -x $WORK_DIR/clean-source.sh v8=$v8 emptydirs=1
- fi
+ 	# do not keep REMOVED*.txt in tarball. they are visible in .log anyway
+ 	rm -vf REMOVED-*.txt
  
- # do not keep REMOVED*.txt in tarball. they are visible in .log anyway
- rm -vf REMOVED-*.txt
+ 	du -sh .
  
- du -sh .
+ 	# add LASTCHANGE info, take "branch_revision" item
+ 	svnver=$(wget -qO - "$CHANNELS_URL?os=linux&channel=$CHANNEL" | awk -F, 'NR > 1{print $8}')
+ 	echo "$svnver" > build/LASTCHANGE.in
  
- # add LASTCHANGE info, take "branch_revision" item
- svnver=$(wget -qO - "$CHANNELS_URL?os=linux&channel=$CHANNEL" | awk -F, 'NR > 1{print $8}')
- echo "$svnver" > build/LASTCHANGE.in
+ 	cd ..
  
- cd ../..
+ 	tarball=$PACKAGE_NAME-$VERSION.tar.$EXT
+ 	# xz -9 OOM's on carme
+ 	XZ_OPT=-e8 tar -caf $tarball $PACKAGE_NAME-$VERSION
+ 	ls -lh $tarball
  
- tarball=$PACKAGE_NAME-$VERSION.tar.$EXT
- # xz -9 OOM's on carme
- XZ_OPT=-e8 tar -caf $tarball $PACKAGE_NAME-$VERSION
- ls -lh $tarball
+ 	rm -rf $PACKAGE_NAME-$VERSION
  
- rm -rf $PACKAGE_NAME-$VERSION
+ 	chmod 644 $tarball
+ 	mv $tarball $DIST_DIR
  
- chmod 644 $tarball
- mv $tarball $DIST_DIR
+ 	) > $LOGFILE 2>&1
  
- ) > $LOGFILE 2>&1
+ 	chmod 644 $LOGFILE
+ 	mv $LOGFILE $DIST_DIR
  
- chmod 644 $LOGFILE
- mv $LOGFILE $DIST_DIR
+ 	rm -rf $TMP_DIR
  
- rm -rf $TMP_DIR
+ 	# create diff patches
+ 	BASEVER=${VERSION%.*}.0
+ 	if [ -e $DIST_DIR/$PACKAGE_NAME-$BASEVER.tar.$EXT ]; then
+ 		base=$(readlink -f $DIST_DIR/$PACKAGE_NAME-$BASEVER.tar.$EXT)
+ 		current=$DIST_DIR/$PACKAGE_NAME-$VERSION.tar.$EXT
+ 		sh -x $WORK_DIR/make-diff-patch.sh $base $current
+ 		mv $PACKAGE_NAME-$VERSION.patch.xz $DIST_DIR
+ 		# for beta and dev channels, move the diff pointer
+ 		if [ "$CHANNEL" != "stable" ]; then
+ 			ln -sf $PACKAGE_NAME-$VERSION.tar.$EXT $DIST_DIR/$PACKAGE_NAME-$BASEVER.tar.$EXT
+ 		fi
+ 	fi
  
- # create diff patches
- BASEVER=${VERSION%.*}.0
- if [ -e $DIST_DIR/$PACKAGE_NAME-$BASEVER.tar.$EXT ]; then
- 	base=$(readlink -f $DIST_DIR/$PACKAGE_NAME-$BASEVER.tar.$EXT)
- 	current=$DIST_DIR/$PACKAGE_NAME-$VERSION.tar.$EXT
- 	sh -x $WORK_DIR/make-diff-patch.sh $base $current
- 	mv $PACKAGE_NAME-$VERSION.patch.xz $DIST_DIR
- 	# for beta and dev channels, move the diff pointer
- 	if [ "$CHANNEL" != "stable" ]; then
- 		ln -sf $PACKAGE_NAME-$VERSION.tar.$EXT $DIST_DIR/$PACKAGE_NAME-$BASEVER.tar.$EXT
+ 	# try updating spec and build it as well
+ 	if [ -x $WORK_DIR/update-source.sh ]; then
+ 		build_package=${build_package-1} \
+ 		publish_packages=${publish_packages-1} \
+ 		sh -x $WORK_DIR/update-source.sh
  	fi
- fi
  
- # try updating spec and build it as well
- if [ -x $WORK_DIR/update-source.sh ]; then
- 	build_package=1 \
- 	publish_packages=1 \
- 	sh -x $WORK_DIR/update-source.sh
- fi
+ 	rm $LOCKFILE
+ ) 9>$LOCKFILE
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/9d8fb756bde43460e51ba3338e865d39aa73f4f3

More information about the pld-cvs-commit mailing list