[arch-commits] Commit in chromium/repos (3 files)

Pierre Schmitz pierre at archlinux.org
Thu Jan 21 19:29:03 EST 2010


    Date: Thursday, January 21, 2010 @ 19:29:03
  Author: pierre
Revision: 64715

Merged revisions 64713 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/chromium/trunk

........
  r64713 | pierre | 2010-01-22 01:24:37 +0100 (Fr, 22 Jan 2010) | 2 lines
  
  upgpkg: chromium 4.0.249.78-1
      new beta snapshot; cleanup
........

Added:
  chromium/repos/testing-x86_64/createSource
    (from rev 64713, chromium/trunk/createSource)
Modified:
  chromium/repos/testing-x86_64/	(properties)
  chromium/repos/testing-x86_64/PKGBUILD

--------------+
 PKGBUILD     |   94 +++++++++++++--------------------------------------------
 createSource |   53 ++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 72 deletions(-)


Property changes on: chromium/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /chromium/trunk:1-63737
   + /chromium/trunk:1-64714

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2010-01-22 00:25:13 UTC (rev 64714)
+++ testing-x86_64/PKGBUILD	2010-01-22 00:29:03 UTC (rev 64715)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=chromium
-pkgver=4.0.249.64
-pkgrel=2
+pkgver=4.0.249.78
+pkgrel=1
 pkgdesc='An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web'
 arch=('i686' 'x86_64')
 url='http://www.chromium.org/'
@@ -18,7 +18,7 @@
 source=("ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz"
         'chromium.desktop' 'chromium.sh'
         'drop_sse2.patch' 'ffmpeg_branding_mime.patch' 'libpng-1.4.patch')
