diff options
Diffstat (limited to 'net-voip')
| -rw-r--r-- | net-voip/sflphone/ChangeLog | 15 | ||||
| -rw-r--r-- | net-voip/sflphone/Manifest | 24 | ||||
| -rw-r--r-- | net-voip/sflphone/files/sflphone-0.9.12-libnotify-0.7.patch | 34 | ||||
| -rw-r--r-- | net-voip/sflphone/files/sflphone-0.9.8.4-libnotify-0.7.patch | 34 | ||||
| -rw-r--r-- | net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-1.patch | 26 | ||||
| -rw-r--r-- | net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-2.patch | 138 | ||||
| -rw-r--r-- | net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-3.patch | 317 | ||||
| -rw-r--r-- | net-voip/sflphone/files/sflphone-1.0.1-pjsip-1.14.patch | 110 | ||||
| -rw-r--r-- | net-voip/sflphone/metadata.xml | 4 | ||||
| -rw-r--r-- | net-voip/sflphone/sflphone-0.9.8.4.ebuild | 149 | ||||
| -rw-r--r-- | net-voip/sflphone/sflphone-1.2.2.ebuild | 176 |
11 files changed, 25 insertions, 1002 deletions
diff --git a/net-voip/sflphone/ChangeLog b/net-voip/sflphone/ChangeLog index 3409080305f6..c27774253fcd 100644 --- a/net-voip/sflphone/ChangeLog +++ b/net-voip/sflphone/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-voip/sflphone -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/ChangeLog,v 1.15 2013/08/03 16:13:58 elvanor Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/ChangeLog,v 1.16 2014/02/16 10:36:57 pacho Exp $ + + 16 Feb 2014; Pacho Ramos <pacho@gentoo.org> + -files/sflphone-0.9.12-libnotify-0.7.patch, + -files/sflphone-0.9.8.4-libnotify-0.7.patch, + -files/sflphone-1.0.1-glib-2.32-headers-1.patch, + -files/sflphone-1.0.1-glib-2.32-headers-2.patch, + -files/sflphone-1.0.1-glib-2.32-headers-3.patch, + -files/sflphone-1.0.1-pjsip-1.14.patch, -sflphone-0.9.8.4.ebuild, + -sflphone-1.2.2.ebuild, metadata.xml: + Cleanup due #200380 *sflphone-1.2.3 (03 Aug 2013) @@ -69,4 +79,3 @@ 06 Sep 2010; <elvanor@gentoo.org> +sflphone-0.9.8.4.ebuild, +metadata.xml: Initial import from bug #293399. Credits goes to Atman Sense. - diff --git a/net-voip/sflphone/Manifest b/net-voip/sflphone/Manifest index cce621ce6ce4..4be3e71b781a 100644 --- a/net-voip/sflphone/Manifest +++ b/net-voip/sflphone/Manifest @@ -1,14 +1,14 @@ -AUX sflphone-0.9.12-libnotify-0.7.patch 1196 SHA256 6947d55e7c5fc273262d97accc4d8d48518645f3a80ac15f7818b3eeb44d0509 SHA512 0d522619f33bc04da05f497f1e358133b3252b5acc717560723aab094bc4c5227f4bb64e535f92f3720238b8bba57a8144b7a9e73a01c7f9ba3a93cb512c05ad WHIRLPOOL ab84a412aeb7a295182da96a66b3d04066709b5ed12693d0d45978ce24c9a843caafdb5333d859fe2d8c401fd569e5a6987511800634d47b9d82c1420c119c60 -AUX sflphone-0.9.8.4-libnotify-0.7.patch 1178 SHA256 68a00825842b3f307f5c62e66de2e29d54afb73127954acf076d9aa22c086472 SHA512 9ddd0c09b4a4245a8619ce2eb7565f5a393f767271b8bc9ca89d93f7536b6442c4438ccd2f0b9635d76e3cd5b3c76a5006960f1a6586a993b0dc0d00cf6f03d7 WHIRLPOOL 940f4c433180e7508e72e65a7d952f823528b4bdecae65bdb62d3c48df5a154c2364c1f8d50b28c01b7734ea6df62d316cfc91dda0055616bec2315e52a9bae5 -AUX sflphone-1.0.1-glib-2.32-headers-1.patch 739 SHA256 e0aa86c35f8bd8395d39d2e3cf4530c94e419319b34d772a63ab503209c2ba96 SHA512 54606d7a469e3e0ba7b3937d697807f8ed8ce7f5093ec805067a4d6c879a8471101548db1ad332b75620165ae14868890d6b1caaefba577a6d36d294b91a0211 WHIRLPOOL ef260643fb565536bff8c8ce8c9b5b517de3f3bec185a5a5c49206fd446a2017298d99df53456116f3657d51c5effc7d4cea3da97e9e27636ac7a91391c22c00 -AUX sflphone-1.0.1-glib-2.32-headers-2.patch 3936 SHA256 dd7295323f6bfe5ed7ad2343d62461ba590dc0597017586038d88d7a608b15f8 SHA512 0b59516f624bec470061d4a6bc5d81c587f952d8e5bb9926708b4776b839161a0b6798b5c2623cca8515182d2dc500ea8fa5e05a28bf9024f3c1beaf3fcfd7d9 WHIRLPOOL eca48a3dbd2b84883b5c85437e096f3c8dd703c20bd42111fde283a6e556ef0abc3bbaf25f88ae55afbac78985d7541e7f5b4da81bdc38bb2c49d479514b602c -AUX sflphone-1.0.1-glib-2.32-headers-3.patch 9145 SHA256 8cd9164589f11179ea5262661a6e4b52b046f4efd6c8a159aec3a6db36ce6c25 SHA512 a1fec41fe098ca1beafc02b1b1e0fe9d36ec67448a775a2c9c16e40dbae6c0c9c2623f73051ce42ee4e98b14769073be4a4cc052e980c7616e553d30c7efa353 WHIRLPOOL 1c1abdaf790bac6eccd10a5cc03b5f3d4715ad556545e1204e169b67cbb30f39ef49004dab3037dae43680f21f4dc110fb53c196a5041b3baae9025d813abd32 -AUX sflphone-1.0.1-pjsip-1.14.patch 4206 SHA256 56a5f544cfb5d0b1020caa5056c7ec81cca3c029414014f2b6aa242837c92f29 SHA512 0206f83d0a2547062701337e59f27d8a2cd97a83e7794eebda8037c75b071427f1898efcb474511013bb3936033f6b4c60db2efa3eb6cbfd84e555db6e2a5a72 WHIRLPOOL 724e24d334914bf8de46e07ea6aa0ac033f597f51b30e3dcab50fbc71e957769b525b48edb8ca204991457e4d26dbec883a1b02023707806fb0545bf73e37e7e -DIST sflphone-0.9.8.4.tar.gz 7191853 SHA256 db31e642e77543099325a18c3c1f2e7e1ef83615c9d4d27c2a21c5abfb0253a4 -DIST sflphone-1.2.2.tar.gz 9393484 SHA256 1ba2d79a05f6ef059196b321327f22a7bfaf1be36ed657cd01b3d305741a4469 SHA512 b53dd5550f37b8b23fb50a1aee32c65cbec80ed07875c85f3b52f57f41422ec1445f26d42d2c8a6d47491f447680bf46b4088567af0377f482dab1a9f0cf3629 WHIRLPOOL 1cbe7e271f95a1f79588e0adf48241ee253a01c319e9b5ad99ca0c95f7376953b5fa1dd6f4ee50a0629a8d22d91bb624291ba5ce304afae18bee971769d1959b +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST sflphone-1.2.3.tar.gz 9712855 SHA256 cd990e3c1e3ad0de7e6f332491d5f557ed78beaa13ce795428b4dc7afca43c2a SHA512 62d1c52d93f3061a5fd794a463bea31c960191dba3342fc66c85c5a98b82ed684f60090418dd0b0408efab765fcc5659b1e4d7d50f4c9a1132d8b86ed96327b1 WHIRLPOOL dbe116e9ce97ec0830c23b0c6dd89dd4d2a8e8af0bbfd63ea1db485e4698afe2e823421243877266a1b98a558f0e7674b84024ba1764833577ac861a18510308 -EBUILD sflphone-0.9.8.4.ebuild 3872 SHA256 0a2efc336622c6d29e4d2b40db0246931b134227df4cf6264a5476b9db088ed0 SHA512 964d713948457e875a2e2387dd979ac79621c1c7b6d3fb8fbcb1b6071612c6943bdf66ec6e1d8b4b5731cde8118ee638fc1093444b844197f8d815fec877f0c7 WHIRLPOOL 348d8ec92fd70e59016d6e6869c72c0e2834d1d5c585f3e020541aacc774c118c5c0de4f662f010b787f565118597a60478a2da04acfc8f09176a72f5fb60bbf -EBUILD sflphone-1.2.2.ebuild 4796 SHA256 15187d8c2d44517909bc48b063c5bcfece104c7bb471f4fa3ebd72a42b77b7bb SHA512 9afacf394c500d5a992d16f17c5e8fa5dde77865623d6e8e3f8ecca68112dd98db80defbe0283a16f23659454860a48800b573ca0c1677cd1f52726187e8e4e0 WHIRLPOOL ff5604797f57b3c5eac18974c686f58de167808e5020ea07158846f16d4253148aed2bd543c738bae1e2cf0df7dd068cff1ba31d3ce67231f3a283fbc0aeb857 EBUILD sflphone-1.2.3.ebuild 4657 SHA256 1217d09b4b85764459299400292aa332f236cbeda16a28536fe1baf3bc58bcb2 SHA512 b1693a78ffcea2a167852b6b01b222b7b2f3daaab2770a7cf55d42111dd3d5b875f59313da35d363d1ac0598a233f1f88fcfb3b62aaa367b5e5e0abfc1e42a6d WHIRLPOOL 2bdb829e7fa731b944ede62dafbe7f48427a4fc370d2b4d805d863b809b6d43d6a88837cabda4ce35d591445520e352b5dc29e078a34638ae7bde08905be3a67 -MISC ChangeLog 2446 SHA256 29df802b8e836db63893c2c6dc907754ee2e50da11e0d6cbe9868b87bc1c6321 SHA512 cdc17ade3311a30f45dd37e937b44abe16d0d29b629ec54a55b1d79ec09c5de6b87e439d32227986b5b6626bf84d8b12d39c4d2b63cb84622185ea4614885729 WHIRLPOOL a9a8687eea7f403e8174471c4f25f180e0d1794a6b541c2c07c73197983de71f5d06d50af47b9b047130343ed112ad2026efee5a2998eec0f7790549c6c9ba0b -MISC metadata.xml 657 SHA256 472c5a01f8ea3d27cea072d1401a1ab7932e7e476e738f0ce1078397f5225f50 SHA512 42186df2cea677af71a30c6585c1a570330866c1e4b819f8379c1b66cd0a024f31ea3e137c059cadb1d7e381b72e1555d30cf672866e4e0b613047536ecaeba3 WHIRLPOOL 8f8d1c32e61de42ece72485430f0ab551b824adabd2fd8b7edb88939165b296c2a3bf3d4c30afef1172de4ca642f4845371320921ba7477aef1bbf0072d6aa92 +MISC ChangeLog 2866 SHA256 e06439580f911697cddd809d2e547b6c387024f18423f2ddace774d9a0ede6d3 SHA512 89e4a600f59428f34c2b4838e0aa659259b93e286e8924357a2931a6852679a93441a66f9ba706879f2961934be9b23031aa63095049086fc1403cc2e217fc4e WHIRLPOOL 290bbea9155eac43c0738b220b09f1ab36b8e7f2f36704e079658a3a2db1c5e113e288c264b3dad2d8b28de495a2cf6cc2a3f415c26af5e3e0c122bcb8c4b717 +MISC metadata.xml 563 SHA256 393b9d159e46c73cc1d2310ef159bb396ff5f17a26f713daddb3c37b3bc9221c SHA512 63291c6cac01c50a93650f396ee59ce58869840a54830a53a0f1461bd4b907ac39a91e10a7c86a3c8f5a652091f752652e00d266822b131366e6e2c78548d12d WHIRLPOOL c217347919754d55ba3df6938181ef3be41c05c5d165336f8ab17ccb30f9d7fdc17905aec20c08650577c60bdd80c3a80101c01d76a6fc71e06bdf5e30ae5b04 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iEYEAREIAAYFAlMAlMoACgkQCaWpQKGI+9QlrACfcTzra1QkbuzN27VW5bmvmQfM +CwoAoIQHVb0qtC9wFj4takRFaPrFGsKm +=dwn9 +-----END PGP SIGNATURE----- diff --git a/net-voip/sflphone/files/sflphone-0.9.12-libnotify-0.7.patch b/net-voip/sflphone/files/sflphone-0.9.12-libnotify-0.7.patch deleted file mode 100644 index 20fa9c97da15..000000000000 --- a/net-voip/sflphone/files/sflphone-0.9.12-libnotify-0.7.patch +++ /dev/null @@ -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); - diff --git a/net-voip/sflphone/files/sflphone-0.9.8.4-libnotify-0.7.patch b/net-voip/sflphone/files/sflphone-0.9.8.4-libnotify-0.7.patch deleted file mode 100644 index 90648e3498fd..000000000000 --- a/net-voip/sflphone/files/sflphone-0.9.8.4-libnotify-0.7.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- sflphone-client-gnome/src/sflnotify.c -+++ sflphone-client-gnome/src/sflnotify.c -@@ -30,6 +30,10 @@ - - #include <sflnotify.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) -@@ -43,12 +47,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); - diff --git a/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-1.patch b/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-1.patch deleted file mode 100644 index 683bd9a29c68..000000000000 --- a/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-1.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3ed300124a425d43ee627ff35b35aa1168ba01d0 Mon Sep 17 00:00:00 2001 -From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> -Date: Tue, 6 Mar 2012 10:19:59 -0500 -Subject: [PATCH] * #9144: Fixes "Only <glib.h> can be included directly" - error - ---- - plugins/addressbook/evolution/eds.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/plugins/addressbook/evolution/eds.h b/plugins/addressbook/evolution/eds.h -index 0ce1783..5bbf71e 100644 ---- a/plugins/addressbook/evolution/eds.h -+++ b/plugins/addressbook/evolution/eds.h -@@ -38,7 +38,7 @@ - #ifndef __EDS_H__ - #define __EDS_H__ - --#include <glib/gtypes.h> -+#include <glib.h> - #include <gdk-pixbuf/gdk-pixbuf.h> - #include <libebook/e-book.h> - --- -1.7.8.6 - diff --git a/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-2.patch b/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-2.patch deleted file mode 100644 index aa6645ab3987..000000000000 --- a/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-2.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 585ee2588599e295273721418db3bf4d54dd053a Mon Sep 17 00:00:00 2001 -From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> -Date: Tue, 6 Mar 2012 10:55:47 -0500 -Subject: [PATCH] * #9145: fix "only <glib.h>" can be included error in gnome - client - ---- - gnome/src/actions.c | 2 +- - gnome/src/conference_obj.h | 2 +- - gnome/src/config/addressbook-config.h | 2 +- - gnome/src/config/hooks-config.h | 2 +- - gnome/src/config/shortcuts-config.h | 2 +- - gnome/src/eel-gconf-extensions.c | 2 +- - gnome/src/eel-gconf-extensions.h | 2 +- - gnome/src/sflphone_const.h | 2 +- - gnome/src/uimanager.c | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/gnome/src/actions.c b/gnome/src/actions.c -index 0520be8..abdbddd 100644 ---- a/gnome/src/actions.c -+++ b/gnome/src/actions.c -@@ -36,7 +36,7 @@ - #else - #include <gdk/gdkkeysyms.h> - #endif --#include <glib/gprintf.h> -+#include <glib.h> - #include <stdlib.h> - #include <string.h> - #include <sys/types.h> -diff --git a/gnome/src/conference_obj.h b/gnome/src/conference_obj.h -index e7f0e3a..0e17bad 100644 ---- a/gnome/src/conference_obj.h -+++ b/gnome/src/conference_obj.h -@@ -32,7 +32,7 @@ - #define __CONFERENCE_OBJ_H__ - - #include <gtk/gtk.h> --#include <glib/gprintf.h> -+#include <glib.h> - #include <stdlib.h> - #include <time.h> - -diff --git a/gnome/src/config/addressbook-config.h b/gnome/src/config/addressbook-config.h -index cb10260..cd7a9ac 100644 ---- a/gnome/src/config/addressbook-config.h -+++ b/gnome/src/config/addressbook-config.h -@@ -32,7 +32,7 @@ - #define _ADDRESS_BOOK_CONFIG - - #include <gtk/gtk.h> --#include <glib/gtypes.h> -+#include <glib.h> - - #include "addressbook.h" - #include "actions.h" -diff --git a/gnome/src/config/hooks-config.h b/gnome/src/config/hooks-config.h -index 6f51be9..e35a5b9 100644 ---- a/gnome/src/config/hooks-config.h -+++ b/gnome/src/config/hooks-config.h -@@ -32,7 +32,7 @@ - #define _HOOKS_CONFIG - - #include <gtk/gtk.h> --#include <glib/gtypes.h> -+#include <glib.h> - - #include "actions.h" - #include "utils.h" -diff --git a/gnome/src/config/shortcuts-config.h b/gnome/src/config/shortcuts-config.h -index abcb424..123cb9c 100644 ---- a/gnome/src/config/shortcuts-config.h -+++ b/gnome/src/config/shortcuts-config.h -@@ -32,7 +32,7 @@ - #define _SHORTCUTS_CONFIG - - #include <gtk/gtk.h> --#include <glib/gtypes.h> -+#include <glib.h> - - #include "actions.h" - #include <utils.h> -diff --git a/gnome/src/eel-gconf-extensions.c b/gnome/src/eel-gconf-extensions.c -index c1947f2..4631981 100644 ---- a/gnome/src/eel-gconf-extensions.c -+++ b/gnome/src/eel-gconf-extensions.c -@@ -29,7 +29,7 @@ - #include <gconf/gconf-client.h> - #include <gconf/gconf.h> - #include <gtk/gtk.h> --#include <glib/gi18n.h> -+#include <glib.h> - - static GConfClient *global_gconf_client = NULL; - -diff --git a/gnome/src/eel-gconf-extensions.h b/gnome/src/eel-gconf-extensions.h -index 0068b15..d380387 100644 ---- a/gnome/src/eel-gconf-extensions.h -+++ b/gnome/src/eel-gconf-extensions.h -@@ -25,7 +25,7 @@ - #ifndef EEL_GCONF_EXTENSIONS_H - #define EEL_GCONF_EXTENSIONS_H - --#include <glib/gerror.h> -+#include <glib.h> - #include <gconf/gconf.h> - #include <gconf/gconf-client.h> - -diff --git a/gnome/src/sflphone_const.h b/gnome/src/sflphone_const.h -index 3766562..e642e0a 100644 ---- a/gnome/src/sflphone_const.h -+++ b/gnome/src/sflphone_const.h -@@ -32,7 +32,7 @@ - #define __SFLPHONE_CONST_H - - #include <libintl.h> --#include <glib/gi18n.h> -+#include <glib.h> - - /* @file sflphone_const.h - * @brief Contains the global variables for the client code -diff --git a/gnome/src/uimanager.c b/gnome/src/uimanager.c -index 36eb623..2953156 100644 ---- a/gnome/src/uimanager.c -+++ b/gnome/src/uimanager.c -@@ -36,7 +36,7 @@ - #include "assistant.h" - #include <gtk/gtk.h> - #include <string.h> --#include <glib/gprintf.h> -+#include <glib.h> - - #include "uimanager.h" - #include "statusicon.h" --- -1.7.8.6 - diff --git a/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-3.patch b/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-3.patch deleted file mode 100644 index 4eb8c86c9e49..000000000000 --- a/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-3.patch +++ /dev/null @@ -1,317 +0,0 @@ -From 733be9d1efbd5b146ed9d48df31561dcfc1379c9 Mon Sep 17 00:00:00 2001 -From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> -Date: Fri, 9 Mar 2012 16:48:34 -0500 -Subject: [PATCH] * #9145: fix missing <glib/gi18n.h> includes - ---- - gnome/src/accountlist.c | 1 + - gnome/src/actions.c | 1 + - gnome/src/callable_obj.c | 1 + - gnome/src/config/accountconfigdialog.c | 1 + - gnome/src/config/accountlistconfigdialog.c | 1 + - gnome/src/config/addressbook-config.c | 1 + - gnome/src/config/assistant.c | 2 +- - gnome/src/config/audioconf.c | 2 +- - gnome/src/config/hooks-config.c | 1 + - gnome/src/config/preferencesdialog.c | 1 + - gnome/src/config/shortcuts-config.c | 1 + - gnome/src/config/tlsadvanceddialog.c | 2 +- - gnome/src/config/zrtpadvanceddialog.c | 8 ++++---- - gnome/src/contacts/searchbar.c | 1 + - gnome/src/dbus/dbus.c | 2 +- - gnome/src/eel-gconf-extensions.c | 3 ++- - gnome/src/main.c | 1 + - gnome/src/mainwindow.c | 1 + - gnome/src/sflnotify.c | 2 ++ - gnome/src/sliders.c | 1 + - gnome/src/statusicon.c | 1 + - gnome/src/uimanager.c | 3 ++- - 22 files changed, 28 insertions(+), 10 deletions(-) - -diff --git a/gnome/src/accountlist.c b/gnome/src/accountlist.c -index 662c7bc..803e3d3 100644 ---- a/gnome/src/accountlist.c -+++ b/gnome/src/accountlist.c -@@ -29,6 +29,7 @@ - * as that of the covered work. - */ - -+#include <glib/gi18n.h> - #include "accountlist.h" - #include "actions.h" - #include "unused.h" -diff --git a/gnome/src/actions.c b/gnome/src/actions.c -index abdbddd..29dca07 100644 ---- a/gnome/src/actions.c -+++ b/gnome/src/actions.c -@@ -29,6 +29,7 @@ - * as that of the covered work. - */ - -+#include <glib/gi18n.h> - #include <gtk/gtk.h> - /* Backward compatibility for gtk < 2.22.0 */ - #if GTK_CHECK_VERSION(2,22,0) -diff --git a/gnome/src/callable_obj.c b/gnome/src/callable_obj.c -index 83449c6..c16d951 100644 ---- a/gnome/src/callable_obj.c -+++ b/gnome/src/callable_obj.c -@@ -32,6 +32,7 @@ - #include "codeclist.h" - #include "sflphone_const.h" - #include <time.h> -+#include <glib/gi18n.h> - #include "contacts/calltab.h" - #include "contacts/calltree.h" - #include "dbus.h" -diff --git a/gnome/src/config/accountconfigdialog.c b/gnome/src/config/accountconfigdialog.c -index c623595..7c2de3f 100644 ---- a/gnome/src/config/accountconfigdialog.c -+++ b/gnome/src/config/accountconfigdialog.c -@@ -31,6 +31,7 @@ - * as that of the covered work. - */ - -+#include <glib/gi18n.h> - #include <sys/socket.h> - #include <sys/ioctl.h> - #include <net/if.h> -diff --git a/gnome/src/config/accountlistconfigdialog.c b/gnome/src/config/accountlistconfigdialog.c -index aa8db7a..151f067 100644 ---- a/gnome/src/config/accountlistconfigdialog.c -+++ b/gnome/src/config/accountlistconfigdialog.c -@@ -38,6 +38,7 @@ - #include "utils.h" - #include "unused.h" - #include "logger.h" -+#include <glib/gi18n.h> - #include <string.h> - - static const int CONTEXT_ID_REGISTRATION = 0; -diff --git a/gnome/src/config/addressbook-config.c b/gnome/src/config/addressbook-config.c -index 4c56da2..8e9c64e 100644 ---- a/gnome/src/config/addressbook-config.c -+++ b/gnome/src/config/addressbook-config.c -@@ -34,6 +34,7 @@ - #include "logger.h" - #include "searchbar.h" - #include "contacts/addrbookfactory.h" -+#include <glib/gi18n.h> - #include <string.h> - #include <stdlib.h> - -diff --git a/gnome/src/config/assistant.c b/gnome/src/config/assistant.c -index 8ca0021..202767e 100644 ---- a/gnome/src/config/assistant.c -+++ b/gnome/src/config/assistant.c -@@ -29,7 +29,7 @@ - */ - - #include <string.h> -- -+#include <glib/gi18n.h> - #include "unused.h" - #include "assistant.h" - #include "logger.h" -diff --git a/gnome/src/config/audioconf.c b/gnome/src/config/audioconf.c -index c7dfe38..3bfbad9 100644 ---- a/gnome/src/config/audioconf.c -+++ b/gnome/src/config/audioconf.c -@@ -28,7 +28,7 @@ - * as that of the covered work. - */ - -- -+#include <glib/gi18n.h> - #include "audioconf.h" - #include "utils.h" - #include "logger.h" -diff --git a/gnome/src/config/hooks-config.c b/gnome/src/config/hooks-config.c -index 2b3e9e8..8a2b419 100644 ---- a/gnome/src/config/hooks-config.c -+++ b/gnome/src/config/hooks-config.c -@@ -28,6 +28,7 @@ - * as that of the covered work. - */ - -+#include <glib/gi18n.h> - #include "hooks-config.h" - #include "dbus.h" - -diff --git a/gnome/src/config/preferencesdialog.c b/gnome/src/config/preferencesdialog.c -index 3bd5057..10b11ca 100644 ---- a/gnome/src/config/preferencesdialog.c -+++ b/gnome/src/config/preferencesdialog.c -@@ -32,6 +32,7 @@ - * as that of the covered work. - */ - -+#include <glib/gi18n.h> - #include <gtk/gtk.h> - #include <stdlib.h> - #include <stdio.h> -diff --git a/gnome/src/config/shortcuts-config.c b/gnome/src/config/shortcuts-config.c -index caa354a..f77b2e0 100644 ---- a/gnome/src/config/shortcuts-config.c -+++ b/gnome/src/config/shortcuts-config.c -@@ -28,6 +28,7 @@ - * as that of the covered work. - */ - -+#include <glib/gi18n.h> - #include <gdk/gdk.h> - #include "shortcuts-config.h" - #include "shortcuts.h" -diff --git a/gnome/src/config/tlsadvanceddialog.c b/gnome/src/config/tlsadvanceddialog.c -index 3d6c118..59052ea 100644 ---- a/gnome/src/config/tlsadvanceddialog.c -+++ b/gnome/src/config/tlsadvanceddialog.c -@@ -32,7 +32,7 @@ - #include <sflphone_const.h> - #include <utils.h> - #include <dbus.h> -- -+#include <glib/gi18n.h> - #include <gtk/gtk.h> - #include <math.h> - -diff --git a/gnome/src/config/zrtpadvanceddialog.c b/gnome/src/config/zrtpadvanceddialog.c -index e50898a..fe4589b 100644 ---- a/gnome/src/config/zrtpadvanceddialog.c -+++ b/gnome/src/config/zrtpadvanceddialog.c -@@ -28,11 +28,11 @@ - * as that of the covered work. - */ - --#include <zrtpadvanceddialog.h> --#include <sflphone_const.h> --#include <utils.h> -- -+#include <glib/gi18n.h> - #include <gtk/gtk.h> -+#include <zrtpadvanceddialog.h> -+#include "sflphone_const.h" -+#include "utils.h" - - void show_advanced_zrtp_options(GHashTable * properties) - { -diff --git a/gnome/src/contacts/searchbar.c b/gnome/src/contacts/searchbar.c -index e48efaf..1ac515b 100644 ---- a/gnome/src/contacts/searchbar.c -+++ b/gnome/src/contacts/searchbar.c -@@ -31,6 +31,7 @@ - * as that of the covered work. - */ - -+#include <glib/gi18n.h> - #include "searchbar.h" - #include "calltree.h" - #include "calltab.h" -diff --git a/gnome/src/dbus/dbus.c b/gnome/src/dbus/dbus.c -index 91241f5..957ae5a 100644 ---- a/gnome/src/dbus/dbus.c -+++ b/gnome/src/dbus/dbus.c -@@ -30,7 +30,7 @@ - * as that of the covered work. - */ - #include "config.h" -- -+#include <glib/gi18n.h> - #include "logger.h" - #include "calltab.h" - #include "callmanager-glue.h" -diff --git a/gnome/src/eel-gconf-extensions.c b/gnome/src/eel-gconf-extensions.c -index 4631981..c24251a 100644 ---- a/gnome/src/eel-gconf-extensions.c -+++ b/gnome/src/eel-gconf-extensions.c -@@ -22,8 +22,9 @@ - Authors: Ramiro Estrugo <ramiro@eazel.com> - */ - --#include <stdlib.h> - #include "config.h" -+#include <glib/gi18n.h> -+#include <stdlib.h> - #include "eel-gconf-extensions.h" - - #include <gconf/gconf-client.h> -diff --git a/gnome/src/main.c b/gnome/src/main.c -index 7af5078..8a08c4e 100644 ---- a/gnome/src/main.c -+++ b/gnome/src/main.c -@@ -36,6 +36,7 @@ - #include "mainwindow.h" - #include "statusicon.h" - #include "eel-gconf-extensions.h" -+#include <glib/gi18n.h> - #include <gtk/gtk.h> - #include <stdlib.h> - -diff --git a/gnome/src/mainwindow.c b/gnome/src/mainwindow.c -index 3b14c6a..e41def4 100644 ---- a/gnome/src/mainwindow.c -+++ b/gnome/src/mainwindow.c -@@ -50,6 +50,7 @@ - - #include "eel-gconf-extensions.h" - -+#include <glib/gi18n.h> - #include <sys/stat.h> - #include <gtk/gtk.h> - -diff --git a/gnome/src/sflnotify.c b/gnome/src/sflnotify.c -index 8dd5ed0..44eee7e 100644 ---- a/gnome/src/sflnotify.c -+++ b/gnome/src/sflnotify.c -@@ -29,6 +29,8 @@ - */ - - #include "config.h" -+#include <glib.h> -+#include <glib/gi18n.h> - #include "eel-gconf-extensions.h" - #include "sflnotify.h" - #include "logger.h" -diff --git a/gnome/src/sliders.c b/gnome/src/sliders.c -index 4a2fdd8..ab3e40f 100644 ---- a/gnome/src/sliders.c -+++ b/gnome/src/sliders.c -@@ -28,6 +28,7 @@ - * as that of the covered work. - */ - -+#include <glib/gi18n.h> - #include "sliders.h" - #include "dbus/dbus.h" - #include "actions.h" -diff --git a/gnome/src/statusicon.c b/gnome/src/statusicon.c -index 2fe79ee..b94864c 100644 ---- a/gnome/src/statusicon.c -+++ b/gnome/src/statusicon.c -@@ -29,6 +29,7 @@ - * as that of the covered work. - */ - -+#include <glib/gi18n.h> - #include <gtk/gtk.h> - #include "actions.h" - #include "mainwindow.h" -diff --git a/gnome/src/uimanager.c b/gnome/src/uimanager.c -index 2953156..0ddac4b 100644 ---- a/gnome/src/uimanager.c -+++ b/gnome/src/uimanager.c -@@ -34,9 +34,10 @@ - #include "dbus/dbus.h" - #include "mainwindow.h" - #include "assistant.h" -+#include <glib.h> -+#include <glib/gi18n.h> - #include <gtk/gtk.h> - #include <string.h> --#include <glib.h> - - #include "uimanager.h" - #include "statusicon.h" --- -1.7.8.6 - diff --git a/net-voip/sflphone/files/sflphone-1.0.1-pjsip-1.14.patch b/net-voip/sflphone/files/sflphone-1.0.1-pjsip-1.14.patch deleted file mode 100644 index aa16bcab29fe..000000000000 --- a/net-voip/sflphone/files/sflphone-1.0.1-pjsip-1.14.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 0d66570e26c6bd728d00d251e592a4154c0c9d1c Mon Sep 17 00:00:00 2001 -From: Alexandre Savard <alexandre.savard@savoirfairelinux.com> -Date: Mon, 30 Jul 2012 12:12:45 -0400 -Subject: [PATCH] #13961: Fix cipher handling to be compatible with pjsip - 1.14.2 - -[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 1.0.1] ---- - daemon/src/sip/sipaccount.cpp | 24 ++++++++++++++++++++---- - daemon/src/sip/sipaccount.h | 7 +++++++ - 2 files changed, 27 insertions(+), 4 deletions(-) - -diff --git a/daemon/src/sip/sipaccount.cpp b/daemon/src/sip/sipaccount.cpp -index fdd4634..44d169f 100644 ---- a/daemon/src/sip/sipaccount.cpp -+++ b/daemon/src/sip/sipaccount.cpp -@@ -55,6 +55,7 @@ SIPAccount::SIPAccount(const std::string& accountID) - , transportType_(PJSIP_TRANSPORT_UNSPECIFIED) - , cred_(NULL) - , tlsSetting_() -+ , ciphers(100) - , stunServerName_() - , stunPort_(0) - , dtmfType_(OVERRTP) -@@ -145,7 +146,7 @@ void SIPAccount::serialize(Conf::YamlEmitter *emitter) - Conf::ScalarNode tlsport(portstr.str()); - Conf::ScalarNode certificate(tlsCertificateFile_); - Conf::ScalarNode calist(tlsCaListFile_); -- Conf::ScalarNode ciphers(tlsCiphers_); -+ Conf::ScalarNode ciphersNode(tlsCiphers_); - Conf::ScalarNode tlsenabled(tlsEnable_); - Conf::ScalarNode tlsmethod(tlsMethod_); - Conf::ScalarNode timeout(tlsNegotiationTimeoutSec_); -@@ -207,7 +208,7 @@ void SIPAccount::serialize(Conf::YamlEmitter *emitter) - tlsmap.setKeyValue(tlsPortKey, &tlsport); - tlsmap.setKeyValue(certificateKey, &certificate); - tlsmap.setKeyValue(calistKey, &calist); -- tlsmap.setKeyValue(ciphersKey, &ciphers); -+ tlsmap.setKeyValue(ciphersKey, &ciphersNode); - tlsmap.setKeyValue(tlsEnableKey, &tlsenabled); - tlsmap.setKeyValue(methodKey, &tlsmethod); - tlsmap.setKeyValue(timeoutKey, &timeout); -@@ -586,6 +587,18 @@ pjsip_ssl_method SIPAccount::sslMethodStringToPjEnum(const std::string& method) - - void SIPAccount::initTlsConfiguration() - { -+ pj_status_t status; -+ unsigned cipherNum; -+ -+ // Determine the cipher list supported on this machine -+ cipherNum = PJ_ARRAY_SIZE(ciphers); -+ status = pj_ssl_cipher_get_availables(&ciphers.front(), &cipherNum); -+ if (status != PJ_SUCCESS) { -+ ERROR("Could not determine cipher list on this system"); -+ } -+ -+ ciphers.resize(cipherNum); -+ - // TLS listener is unique and should be only modified through IP2IP_PROFILE - tlsListenerPort_ = tlsPort_; - -@@ -596,8 +609,8 @@ void SIPAccount::initTlsConfiguration() - pj_cstr(&tlsSetting_.privkey_file, tlsPrivateKeyFile_.c_str()); - pj_cstr(&tlsSetting_.password, tlsPassword_.c_str()); - tlsSetting_.method = sslMethodStringToPjEnum(tlsMethod_); -- pj_cstr(&tlsSetting_.ciphers, tlsCiphers_.c_str()); -- pj_cstr(&tlsSetting_.server_name, tlsServerName_.c_str()); -+ tlsSetting_.ciphers_num = ciphers.size(); -+ tlsSetting_.ciphers = &ciphers.front(); - - tlsSetting_.verify_server = tlsVerifyServer_ ? PJ_TRUE: PJ_FALSE; - tlsSetting_.verify_client = tlsVerifyClient_ ? PJ_TRUE: PJ_FALSE; -@@ -605,6 +618,9 @@ void SIPAccount::initTlsConfiguration() - - tlsSetting_.timeout.sec = atol(tlsNegotiationTimeoutSec_.c_str()); - tlsSetting_.timeout.msec = atol(tlsNegotiationTimeoutMsec_.c_str()); -+ -+ tlsSetting_.qos_type = PJ_QOS_TYPE_BEST_EFFORT; -+ tlsSetting_.qos_ignore_error = PJ_TRUE; - } - - void SIPAccount::initStunConfiguration() -diff --git a/daemon/src/sip/sipaccount.h b/daemon/src/sip/sipaccount.h -index 076fe60..7c2af13 100644 ---- a/daemon/src/sip/sipaccount.h -+++ b/daemon/src/sip/sipaccount.h -@@ -43,6 +43,8 @@ - #include "pjsip-ua/sip_regc.h" - #include "noncopyable.h" - -+typedef std::vector<pj_ssl_cipher> CipherArray; -+ - namespace Conf { - class YamlEmitter; - class MappingNode; -@@ -478,6 +480,11 @@ class SIPAccount : public Account { - // a sip transport. - pjsip_tls_setting tlsSetting_; - -+ /** -+ * Allocate a static array to be used by pjsip to store the supported ciphers on this system. -+ */ -+ CipherArray ciphers; -+ - // The STUN server name, if applicable for internal use only - pj_str_t stunServerName_; - --- -1.7.8.6 - diff --git a/net-voip/sflphone/metadata.xml b/net-voip/sflphone/metadata.xml index 946d6f8cae53..c5fc24eef2ec 100644 --- a/net-voip/sflphone/metadata.xml +++ b/net-voip/sflphone/metadata.xml @@ -2,14 +2,12 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>elvanor@gentoo.org</email> - <name>Jean-Noël Rivasseau</name> + <email>maintainer-needed@gentoo.org</email> </maintainer> <longdescription> SFLphone is a robust standards-compliant enterprise softphone, for desktop and embedded systems. It is designed to handle several hundreds of calls a day. SFLphone is available under the GNU GPL license, version 3. </longdescription> <use> <flag name="doxygen">Support for building documentation with doxygen</flag> - <flag name="iax">Support for IAX (Inter Asterisk eXchange)</flag> </use> </pkgmetadata> diff --git a/net-voip/sflphone/sflphone-0.9.8.4.ebuild b/net-voip/sflphone/sflphone-0.9.8.4.ebuild deleted file mode 100644 index 99920399d3f5..000000000000 --- a/net-voip/sflphone/sflphone-0.9.8.4.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/sflphone-0.9.8.4.ebuild,v 1.7 2011/03/21 23:20:39 nirbheek Exp $ - -EAPI="2" - -inherit autotools eutils - -DESCRIPTION="SFLphone is a robust standards-compliant enterprise softphone, for desktop and embedded systems." -HOMEPAGE="http://www.sflphone.org/" -SRC_URI="http://www.elvanor.net/files/gentoo/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="debug gnome gsm iax networkmanager speex" - -CDEPEND="media-sound/pulseaudio - media-libs/libsamplerate - net-libs/ccrtp - net-libs/libzrtpcpp - net-libs/pjsip - dev-cpp/commoncpp2 - sys-apps/dbus - dev-libs/openssl - dev-libs/expat - media-libs/alsa-lib - media-libs/celt - dev-libs/libpcre - gsm? ( media-sound/gsm ) - speex? ( media-libs/speex ) - networkmanager? ( net-misc/networkmanager ) - iax? ( net-libs/iax ) - gnome? ( dev-libs/atk - dev-libs/check - dev-libs/log4c - gnome-base/libgnomeui - gnome-base/orbit:2 - gnome-extra/evolution-data-server - media-libs/libart_lgpl - media-libs/freetype - media-libs/fontconfig - net-libs/libsoup:2.4 - x11-libs/cairo - x11-libs/libnotify - x11-libs/libICE - x11-libs/libSM )" - -DEPEND="${CDEPEND} - gnome? ( app-text/gnome-doc-utils )" - -RDEPEND="${CDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-libnotify-0.7.patch - - if ! use gnome; then - ewarn - ewarn "No clients selected. Use USE=gnome to get the gnome client." - ewarn "See" - ewarn "https://projects.savoirfairelinux.com/repositories/browse/sflphone/tools/pysflphone" - ewarn "for a python command line client." - ewarn - fi - - cd sflphone-common - #remove "target" from lib-names, remove dep to shipped pjsip - sed -i -e 's/-$(target)//' \ - -e '/^\t\t\t-L/ d' \ - -e 's!-I$(src)/libs/pjproject!-I/usr/include!' \ - globals.mak || die "sed failed." - #respect CXXFLAGS - sed -i -e 's/CXXFLAGS="-g/CXXFLAGS="-g $CXXFLAGS /' \ - configure.ac || die "sed failed." - rm -r libs/pjproject - eautoreconf - - #TODO: remove shipped dbus-c++ use system one (see #220767) - #TODO: remove shipped utilspp (from curlpp), use system one, see #55185 - - if use gnome; then - cd ../sflphone-client-gnome - #fix as-needed - sed -i -e "s/X11_LIBS)/X11_LIBS) -lebook-1.2/" src/Makefile.am || die "sed failed." - eautoreconf - fi -} - -src_configure() { - cd sflphone-common - econf --disable-dependency-tracking \ - $(use_with debug) \ - $(use_with gsm) \ - $(use_with speex) \ - $(use_with iax iax2) \ - $(use_with networkmanager) || die "econf failed." - - if use gnome; then - cd ../sflphone-client-gnome - econf || die "econf failed." - fi -} - -src_compile() { - cd sflphone-common - emake || die "emake failed." - - if use gnome; then - cd ../sflphone-client-gnome - emake || die "emake failed." - fi -} - -src_install() { - cd sflphone-common - emake -j1 DESTDIR="${D}" install || die "emake install failed" - dodoc test/sflphonedrc-sample - - if use gnome; then - cd ../sflphone-client-gnome - emake DESTDIR="${D}" install || die "emake install failed" - fi -} - -pkg_postinst() { - elog - elog "You need to restart dbus, if you want to access" - elog "sflphoned through dbus." - elog - elog - elog "If you use the command line client" - elog "(https://projects.savoirfairelinux.com/repositories/browse/sflphone/tools/pysflphone)" - elog "extract /usr/share/doc/${PF}/${PN}drc-sample to" - elog "~/.config/${PN}/${PN}drc for example config." - elog - elog - elog "For calls out of your browser have a look in sflphone-callto" - elog "and sflphone-handler. You should consider to install" - elog "the \"Telify\" Firefox addon. See" - elog "https://projects.savoirfairelinux.com/repositories/browse/sflphone/tools" - elog - if use gnome; then - elog - elog "sflphone-client-gnome: To manage your contacts you need" - elog "mail-client/evolution or access to an evolution-data-server" - elog "connected backend." - elog - fi -} diff --git a/net-voip/sflphone/sflphone-1.2.2.ebuild b/net-voip/sflphone/sflphone-1.2.2.ebuild deleted file mode 100644 index 2d05ff0d7941..000000000000 --- a/net-voip/sflphone/sflphone-1.2.2.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/sflphone-1.2.2.ebuild,v 1.2 2013/05/08 09:36:18 elvanor Exp $ - -EAPI="4" - -inherit autotools eutils gnome2 - -DESCRIPTION="SFLphone is a robust standards-compliant enterprise softphone, for desktop and embedded systems." -HOMEPAGE="http://www.sflphone.org/" -SRC_URI="http://www.elvanor.net/files/gentoo/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doxygen gnome gsm kde networkmanager pulseaudio speex static-libs" - -# USE="-iax" does not work. Upstream problem. - -CDEPEND="dev-cpp/commoncpp2 - dev-libs/dbus-c++ - dev-libs/expat - dev-libs/ilbc-rfc3951 - dev-libs/libpcre - dev-libs/libyaml - dev-libs/openssl - media-libs/alsa-lib - media-libs/celt - media-libs/libsamplerate - pulseaudio? ( media-sound/pulseaudio ) - net-libs/ccrtp - net-libs/libzrtpcpp - >=net-libs/pjsip-2.1 - sys-apps/dbus - gnome? ( dev-libs/atk - dev-libs/check - gnome-base/libgnomeui - gnome-base/orbit:2 - gnome-extra/evolution-data-server - media-libs/fontconfig - media-libs/freetype - media-libs/libart_lgpl - net-libs/libsoup:2.4 - net-libs/webkit-gtk:3 - x11-libs/cairo - x11-libs/libICE - x11-libs/libnotify - x11-libs/libSM ) - gsm? ( media-sound/gsm ) - networkmanager? ( net-misc/networkmanager ) - speex? ( media-libs/speex )" - -DEPEND="${CDEPEND} - >=dev-util/astyle-1.24 - doxygen? ( app-doc/doxygen ) - gnome? ( app-text/gnome-doc-utils ) - virtual/pkgconfig" - -RDEPEND="${CDEPEND}" - -pkg_setup() { - #if use gnome && use kde ; then - # elog "Both Gnome and KDE flags are set; preference goes to KDE. Only the KDE client will be built." - #fi - - if use kde; then - elog "The KDE client is not yet available with this ebuild and won't be built." - fi - - if ! use gnome; then - ewarn - ewarn "Select USE=gnome to get a graphicalclient." - ewarn "See" - ewarn "https://projects.savoirfairelinux.com/repositories/browse/sflphone/tools/pysflphone" - ewarn "for a python command line client." - ewarn - fi -} - -src_prepare() { - cd "${S}/daemon" - rm -rf libs/pjproject-2.0.1 - - sed -i -e 's!include $(src)/libs/pjproject-2.0.1/build.mak!!' src/audio/codecs/Makefile.in src/audio/codecs/Makefile.am - sed -i -e 's!--shared -lc $(top_srcdir)/libs/pjproject-2.0.1/third_party/lib/libilbccodec-$(TARGET_NAME).a!-lilbc!' src/audio/codecs/Makefile.am - sed -i -e 's/-$(target)//' -e '/^\t\t\t-L/ d' -e "s/PJSIP_LIBS=\$(APP_LDFLAGS) \$(APP_LDLIBS)/PJSIP_LIBS=$(pkg-config --libs-only-l libpjproject)/" \ - -e 's!-I$(src)/libs/pjproject-2.0.1!-I/usr/include!' -e 's!include $(src)/libs/pjproject-2.0.1/build.mak!!' \ - globals.mak || die "sed failed." - # Respect CXXFLAGS - sed -i -e 's/CXXFLAGS="-g/CXXFLAGS="-g $CXXFLAGS /' \ - configure.ac || die "sed failed." - eautoreconf -} - -src_configure() { - local myconf="" - if ! use pulseaudio; then - myconf="--without-pulse" - fi - - cd "${S}/daemon" - econf --disable-dependency-tracking $(use_with debug) $(use_with gsm) \ - $(use_with networkmanager) $(use_with speex) $(use_enable static-libs static) $(use_enable doxygen) ${myconf} - - #if use gnome && ! use kde; then - if use gnome; then - cd "${S}/gnome" - econf $(use_enable static-libs static) - fi - - #if use kde; then - # cd "${S}/kde" - # ./config.sh --prefix=/usr $(use_enable static-libs static) -# econf $(use_enable static-libs static) - #fi -} - -src_compile() { - cd "${S}/daemon" - emake || die "emake failed." - - #if use gnome && ! use kde; then - if use gnome; then - cd ../gnome - emake || die "emake failed." - fi - - #if use kde; then - # cd ../kde/build - # emake || die "emake failed." - #fi -} - -src_install() { - if use gnome; then - cd "${S}/gnome" - gnome2_src_install - fi - - #if use kde; then - # cd "${S}/kde" - # emake -j1 DESTDIR="${D}" install || die "emake install failed" - # cd ../ - #fi - - cd "${S}/daemon" - emake -j1 DESTDIR="${D}" install || die "emake install failed" - dodoc test/sflphonedrc-sample -} - -pkg_postinst() { - elog - elog "You need to restart dbus, if you want to access" - elog "sflphoned through dbus." - elog - elog - elog "If you use the command line client" - elog "(https://projects.savoirfairelinux.com/repositories/browse/sflphone/tools/pysflphone)" - elog "extract /usr/share/doc/${PF}/${PN}drc-sample to" - elog "~/.config/${PN}/${PN}drc for example config." - elog - elog - elog "For calls out of your browser have a look in sflphone-callto" - elog "and sflphone-handler. You should consider to install" - elog "the \"Telify\" Firefox addon. See" - elog "https://projects.savoirfairelinux.com/repositories/browse/sflphone/tools" - elog - if use gnome; then - gnome2_pkg_postinst - elog - elog "sflphone-client-gnome: To manage your contacts you need" - elog "mail-client/evolution or access to an evolution-data-server" - elog "connected backend." - elog - fi -} |