[packages/chromium-browser/DEVEL] use speech-dispatcher-devel >= 0.8, it has restructured its include files

glen glen at pld-linux.org
Mon Mar 4 15:19:27 CET 2013


commit eda1bb04eca621dcc35bb5661c2257f7416a95eb
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Mar 4 16:17:11 2013 +0200

    use speech-dispatcher-devel >= 0.8, it has restructured its include files

 chromium-browser.spec |  7 ++++---
 speechd-0.8.patch     | 11 +++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 7beea7e..4c980d4 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -44,7 +44,6 @@
 
 # TODO
 # - find system deps: find -type f -name '*.gyp*' | xargs grep -oh 'use_system_.*%' | sort -u
-# - use_system_icu
 # - use_system_skia
 # - use_system_ssl (use_openssl: http://crbug.com/62803)
 # - use_system_stlport (android specific)
@@ -75,7 +74,7 @@ Version:	%{branch}.%{patchver}
 %else
 Version:	%{branch}.%{basever}
 %endif
-Release:	0.29
+Release:	0.31
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
 Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{branch}.%{basever}.tar.gz
@@ -114,6 +113,7 @@ Patch25:	gnome3-volume-control.patch
 Patch26:	master-prefs-path.patch
 Patch27:	tcmalloc-glibc2.16.patch
 Patch28:	system-mesa.patch
+Patch29:	speechd-0.8.patch
 URL:		http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:	GConf2-devel}
 %{?with_system_mesa:BuildRequires:	Mesa-libGL-devel}
@@ -178,7 +178,7 @@ BuildRequires:	python-ply
 %{?with_system_re2:BuildRequires:	re2-devel}
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.453
-BuildRequires:	speech-dispatcher-devel
+BuildRequires:	speech-dispatcher-devel >= 0.8
 %{?with_system_speex:BuildRequires:	speex-devel >= 1:1.2-rc1}
 BuildRequires:	sqlite3-devel >= 3.6.1
 %{?with_system_libsrtp:BuildRequires:	srtp-devel >= 1.4.4}
@@ -298,6 +298,7 @@ cd ..
 %patch24 -p1
 %patch26 -p1
 %patch28 -p1
+%patch29 -p1
 
 cd src
 
diff --git a/speechd-0.8.patch b/speechd-0.8.patch
new file mode 100644
index 0000000..c2e11e6
--- /dev/null
+++ b/speechd-0.8.patch
@@ -0,0 +1,11 @@
+--- chromium-browser-26.0.1410.19/src/build/linux/system.gyp~	2013-03-04 00:04:06.000000000 +0200
++++ chromium-browser-26.0.1410.19/src/build/linux/system.gyp	2013-03-04 13:45:31.822101677 +0200
+@@ -494,7 +494,7 @@
+                      '--name', 'LibSpeechdLoader',
+                      '--output-h', '<(output_h)',
+                      '--output-cc', '<(output_cc)',
+-                     '--header', '<libspeechd.h>',
++                     '--header', '<speech-dispatcher/libspeechd.h>',
+                      '--link-directly=<(linux_link_libspeechd)',
+                      'spd_open',
+                      'spd_say',
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list