[packages/chromium-browser] disable system zlib disabled because of mixed-source.patch

glen glen at pld-linux.org
Wed Sep 26 18:53:11 CEST 2012


commit 4c272135a42a598140f8067ac77dc1282b22c189
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Sep 26 19:50:53 2012 +0300

    disable system zlib disabled because of mixed-source.patch
    
    https://code.google.com/p/chromium/issues/detail?id=143623

 chromium-browser.spec | 6 ++++--
 get-source.sh         | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 7465ef1..a6aa97f 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -20,7 +20,9 @@
 %bcond_with		system_v8		# with system v8
 %bcond_without	system_vpx		# with system vpx
 %bcond_without	system_yasm		# with system yasm
-%bcond_without	system_zlib		# with system zlib
+# system zlib disabled because of mixed-source.patch
+# https://code.google.com/p/chromium/issues/detail?id=143623
+%bcond_with		system_zlib		# with system zlib
 %bcond_without	libjpegturbo	# use libjpeg-turbo features
 %bcond_with		verbose			# verbose build (V=1)
 
@@ -231,7 +233,7 @@ cd src
 cd ..
 
 cd src
-sh -x clean-source.sh %{!?with_system_v8:v8=0} %{!?with_nacl:nacl=0} libxml=0
+sh -x clean-source.sh %{!?with_system_v8:v8=0} %{!?with_nacl:nacl=0} libxml=0 %{!?with_system_zlib:zlib=0}
 
 %build
 cd src
diff --git a/get-source.sh b/get-source.sh
index fbc3b69..fc72188 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -60,7 +60,7 @@ else
 	v8=0
 fi
 
-sh -x $WORK_DIR/clean-source.sh v8=$v8 libxml=0
+sh -x $WORK_DIR/clean-source.sh v8=$v8 libxml=0 zlib=0
 du -sh .
 
 # add LASTCHANGE info, take "branch_revision" item
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/038f76b9c9b2dd5d37005c12cfc1d7115a0a0382



More information about the pld-cvs-commit mailing list