From 25419e25ba471c1ad973c43496b64712dc852ec96da096e17869946a62c9968b Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Wed, 5 Jun 2019 12:47:58 +0000 Subject: [PATCH] Accepting request 707835 from home:namtrac:branches:games:tools - Add add-speechd-include-path.patch to fix speechd include paths - Enable speechd everywhere now OBS-URL: https://build.opensuse.org/request/show/707835 OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=103 --- add-speechd-include-path.patch | 12 ++++++++++++ mumble.changes | 6 ++++++ mumble.spec | 13 +++---------- 3 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 add-speechd-include-path.patch diff --git a/add-speechd-include-path.patch b/add-speechd-include-path.patch new file mode 100644 index 0000000..9b136be --- /dev/null +++ b/add-speechd-include-path.patch @@ -0,0 +1,12 @@ +Index: mumble-1.2.19/src/mumble/mumble.pro +=================================================================== +--- mumble-1.2.19.orig/src/mumble/mumble.pro ++++ mumble-1.2.19/src/mumble/mumble.pro +@@ -224,6 +224,7 @@ unix { + + !CONFIG(no-speechd) { + CONFIG *= speechd ++ INCLUDEPATH *= /usr/include/speech-dispatcher + } + } + } diff --git a/mumble.changes b/mumble.changes index bbfa725..7136f0c 100644 --- a/mumble.changes +++ b/mumble.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 5 12:16:31 UTC 2019 - Ismail Dönmez + +- Add add-speechd-include-path.patch to fix speechd include paths +- Enable speechd everywhere now + ------------------------------------------------------------------- Sun Apr 14 15:34:43 UTC 2019 - Christian Boltz diff --git a/mumble.spec b/mumble.spec index b6f3cda..96884d1 100644 --- a/mumble.spec +++ b/mumble.spec @@ -34,11 +34,6 @@ %bcond_with systemd %else %bcond_without systemd -%if 0%{?sles_version} -%bcond_with speechd -%else -%bcond_without speechd -%endif %endif %bcond_with mumble11x %bcond_without bonjour @@ -70,6 +65,7 @@ Patch2: appdata.patch # PATCH-FIX-UPSTREAM initialize-soundfile-format.patch -- Initialize a variable so it's not used uninitialized Patch3: initialize-soundfile-format.patch Patch4: 0001-AudioOutput-do-not-use-non-existant-template-version.patch +Patch5: add-speechd-include-path.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else @@ -131,9 +127,7 @@ BuildRequires: qt4-linguist %if %{with pulseaudio} BuildRequires: pulseaudio-devel %endif -%if %{with speechd} BuildRequires: libspeechd-devel -%endif %if 0%{!?snapshot:1} Source: https://github.com/mumble-voip/mumble/releases/download/%{version}/%{name}-%{version}.tar.gz Source1: https://github.com/mumble-voip/mumble/releases/download/%{version}/%{name}-%{version}.tar.gz.sig @@ -194,6 +188,8 @@ won't be audible to other players. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 + %if !%{with system_celt} %if 0%{?snapshot:1} tar -xzf %{SOURCE50} @@ -251,9 +247,6 @@ qmake \ %endif CONFIG*=no-g15 \ CONFIG*=no-embed-qt-translations \ -%if !%{with speechd} - CONFIG*=no-speechd \ -%endif %if !%{with ice} CONFIG*=no-ice \ %endif