-md5sums=('04c397ba565e64c592bc5d3034576c6c'
+md5sums=('15d2cdc31d1c41eebf02eab3323dab3c'
          '897de25e9c25a01f8b1b67abe554a6b7'
          '93cd6f5f53b15546dc9d3de49118534c'
          'ddc1d741d50e8d46765a6b76e8faad32'
@@ -44,11 +44,9 @@
 		werror="
 
 	patch -p0 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1
-
 	# i686 does not include SSE2
 	# see http://code.google.com/p/chromium/issues/detail?id=9007
 	patch -p0 -i ${srcdir}/drop_sse2.patch || return 1
-
 	patch -p0 -i ${srcdir}/libpng-1.4.patch || return 1
 
 	export PATH=./depot_tools/:$PATH
@@ -61,78 +59,30 @@
 package() {
 	cd ${srcdir}/chromium-${pkgver}
 
-	install -m 0755 -D src/out/Release/chrome				${pkgdir}/usr/lib/chromium/chromium
-	install -m 4555 -o root -g root -D src/out/Release/chrome_sandbox	${pkgdir}/usr/lib/chromium/chromium-sandbox
-	install -m 0644 -D src/out/Release/chrome.pak				${pkgdir}/usr/lib/chromium/chrome.pak
-	install -m 0644 -D src/out/Release/libffmpegsumo.so			${pkgdir}/usr/lib/chromium/libffmpegsumo.so
-
-	cp -a src/out/Release/locales src/out/Release/resources			${pkgdir}/usr/lib/chromium/
+	install -m 0755 -D src/out/Release/chrome \
+		${pkgdir}/usr/lib/chromium/chromium
+	install -m 4555 -o root -g root -D src/out/Release/chrome_sandbox \
+		${pkgdir}/usr/lib/chromium/chromium-sandbox
+	install -m 0644 -D src/out/Release/chrome.pak \
+		${pkgdir}/usr/lib/chromium/chrome.pak
+	install -m 0644 -D src/out/Release/libffmpegsumo.so \
+		${pkgdir}/usr/lib/chromium/libffmpegsumo.so
+	cp -a src/out/Release/locales src/out/Release/resources \
+		${pkgdir}/usr/lib/chromium/
 	find ${pkgdir}/usr/lib/chromium/ -name '*.d' -type f -delete
+	install -m 0644 -D src/out/Release/chrome.1 \
+		${pkgdir}/usr/share/man/man1/chromium.1
 
-	install -m 0644 -D src/out/Release/chrome.1				${pkgdir}/usr/share/man/man1/chromium.1
-
-	install -m 0644 -D ${srcdir}/chromium.desktop				${pkgdir}/usr/share/applications/chromium.desktop
+	install -m 0644 -D ${srcdir}/chromium.desktop \
+		${pkgdir}/usr/share/applications/chromium.desktop
 	for size in 16 32 48 256; do
 		install -m 0644 -D \
 			src/chrome/app/theme/chromium/product_logo_${size}.png \
-										${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
+			${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
 	done
-	install -m 0755 -D ${srcdir}/chromium.sh				${pkgdir}/usr/bin/chromium
+	install -m 0755 -D ${srcdir}/chromium.sh \
+		${pkgdir}/usr/bin/chromium
 
-	install -m 0644 -D src/LICENSE						${pkgdir}/usr/share/licenses/chromium/LICENSE
+	install -m 0644 -D src/LICENSE \
+		${pkgdir}/usr/share/licenses/chromium/LICENSE
 }
-
-# create source tar
-# 1) adjust pkgver
-# 2) . PKGBUILD
-# 3) _source
-_source() {
-	# see http://src.chromium.org/svn/trunk/src/tools/export_tarball/export_tarball.py
-	local _nonessential_dirs=(
-		'src/chrome/test/data'
-		'src/chrome/tools/test/reference_build'
-		'src/gears/binaries'
-		'src/net/data/cache_tests'
-		'src/o3d/documentation'
-		'src/o3d/samples'
-		'src/third_party/lighttpd'
-		'src/third_party/WebKit/LayoutTests'
-		'src/webkit/data/layout_tests'
-		'src/webkit/tools/test/reference_build'
-	)
-
-	local _current=$(pwd)
-	local _tmp=$(mktemp -d)
-	mkdir -p $_tmp/chromium-$pkgver
-	cd $_tmp/chromium-$pkgver
-
-	svn co -r34500 http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools
-
-	export PATH=./depot_tools/:$PATH
-	gclient.py config http://src.chromium.org/svn/releases/$pkgver
-	sed -e '15i\      "src/third_party/WebKit/LayoutTests": None,' \
-	    -e '15i\      "src/chrome/tools/test/reference_build": None,' \
-	    -e '15i\      "src/third_party/ffmpeg/binaries/chromium/linux/ia32": None,' \
-	    -e '15i\      "src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg": None,' \
-	    -e '15i\      "src/third_party/ffmpeg/binaries/chromium/linux/x64": None,' \
-	    -e '15i\      "src/third_party/ffmpeg/binaries/chromium/linux/x64_dbg": None,' \
-	    -i .gclient
-	gclient.py sync --force --nohooks
-
-	svnversion src > src/build/LASTCHANGE.in
-
-	for i in ${_nonessential_dirs[@]}; do
-		rm -rf $i
-	done
-	find . -name '.svn' -type d -exec rm -rf {} \;
-	find . -iname '*.dll' -delete
-	find . -iname '*.exe' -delete
-	find . -iname '*.o' -delete
-	find . -iname '*.nexe' -delete
-
-	cd ..
-	bsdtar cvJf $_current/chromium-$pkgver.tar.xz chromium-$pkgver
-	cd $_current
-
-	rm -rf $_tmp
-}

Copied: chromium/repos/testing-x86_64/createSource (from rev 64713, chromium/trunk/createSource)
===================================================================
--- testing-x86_64/createSource	                        (rev 0)
+++ testing-x86_64/createSource	2010-01-22 00:29:03 UTC (rev 64715)
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+. PKGBUILD
+
+# see http://src.chromium.org/svn/trunk/src/tools/export_tarball/export_tarball.py
+nonessential_dirs=(
+	'src/chrome/test/data'
+	'src/chrome/tools/test/reference_build'
+	'src/gears/binaries'
+	'src/net/data/cache_tests'
+	'src/o3d/documentation'
+	'src/o3d/samples'
+	'src/third_party/lighttpd'
+	'src/third_party/WebKit/LayoutTests'
+	'src/webkit/data/layout_tests'
+	'src/webkit/tools/test/reference_build'
+)
+
+current=$(pwd)
+tmp=$(mktemp -d)
+mkdir -p $tmp/chromium-$pkgver
+cd $tmp/chromium-$pkgver
+
+svn co -r34500 http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools
+
+export PATH=./depot_tools/:$PATH
+gclient.py config http://src.chromium.org/svn/releases/$pkgver
+sed -e '15i\      "src/third_party/WebKit/LayoutTests": None,' \
+    -e '15i\      "src/chrome/tools/test/reference_build": None,' \
+    -e '15i\      "src/third_party/ffmpeg/binaries/chromium/linux/ia32": None,' \
+    -e '15i\      "src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg": None,' \
+    -e '15i\      "src/third_party/ffmpeg/binaries/chromium/linux/x64": None,' \
+    -e '15i\      "src/third_party/ffmpeg/binaries/chromium/linux/x64_dbg": None,' \
+    -i .gclient
+gclient.py sync --force --nohooks
+
+svnversion src > src/build/LASTCHANGE.in
+
+for i in ${nonessential_dirs[@]}; do
+	rm -rf $i
+done
+
+find . -name '.svn' -type d -exec rm -rf {} \;
+find . -iname '*.dll' -delete
+find . -iname '*.exe' -delete
+find . -iname '*.o' -delete
+find . -iname '*.nexe' -delete
+
+cd ..
+bsdtar cvJf $current/chromium-$pkgver.tar.xz chromium-$pkgver
+cd $current
+
+rm -rf $tmp



More information about the arch-commits mailing list