Hello community, here is the log from the commit of package twinkle for openSUSE:Factory checked in at 2015-10-12 10:02:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/twinkle (Old) and /work/SRC/openSUSE:Factory/.twinkle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "twinkle" Changes: -------- --- /work/SRC/openSUSE:Factory/twinkle/twinkle.changes 2015-09-30 05:53:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.twinkle.new/twinkle.changes 2015-10-12 10:02:10.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 8 08:19:36 UTC 2015 - [email protected] + +- Use cmake macro +- Add twinkle-no-return-in-nonvoid-function.patch +- Use desktop file macros + +------------------------------------------------------------------- New: ---- twinkle-no-return-in-nonvoid-function.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ twinkle.spec ++++++ --- /var/tmp/diff_new_pack.gTuxgD/_old 2015-10-12 10:02:11.000000000 +0200 +++ /var/tmp/diff_new_pack.gTuxgD/_new 2015-10-12 10:02:11.000000000 +0200 @@ -30,6 +30,8 @@ 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 @@ 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 @@ %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 ++++++ 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; }
