[packages/chromium-browser/DEVEL] prepare system protobuf bcond. should work in 25.x branch

[glen]

commit 75a27c2e99bf6a5396bed4dc3703af1b981e7026
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Jan 5 14:35:32 2013 +0200

    prepare system protobuf bcond. should work in 25.x branch

 chromium-browser.spec | 10 +++++++++-
 clean-source.sh       |  1 +
 get-source.sh         |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 5ba2914..7ceb0cf 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -22,6 +22,7 @@
 %bcond_without	system_libxnvctrl	# system libxnvctrl
 %bcond_without	system_minizip	# system minizip
 %bcond_without	system_opus		# system opus codec support, http://www.opus-codec.org/examples/
+%bcond_with		system_protobuf	# system protobuf
 %bcond_without	system_speex	# system speex
 %bcond_with		system_sqlite	# system sqlite
 %bcond_without	system_srtp		# system srtp (can be used if using bundled libjingle)
@@ -153,6 +154,7 @@ BuildRequires:	pam-devel
 BuildRequires:	pango-devel
 BuildRequires:	perl-modules
 BuildRequires:	pkgconfig
+%{?with_system_protobuf:BuildRequires:	protobuf-devel}
 %{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
 BuildRequires:	python
 #BuildRequires:	python-gyp >= 1-%{gyp_rev}
@@ -289,7 +291,12 @@ cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
 }
 EOF
 
-sh -x clean-source.sh %{!?with_system_v8:v8=0} %{!?with_nacl:nacl=0} %{!?with_system_zlib:zlib=0}
+sh -x clean-source.sh \
+	%{!?with_nacl:nacl=0} \
+	%{!?with_system_protobuf:protobuf=0} \
+	%{!?with_system_v8:v8=0} \
+	%{!?with_system_zlib:zlib=0} \
+	%{nil}
 
 %build
 cd src
@@ -375,6 +382,7 @@ test -e Makefile || %{__python} build/gyp_chromium \
 	%{gyp_with system_libxnvctrl} \
 	%{gyp_with system_minizip} \
 	%{gyp_with system_opus} \
+	%{gyp_with system_protobuf} \
 	%{gyp_with system_speex} \
 	%{gyp_with system_sqlite} \
 	%{gyp_with system_v8} \
diff --git a/clean-source.sh b/clean-source.sh
index 93d093a..92c3e5d 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -657,6 +657,7 @@ strip_system_dirs \
 	third_party/libxml_ \
 	third_party/libxslt \
 	third_party/opus \
+	third_party/protobuf \
 	third_party/speex \
 	third_party/yasm \
 	third_party/zlib \
diff --git a/get-source.sh b/get-source.sh
index 740aae8..67a62f3 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -71,7 +71,7 @@ else
 	v8=0
 fi
 
-sh -x $WORK_DIR/clean-source.sh v8=$v8
+sh -x $WORK_DIR/clean-source.sh v8=$v8 protobuf=0
 
 # do not keep REMOVED*.txt in tarball. they are visible in .log anyway
 rm -vf REMOVED-*.txt
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/8ca2ff1d9250a6c126111bca40e1a084af97cd9f