[packages/chromium-browser: 3/7] build with cleaned up source

glen glen at pld-linux.org
Tue Feb 25 18:09:43 CET 2014


commit f177fdadf4408a21b2b72f9582e27c11d0ed5e56
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Feb 24 23:20:02 2014 +0200

    build with cleaned up source

 chromium-browser.spec | 6 +++---
 get-source.sh         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index f99051a..5c083b5 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -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/dev/%{name}-%{branch}.%{basever}.tar.gz
-# Source0-md5:	1b273c1a80983ca7679a7031855a9b41
+Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
+# Source0-md5:	c14a4bcb8bed66ea2204cd698d938250
 %if "%{?patchver}" != ""
 Patch0:		http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 # Patch0-md5:	82e3012b5510187907bba50dadbe7137
@@ -312,7 +312,6 @@ ln -s %{SOURCE7} .
 %patch32 -p1
 %patch33 -p0
 
-exit 0
 sh -x clean-source.sh \
 	%{!?with_nacl:nacl=0} \
 	%{!?with_system_libvpx:libvpx=0} \
@@ -325,6 +324,7 @@ sh -x clean-source.sh \
 	%{!?with_system_v8:v8=0} \
 	%{!?with_system_libwebp:libwebp=0} \
 	%{!?with_system_zlib:zlib=0} \
+	%{!?with_system_ffmpeg:ffmpeg=0} \
 	%{nil}
 
 %build
diff --git a/get-source.sh b/get-source.sh
index 6168349..4418fe0 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -64,7 +64,7 @@ set -x
 
 	if [ "$CHANNEL" != "dev" ]; then
 		patch -p1 < $WORK_DIR/remove_bundled_libraries-stale.patch
-#		sh -x $WORK_DIR/clean-source.sh emptydirs=1 v8=0 mesa=0 sqlite=0 libwebp=0
+		sh -x $WORK_DIR/clean-source.sh emptydirs=1 v8=0 mesa=0 sqlite=0 libwebp=0 ffmpeg=0
 		patch -p1 -R < $WORK_DIR/remove_bundled_libraries-stale.patch
 	fi
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/71cdf0ef745837c5aedbd244f4c8e11884335e96



More information about the pld-cvs-commit mailing list