packages: chromium-browser/chromium-browser.spec - up to 6.0.434.0~svn20100...

[arekm]

Author: arekm                        Date: Sun Jun 13 07:47:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 6.0.434.0~svn20100613r49638; remove bundled libraries (we use system one) in case when some haders are used from bundled libs

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.64 packages/chromium-browser/chromium-browser.spec:1.65
--- packages/chromium-browser/chromium-browser.spec:1.64	Thu Jun 10 21:42:38 2010
+++ packages/chromium-browser/chromium-browser.spec	Sun Jun 13 09:47:01 2010
@@ -22,18 +22,18 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%define		svndate 20100610
-%define		svnver  49356
+%define		svndate 20100613
+%define		svnver  49638
 %define		rel		1
 
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
-Version:	6.0.431.0
+Version:	6.0.434.0
 Release:	%{svnver}.%{rel}
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
 Source0:	http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
-# Source0-md5:	050c8db52b2e261a55fcca86ec56bebb
+# Source0-md5:	bfc9f9fe855660c6ee28b1e46d352f32
 Source2:	%{name}.sh
 Source3:	%{name}.desktop
 Source4:	find-lang.sh
@@ -166,6 +166,25 @@
 %patch5 -p1
 %patch11 -p1
 
+# drop bundled libs, from gentoo
+remove_bundled_lib() {
+        echo "Removing bundled library $1 ..."
+        local out
+        out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)"
+        if [ -z "$out" ]; then
+                echo "no files matched when removing bundled library $1" >&2 && exit 1
+        fi
+}
+
+cd src
+remove_bundled_lib "third_party/bzip2"
+remove_bundled_lib "third_party/libevent"
+remove_bundled_lib "third_party/libjpeg"
+remove_bundled_lib "third_party/libpng"
+remove_bundled_lib "third_party/libxml"
+remove_bundled_lib "third_party/libxslt"
+# TODO: also remove third_party/zlib.
+
 %build
 cd src
 %{__python} build/gyp_chromium --format=make build/all.gyp \
@@ -298,6 +317,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2010/06/13 07:47:01  arekm
+- up to 6.0.434.0~svn20100613r49638; remove bundled libraries (we use system one) in case when some haders are used from bundled libs
+
 Revision 1.64  2010/06/10 19:42:38  arekm
 - up to 6.0.431.0-49356
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.64&r2=1.65&f=u