[patch] add speech use flag for speech-dispatcher

chromium_speech_dispatcher.patch (text/plain), 1.88 KB, created by fariouche on 2016-02-05 02:44:32 UTC

--- /usr/portage/www-client/chromium/chromium-48.0.2564.82.ebuild	2016-02-04 19:52:55.000000000 +0100
+++ chromium-48.0.2564.82.ebuild	2016-02-05 03:34:51.354222408 +0100
@@ -19,7 +19,7 @@
 LICENSE="BSD hotwording? ( no-source-code )"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE="cups gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
+IUSE="speech cups gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
 REQUIRED_USE="gn? ( kerberos !system-ffmpeg )"
@@ -73,7 +73,7 @@
 	x11-libs/pango:=
 	kerberos? ( virtual/krb5 )
 	!gn? (
-		>=app-accessibility/speech-dispatcher-0.8:=
+		speech? ( >=app-accessibility/speech-dispatcher-0.8:= )
 		app-arch/snappy:=
 		>=dev-libs/icu-55.1:=
 		>=dev-libs/libevent-1.4.13:=
@@ -220,7 +220,6 @@
 			third_party/markupsafe
 			third_party/re2
 			third_party/snappy
-			third_party/speech-dispatcher
 			third_party/usb_ids
 			third_party/xdg-utils
 			third_party/yasm
@@ -228,6 +227,10 @@
 		"
 	fi
 
+	if ! use speech; then
+	    conditional_bundled_libraries+=" third_party/speech-dispatcher"
+	fi
+
 	# Remove most bundled libraries. Some are still needed.
 	build/linux/unbundle/remove_bundled_libraries.py \
 		${conditional_bundled_libraries} \
@@ -410,9 +413,12 @@
 	# This makes breakages easier to detect by revdep-rebuild.
 	myconf_gyp+="
 		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
+		-Dlinux_link_libpci=1"
+	if use speech; then
+	    myconf_gyp+="
+		    -Dlinux_link_libspeechd=1
+		    -Dlibspeechd_h_prefix=speech-dispatcher/"
+	fi
 
 	# TODO: use the file at run time instead of effectively compiling it in.
 	myconf_gyp+="