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
This commit is contained in:
Ferdinand Thiessen 2019-06-05 12:47:58 +00:00 committed by Git OBS Bridge
parent 69de0489af
commit 25419e25ba
3 changed files with 21 additions and 10 deletions

View File

@ -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
}
}
}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 5 12:16:31 UTC 2019 - Ismail Dönmez <idonmez@suse.com>
- 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 <suse-beta@cboltz.de> Sun Apr 14 15:34:43 UTC 2019 - Christian Boltz <suse-beta@cboltz.de>

View File

@ -34,11 +34,6 @@
%bcond_with systemd %bcond_with systemd
%else %else
%bcond_without systemd %bcond_without systemd
%if 0%{?sles_version}
%bcond_with speechd
%else
%bcond_without speechd
%endif
%endif %endif
%bcond_with mumble11x %bcond_with mumble11x
%bcond_without bonjour %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 # PATCH-FIX-UPSTREAM initialize-soundfile-format.patch -- Initialize a variable so it's not used uninitialized
Patch3: initialize-soundfile-format.patch Patch3: initialize-soundfile-format.patch
Patch4: 0001-AudioOutput-do-not-use-non-existant-template-version.patch Patch4: 0001-AudioOutput-do-not-use-non-existant-template-version.patch
Patch5: add-speechd-include-path.patch
%if 0%{?suse_version} > 1325 %if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel BuildRequires: libboost_headers-devel
%else %else
@ -131,9 +127,7 @@ BuildRequires: qt4-linguist
%if %{with pulseaudio} %if %{with pulseaudio}
BuildRequires: pulseaudio-devel BuildRequires: pulseaudio-devel
%endif %endif
%if %{with speechd}
BuildRequires: libspeechd-devel BuildRequires: libspeechd-devel
%endif
%if 0%{!?snapshot:1} %if 0%{!?snapshot:1}
Source: https://github.com/mumble-voip/mumble/releases/download/%{version}/%{name}-%{version}.tar.gz 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 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 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%if !%{with system_celt} %if !%{with system_celt}
%if 0%{?snapshot:1} %if 0%{?snapshot:1}
tar -xzf %{SOURCE50} tar -xzf %{SOURCE50}
@ -251,9 +247,6 @@ qmake \
%endif %endif
CONFIG*=no-g15 \ CONFIG*=no-g15 \
CONFIG*=no-embed-qt-translations \ CONFIG*=no-embed-qt-translations \
%if !%{with speechd}
CONFIG*=no-speechd \
%endif
%if !%{with ice} %if !%{with ice}
CONFIG*=no-ice \ CONFIG*=no-ice \
%endif %endif