pool/twinkle
SHA256
20
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 337181 from network:telephony

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/337181
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/twinkle?expand=0&rev=37
This commit is contained in:
Stephan Kulow
2015-10-12 08:02:08 +00:00
committed by Git OBS Bridge
parent 3509752f0d 7444122b1c
commit 6cd6ba2605
3 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
twinkle.changes
+7
View File
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Oct 8 08:19:36 UTC 2015 - mpluskal@suse.com
- Use cmake macro
- Add twinkle-no-return-in-nonvoid-function.patch
- Use desktop file macros
-------------------------------------------------------------------
Tue Sep 29 07:43:31 UTC 2015 - mkubecek@suse.cz
twinkle.spec
+17 -6
View File
@@ -30,6 +30,8 @@ BuildRequires: libzrtpcpp-devel >= 2.0.0
BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: update-desktop-files
Requires(post): update-desktop-files
Requires(postun): update-desktop-files
BuildRequires: xorg-x11-devel
BuildRequires: pkgconfig(Qt5Declarative)
BuildRequires: pkgconfig(Qt5Quick)
@@ -53,6 +55,7 @@ Release: 0
Source: %{name}-%{version}.tar.xz
Patch11: Revert-Build-fix-for-a-probably-broken-std-match_res.patch
Patch12: Revert-Replaced-Boost-regex-dependency-with-C-11-reg.patch
Patch13: twinkle-no-return-in-nonvoid-function.patch
Url: https://twinkle.dolezel.info/
%description
@@ -66,21 +69,29 @@ networks.
%patch11 -p1
%patch12 -p1
%endif
%patch13 -p1
%build
cmake \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS" \
-DWITH_ZRTP=ON -DWITH_SPEEX=ON -DWITH_ILBC=ON \
-DWITH_ALSA=ON -DWITH_QT5=ON .
%cmake \
-DWITH_ZRTP=ON \
-DWITH_SPEEX=ON \
-DWITH_ILBC=ON \
-DWITH_ALSA=ON \
-DWITH_QT5=ON
make %{?_smp_mflags}
%install
%makeinstall
%cmake_install
install -d 755 %{buildroot}%{_datadir}/pixmaps
%suse_update_desktop_file -c twinkle Twinkle "SIP VoIP Phone" twinkle twinkle Network Telephony
%fdupes %{buildroot}%{_prefix}
%post
%desktop_database_post
%postun
%desktop_database_postun
%files
%defattr(-, root, root)
%doc AUTHORS COPYING README.md
twinkle-no-return-in-nonvoid-function.patch
+19
View File
@@ -0,0 +1,19 @@
Index: twinkle-1.9.0/src/audio/rtp_telephone_event.cpp
===================================================================
--- twinkle-1.9.0.orig/src/audio/rtp_telephone_event.cpp
+++ twinkle-1.9.0/src/audio/rtp_telephone_event.cpp
@@ -67,6 +67,7 @@ unsigned char char2dtmf_ev(char sym) {
if (sym == '*') return TEL_EV_DTMF_STAR;
if (sym == '#') return TEL_EV_DTMF_POUND;
assert(false);
+ return 0;
}
char dtmf_ev2char(unsigned char ev) {
@@ -79,5 +80,6 @@ char dtmf_ev2char(unsigned char ev) {
if (ev == TEL_EV_DTMF_STAR) return '*';
if (ev == TEL_EV_DTMF_POUND) return '#';
assert(false);
+ return 0;
}