Djam/sflphone
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/sflphone.git synced 2025-02-23 08:32:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to 1.1.0

Browse source
This commit is contained in:
Sergey Zhemoitel 2012-05-27 16:30:42 +04:00
parent 8aaad00f3c
commit 2306cc2e1e
5 changed files with 104 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources: sources:
"sflphone-0.9.13.tar.gz": 12a896830ae9086f93a3e59a0c04a69d892a32bc "sflphone-1.1.0.tar.gz": 7d120fe103000f9b77485418dde65fb492047186

92
fix_missing_include-file-error-in-f15.patch
View file

@ -1,92 +0,0 @@
diff -up ./sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp.fix ./sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
--- ./sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp.fix 2011-03-30 20:51:12.144812000 +0530
+++ ./sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp 2011-03-31 12:33:59.900191001 +0530
@@ -29,7 +29,7 @@
*/
-
+#include <stddef.h>
#include "AudioRtpFactory.h"
#include "AudioZrtpSession.h"
#include "AudioSrtpSession.h"
diff -up ./sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp.fix ./sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp
--- ./sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp.fix 2011-03-30 20:54:44.531812003 +0530
+++ ./sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp 2011-03-31 12:34:11.651191000 +0530
@@ -27,11 +27,13 @@
* as that of the covered work.
*/
+#include <stddef.h>
#include "AudioRtpRecordHandler.h"
#include "audio/audiolayer.h"
#include "manager.h"
+
namespace sfl
{
diff -up ./sflphone-common/src/audio/audiortp/AudioRtpSession.cpp.fix ./sflphone-common/src/audio/audiortp/AudioRtpSession.cpp
--- ./sflphone-common/src/audio/audiortp/AudioRtpSession.cpp.fix 2011-03-30 20:55:11.312812004 +0530
+++ ./sflphone-common/src/audio/audiortp/AudioRtpSession.cpp 2011-03-31 12:33:23.751191000 +0530
@@ -32,12 +32,14 @@
* as that of the covered work.
*/
+#include <stddef.h>
#include "AudioRtpSession.h"
#include "sip/sdp.h"
#include "audio/audiolayer.h"
#include "manager.h"
+
namespace sfl
{
diff -up ./sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp.fix ./sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
--- ./sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp.fix 2011-03-30 20:51:41.782812001 +0530
+++ ./sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp 2011-03-31 12:34:37.196191000 +0530
@@ -27,6 +27,8 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
+
+#include <stddef.h>
#include "AudioSrtpSession.h"
#include "user_cfg.h"
@@ -44,8 +46,6 @@
#include <cstring>
#include <cerrno>
-
-
namespace sfl
{
diff -up ./sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp.fix ./sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
--- ./sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp.fix 2011-03-30 20:53:46.113812000 +0530
+++ ./sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp 2011-03-31 12:35:00.450191000 +0530
@@ -27,6 +27,8 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
+
+#include <stddef.h>
#include "AudioZrtpSession.h"
#include "ZrtpSessionCallback.h"
#include "user_cfg.h"
diff -up ./sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp.fix ./sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp
--- ./sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp.fix 2011-03-30 20:53:17.134812000 +0530
+++ ./sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp 2011-03-31 12:35:25.488191000 +0530
@@ -27,6 +27,8 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
+
+#include <stddef.h>
#include "ZrtpSessionCallback.h"
#include "global.h"

11
sflphone-0.9.11-fix-underlinking.patch
View file

@ -1,11 +0,0 @@
--- sflphone-0.9.11/sflphone-client-gnome/src/Makefile.am.orig 2011-01-03 00:15:13.034102726 +0200
+++ sflphone-0.9.11/sflphone-client-gnome/src/Makefile.am 2011-01-03 00:15:19.946087337 +0200
@@ -34,7 +34,7 @@
accountlist.h sliders.h statusicon.h callable_obj.h conference_obj.h \
shortcuts.h eel-gconf-extensions.h logger.h
-sflphone_client_gnome_LDADD = $(DEPS_LIBS) $(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(LIBSEXY_LIBS) $(X11_LIBS)
+sflphone_client_gnome_LDADD = $(DEPS_LIBS) $(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(LIBSEXY_LIBS) $(X11_LIBS) -lwebkit-1.0 -lebook-1.2
# add symbolic link
install-exec-local:

34
sflphone-0.9.12-libnotify-0.7.patch
View file

@ -1,34 +0,0 @@
--- sflphone-client-gnome/src/sflnotify.c
+++ sflphone-client-gnome/src/sflnotify.c
@@ -31,6 +31,10 @@
#include "sflnotify.h"
#include <eel-gconf-extensions.h>
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+
GnomeNotification *_gnome_notification;
void create_new_gnome_notification (gchar *title, gchar *body, NotifyUrgency urgency, gint timeout, GnomeNotification **notif)
@@ -44,12 +48,20 @@
notify_init ("SFLphone");
// Set struct fields
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+ _notif->notification = notify_notification_new (title, body, NULL);
+#else
_notif->notification = notify_notification_new (title, body, NULL, NULL);
+#endif
//_notif->icon = gdk_pixbuf_new_from_file_at_size (LOGO, 120, 120, NULL);
_notif->icon = gdk_pixbuf_new_from_file (LOGO_SMALL, NULL);
#if GTK_CHECK_VERSION(2,10,0)
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+ // notify_notification_attach_to_status_icon function was removed
+#else
notify_notification_attach_to_status_icon (_notif->notification , get_status_icon());
#endif
+#endif
notify_notification_set_urgency (_notif->notification, urgency);

162
sflphone.spec
View file

@ -1,24 +1,28 @@
%define major 4
%define libqtsflphone %mklibname qtsflphone %{major}
%define libqtsflphonedevel %mklibname qtsflphone -d
Summary: A robust standards-compliant enterprise softphone Summary: A robust standards-compliant enterprise softphone
Name: sflphone Name: sflphone
Version: 0.9.13 Version: 1.1.0
Release: %mkrel 3 Release: %mkrel 1
Url: http://www.sflphone.org/ Url: http://www.sflphone.org/
Source0: https://projects.savoirfairelinux.com/attachments/download/1811/%{name}-%{version}.tar.gz Source0: https://projects.savoirfairelinux.com/attachments/download/2865/%{name}-%{version}.tar.gz
Patch0: sflphone-0.9.11-fix-underlinking.patch # pjsip is GPLv2+; sflphone-common is GPLv3+
Patch1: fix_missing_include-file-error-in-f15.patch License: GPLv2+ and GPLv3+
Patch2: sflphone-0.9.12-libnotify-0.7.patch
# pjsip is GPLv2; sflphone-common is GPLv3
License: GPLv2 and GPLv3
Group: Communications Group: Communications
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: openssl-devel libcommoncpp-devel yaml-devel celt-devel BuildRequires: openssl-devel libcommoncpp-devel yaml-devel celt-devel
BuildRequires: libccrtp-devel libzrtpcpp-devel astyle libgsm-devel BuildRequires: libccrtp-devel libzrtpcpp-devel astyle libgsm-devel
BuildRequires: libsamplerate-devel libalsa-devel libpulseaudio-devel libspeex-devel BuildRequires: libsamplerate-devel libalsa-devel libpulseaudio-devel libspeex-devel
BuildRequires: libuuid-devel libdbus-1-devel libexpat-devel BuildRequires: libuuid-devel dbus-devel libexpat-devel
BuildRequires: libdbus-glib-1-devel libnotify-devel gtk2-devel glib2-devel BuildRequires: dbus-glib-devel libnotify-devel gtk+3-devel glib2-devel
BuildRequires: webkitgtk-devel libgnomeui2-devel gnome-doc-utils BuildRequires: webkitgtk3-devel libgnomeui2-devel gnome-doc-utils
BuildRequires: evolution-data-server-devel libcheck-devel >= 0.9.4 BuildRequires: evolution-data-server-devel libcheck-devel >= 0.9.4
Suggests: %{name}-client-gnome BuildRequires: pcre-devel
BuildRequires: cmake
BuildRequires: kdepim4-devel
BuildRequires: dbus-c++-devel
Suggests: %{name}-client
%description %description
SFLphone is a robust standards-compliant enterprise softphone, for desktop and SFLphone is a robust standards-compliant enterprise softphone, for desktop and
@ -35,64 +39,111 @@ Features highlight:
o Signalling and voice encryption (TLS, SRTP) o Signalling and voice encryption (TLS, SRTP)
o Pulseaudio support o Pulseaudio support
%package plugins
Summary: A robust standards-compliant enterprise softphone
License: GPLv3+
Requires: %{name}
%description plugins
Plugins for SFLphone software phone.
%package client-gnome %package client-gnome
Summary: A robust standards-compliant enterprise softphone Summary: A robust standards-compliant enterprise softphone
License: GPLv2 License: GPLv3+
Group: Communications
Requires: %{name} Requires: %{name}
Provides: %{name}-client = %{EVRD}
%description client-gnome %description client-gnome
This package contains the GNOME client for SFLphone. This package contains the GNOME client for SFLphone.
%package client-kde
Summary: A robust standards-compliant enterprise softphone
License: GPLv3+
Requires: %{name}
Provides: %{name}-client = %{EVRD}
%description client-kde
This package contains the KDE client for SFLphone.
%package -n %{libqtsflphone}
Summary: Qt library for SFLphone client
License: GPLv3+
%description -n %{libqtsflphone}
This package contains the Qt library for SFLphone.
%package -n %{libqtsflphonedevel}
Summary: Qt library for SFLphone client
License: GPLv3+
Requires: %{libqtsflphone} = %{version}
Provides: qtsflphone-devel = %{EVRD}
%description -n %{libqtsflphonedevel}
This package contains Qt development files for SFLphone.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}
%patch1 -p1 find kde/ -type f -not -name '*.sh' -exec chmod a-x {} \;
%patch2 -p0
#%patch0 -p1 -b .underlinking
#(cd sflphone-client-gnome && autoreconf -fi)
%build %build
pushd sflphone-common/libs/pjproject pushd daemon/libs/pjproject
%configure2_5x --enable-libsamplerate %configure2_5x --enable-libsamplerate
make dep make dep
make make
popd popd
pushd sflphone-common pushd daemon
./autogen.sh
%configure2_5x %configure2_5x
%make %make
popd popd
pushd sflphone-client-gnome pushd plugins
./autogen.sh
%configure2_5x
%make
popd
pushd gnome
./autogen.sh
%configure2_5x --disable-schemas-install --disable-silent-rules %configure2_5x --disable-schemas-install --disable-silent-rules
%make %make
popd popd
pushd kde
%cmake
%make
popd
%install %install
rm -rf %{buildroot} %makeinstall_std -C daemon
%makeinstall_std -C sflphone-common %makeinstall_std -C plugins
%makeinstall_std -C sflphone-client-gnome %makeinstall_std -C gnome
%makeinstall_std -C kde/build
%find_lang %{name} install -d %{buildroot}%{_docdir}/slphone-plugins
%find_lang %{name}-client-gnome install -d %{buildroot}%{_docdir}/slphone-client-gnome
install -d %{buildroot}%{_docdir}/slphone-client-kde
%clean %find_lang %{name}-client-gnome --with-gnome
rm -rf %{buildroot} %find_lang %{name}-client-kde --with-kde
%files -f %{name}.lang %files
%defattr(-,root,root) %doc daemon/AUTHORS daemon/NEWS daemon/README daemon/TODO
%doc AUTHORS README CODING
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%{_libdir}/%{name}/codecs/ %{_libdir}/%{name}/codecs/
%{_libdir}/%{name}/plugins/
%{_libdir}/%{name}/sflphoned %{_libdir}/%{name}/sflphoned
%{_datadir}/dbus-1/services/org.sflphone.SFLphone.service %{_datadir}/dbus-1/services/org.sflphone.SFLphone.service
%{_mandir}/man1/sflphoned* %{_mandir}/man1/sflphoned*
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
%{_datadir}/%{name}/ringtones/ %{_datadir}/%{name}/ringtones/
%files plugins
%doc plugins/AUTHORS plugins/NEWS plugins/README
%{_libdir}/%{name}/plugins/
%files client-gnome -f %{name}-client-gnome.lang %files client-gnome -f %{name}-client-gnome.lang
%defattr(-,root,root) %doc gnome/AUTHORS gnome/README gnome/NEWS
%{_sysconfdir}/gconf/schemas/sflphone-client-gnome.schemas %{_sysconfdir}/gconf/schemas/sflphone-client-gnome.schemas
%{_bindir}/%{name} %{_bindir}/%{name}
%{_bindir}/%{name}-client-gnome %{_bindir}/%{name}-client-gnome
@ -107,29 +158,22 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/ui/ %{_datadir}/%{name}/ui/
%{_datadir}/%{name}/webkit/ %{_datadir}/%{name}/webkit/
%files client-kde -f %{name}-client-kde.lang
%doc kde/AUTHORS kde/NEWS kde/README
%{_bindir}/%{name}-client-kde
%{_kde_appsdir}/*
%{_kde_libdir}/kde4/*
%{_kde_applicationsdir}/*
%{_mandir}/man1/sflphone-client-kde.1*
%{_kde_services}/*
%{_iconsdir}/hicolor/*/apps/sflphone-client-kde.*
%{_kde_docdir}/HTML/en/*
%{_datadir}/config.kcfg/sflphone-client-kde.kcfg
%changelog %files -n %{libqtsflphone}
* Mon Jun 20 2011 Funda Wang <fwang@mandriva.org> 0.9.13-3mdv2011.0 %{qt4lib}/libqtsflphone.so.%{major}
+ Revision: 686160 %{qt4lib}/libqtsflphone.so.%{version}
- rebuild for new webkit
* Mon May 23 2011 Funda Wang <fwang@mandriva.org> 0.9.13-2
+ Revision: 677832
- rebuild to add gconftool as req
* Sat Apr 30 2011 Funda Wang <fwang@mandriva.org> 0.9.13-1
+ Revision: 661092
- build with libnotify 0.7
- New verison 0.9.13
+ Ahmad Samir <ahmadsamir@mandriva.org>
- add patch to fix underlinking
* Sat Jan 01 2011 Ahmad Samir <ahmadsamir@mandriva.org> 0.9.11-2mdv2011.0
+ Revision: 627020
- fix client package requires
* Fri Dec 31 2010 Ahmad Samir <ahmadsamir@mandriva.org> 0.9.11-1mdv2011.0
+ Revision: 626921
- import sflphone
%files -n %{libqtsflphonedevel}
%{qt4lib}/libqtsflphone.so
%{_includedir}/qtsflphone/