Hello community, here is the log from the commit of package twinkle for openSUSE:Factory checked in at Tue Sep 27 16:06:11 CEST 2011.
-------- --- twinkle/twinkle.changes 2011-07-24 18:53:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/twinkle/twinkle.changes 2011-09-27 12:58:17.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Sep 27 10:33:57 UTC 2011 - [email protected] + +- fix build with newer ld + +------------------------------------------------------------------- +Sat Aug 20 07:19:50 UTC 2011 - [email protected] + +- Fix BuildRequires to fetch the new libzrtpcpp2 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ twinkle.spec ++++++ --- /var/tmp/diff_new_pack.GDrL9O/_old 2011-09-27 16:06:07.000000000 +0200 +++ /var/tmp/diff_new_pack.GDrL9O/_new 2011-09-27 16:06:07.000000000 +0200 @@ -21,7 +21,8 @@ # BR's in openSUSE: BuildRequires: bison boost-devel file-devel kdelibs3-devel libsndfile-devel qt3-devel-tools readline-devel xorg-x11-devel # BR's in network:telephony -BuildRequires: libzrtpcpp-devel >= 2.0.0 speex-devel +BuildRequires: libzrtpcpp-devel >= 2.0.0 +BuildRequires: speex-devel Summary: A SIP Soft Phone Version: 1.4.2 Release: 14 @@ -36,10 +37,6 @@ Twinkle is a SIP-based soft phone for making telephone calls over IP networks. -Authors: --------- - Michel de Boer <[email protected]> - %prep %setup -q %patch0 -p1 ++++++ twinkle-ucommon.diff ++++++ --- /var/tmp/diff_new_pack.GDrL9O/_old 2011-09-27 16:06:07.000000000 +0200 +++ /var/tmp/diff_new_pack.GDrL9O/_new 2011-09-27 16:06:07.000000000 +0200 @@ -1,8 +1,8 @@ -diff --git a/configure.in b/configure.in -index edd4953..1b52117 100644 ---- a/configure.in -+++ b/configure.in -@@ -47,7 +47,7 @@ AC_CHECK_HEADERS([linux/errqueue.h],[],[],[ +Index: twinkle-1.4.2/configure.in +=================================================================== +--- twinkle-1.4.2.orig/configure.in 2009-02-24 20:49:20.000000000 +0100 ++++ twinkle-1.4.2/configure.in 2011-09-27 12:33:39.787913055 +0200 +@@ -47,7 +47,7 @@ AC_CHECK_HEADERS([linux/errqueue.h],[],[ # Check version of the Common C++ library. # This also sets the cc++2 include directory in CXXFLAGS @@ -31,7 +31,7 @@ echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO # get libraries specified on command line -@@ -144,6 +146,7 @@ echo $LDFLAGS | xargs echo LIBS += >> $QT_INCL_PRO +@@ -144,6 +146,7 @@ echo $LDFLAGS | xargs echo LIBS += >> $Q echo "LIBS += `$CCGNU2_CONFIG --stdlibs`" >> $QT_INCL_PRO echo "LIBS += $CCRTP_LIBS" >> $QT_INCL_PRO @@ -48,10 +48,10 @@ AC_CHECK_LIB(zrtpcpp, main, [ AC_CHECK_HEADER(libzrtpcpp/ZrtpQueue.h, [], [AC_MSG_ERROR([zrtp header files missing])]) -diff --git a/src/audio/audio_decoder.h b/src/audio/audio_decoder.h -index 5fa9c55..cee198f 100644 ---- a/src/audio/audio_decoder.h -+++ b/src/audio/audio_decoder.h +Index: twinkle-1.4.2/src/audio/audio_decoder.h +=================================================================== +--- twinkle-1.4.2.orig/src/audio/audio_decoder.h 2009-01-03 17:53:58.000000000 +0100 ++++ twinkle-1.4.2/src/audio/audio_decoder.h 2011-09-27 12:33:39.790913085 +0200 @@ -21,7 +21,6 @@ #ifndef _AUDIO_DECODER_H #define _AUDIO_DECODER_H @@ -60,10 +60,10 @@ #include "twinkle_config.h" #include "audio_codecs.h" #include "user.h" -diff --git a/src/audio/audio_encoder.h b/src/audio/audio_encoder.h -index d280567..e2fb874 100644 ---- a/src/audio/audio_encoder.h -+++ b/src/audio/audio_encoder.h +Index: twinkle-1.4.2/src/audio/audio_encoder.h +=================================================================== +--- twinkle-1.4.2.orig/src/audio/audio_encoder.h 2009-01-03 17:53:58.000000000 +0100 ++++ twinkle-1.4.2/src/audio/audio_encoder.h 2011-09-27 12:33:39.790913085 +0200 @@ -21,7 +21,6 @@ #ifndef _AUDIO_ENCODER_H #define _AUDIO_ENCODER_H @@ -72,10 +72,10 @@ #include "twinkle_config.h" #include "audio_codecs.h" #include "user.h" -diff --git a/src/audio/audio_rx.cpp b/src/audio/audio_rx.cpp -index bb6db2b..db6d4f3 100644 ---- a/src/audio/audio_rx.cpp -+++ b/src/audio/audio_rx.cpp +Index: twinkle-1.4.2/src/audio/audio_rx.cpp +=================================================================== +--- twinkle-1.4.2.orig/src/audio/audio_rx.cpp 2009-01-31 13:05:53.000000000 +0100 ++++ twinkle-1.4.2/src/audio/audio_rx.cpp 2011-09-27 12:33:39.791913095 +0200 @@ -22,7 +22,6 @@ #include <cstdlib> #include <sys/types.h> @@ -84,10 +84,10 @@ #include "audio_rx.h" #include "log.h" -diff --git a/src/audio/dtmf_player.h b/src/audio/dtmf_player.h -index 5fa88db..0145289 100644 ---- a/src/audio/dtmf_player.h -+++ b/src/audio/dtmf_player.h +Index: twinkle-1.4.2/src/audio/dtmf_player.h +=================================================================== +--- twinkle-1.4.2.orig/src/audio/dtmf_player.h 2009-01-03 17:53:58.000000000 +0100 ++++ twinkle-1.4.2/src/audio/dtmf_player.h 2011-09-27 12:33:39.791913095 +0200 @@ -21,7 +21,6 @@ #ifndef _DTMF_PLAYER_H #define _DTMF_PLAYER_H @@ -96,10 +96,10 @@ #include "twinkle_config.h" #include "audio_encoder.h" #include "freq_gen.h" -diff --git a/src/audio/freq_gen.h b/src/audio/freq_gen.h -index 5659739..6817baa 100644 ---- a/src/audio/freq_gen.h -+++ b/src/audio/freq_gen.h +Index: twinkle-1.4.2/src/audio/freq_gen.h +=================================================================== +--- twinkle-1.4.2.orig/src/audio/freq_gen.h 2009-01-03 17:53:58.000000000 +0100 ++++ twinkle-1.4.2/src/audio/freq_gen.h 2011-09-27 12:33:39.791913095 +0200 @@ -26,7 +26,7 @@ #define _FREQ_GEN_H @@ -109,10 +109,10 @@ using namespace std; -diff --git a/src/audio/tone_gen.h b/src/audio/tone_gen.h -index 1323fd4..a789734 100644 ---- a/src/audio/tone_gen.h -+++ b/src/audio/tone_gen.h +Index: twinkle-1.4.2/src/audio/tone_gen.h +=================================================================== +--- twinkle-1.4.2.orig/src/audio/tone_gen.h 2009-01-03 17:53:58.000000000 +0100 ++++ twinkle-1.4.2/src/audio/tone_gen.h 2011-09-27 12:33:39.792913104 +0200 @@ -21,7 +21,6 @@ #include <string> @@ -121,10 +121,10 @@ #include <sndfile.h> #include "sys_settings.h" #include "threads/mutex.h" -diff --git a/src/call_script.h b/src/call_script.h -index 4253bda..db19987 100644 ---- a/src/call_script.h -+++ b/src/call_script.h +Index: twinkle-1.4.2/src/call_script.h +=================================================================== +--- twinkle-1.4.2.orig/src/call_script.h 2009-01-03 17:54:01.000000000 +0100 ++++ twinkle-1.4.2/src/call_script.h 2011-09-27 12:33:39.792913104 +0200 @@ -65,7 +65,6 @@ #include <vector> @@ -133,10 +133,10 @@ #include "user.h" #include "parser/request.h" -diff --git a/src/log.cpp b/src/log.cpp -index ee2ce87..136afd3 100644 ---- a/src/log.cpp -+++ b/src/log.cpp +Index: twinkle-1.4.2/src/log.cpp +=================================================================== +--- twinkle-1.4.2.orig/src/log.cpp 2009-01-18 15:35:28.000000000 +0100 ++++ twinkle-1.4.2/src/log.cpp 2011-09-27 12:33:39.792913104 +0200 @@ -40,6 +40,7 @@ void *main_logview(void *arg) { // TODO: handle situation where log file was zapped. if (ui) ui->cb_log_updated(false); @@ -145,7 +145,7 @@ } bool t_log::move_current_to_old(void) { -@@ -161,7 +162,7 @@ void t_log::write_header(const string &func_name, t_log_class log_class, +@@ -161,7 +162,7 @@ void t_log::write_header(const string &f gettimeofday(&t, NULL); date = t.tv_sec; @@ -154,20 +154,20 @@ *log_stream << "+++ "; *log_stream << tm.tm_mday; -diff --git a/src/mwi/mwi_dialog.cpp b/src/mwi/mwi_dialog.cpp -index 41ca0dd..135a866 100644 ---- a/src/mwi/mwi_dialog.cpp -+++ b/src/mwi/mwi_dialog.cpp -@@ -32,4 +32,5 @@ t_mwi_dialog::t_mwi_dialog(t_phone_user *_phone_user) : +Index: twinkle-1.4.2/src/mwi/mwi_dialog.cpp +=================================================================== +--- twinkle-1.4.2.orig/src/mwi/mwi_dialog.cpp 2009-01-03 17:54:03.000000000 +0100 ++++ twinkle-1.4.2/src/mwi/mwi_dialog.cpp 2011-09-27 12:33:39.793913113 +0200 +@@ -32,4 +32,5 @@ t_mwi_dialog::t_mwi_dialog(t_phone_user t_mwi_dialog *t_mwi_dialog::copy(void) { // Copy is not needed. assert(false); + return NULL; } -diff --git a/src/mwi/simple_msg_sum_body.h b/src/mwi/simple_msg_sum_body.h -index 48f7584..346626f 100644 ---- a/src/mwi/simple_msg_sum_body.h -+++ b/src/mwi/simple_msg_sum_body.h +Index: twinkle-1.4.2/src/mwi/simple_msg_sum_body.h +=================================================================== +--- twinkle-1.4.2.orig/src/mwi/simple_msg_sum_body.h 2009-01-03 17:53:57.000000000 +0100 ++++ twinkle-1.4.2/src/mwi/simple_msg_sum_body.h 2011-09-27 12:33:39.793913113 +0200 @@ -26,7 +26,6 @@ #include <string> @@ -176,11 +176,11 @@ #include "parser/sip_body.h" #include "sockets/url.h" -diff --git a/src/parser/definitions.cpp b/src/parser/definitions.cpp -index c849553..ef2e51d 100644 ---- a/src/parser/definitions.cpp -+++ b/src/parser/definitions.cpp -@@ -38,6 +38,7 @@ string method2str(const t_method &m, const string &unknown) { +Index: twinkle-1.4.2/src/parser/definitions.cpp +=================================================================== +--- twinkle-1.4.2.orig/src/parser/definitions.cpp 2009-01-03 17:54:07.000000000 +0100 ++++ twinkle-1.4.2/src/parser/definitions.cpp 2011-09-27 12:33:39.793913113 +0200 +@@ -38,6 +38,7 @@ string method2str(const t_method &m, con case METHOD_UNKNOWN: return unknown; default: assert(false); } @@ -188,10 +188,10 @@ } t_method str2method(const string &s) { -diff --git a/src/parser/request.cpp b/src/parser/request.cpp -index 1e678d4..9ee3d75 100644 ---- a/src/parser/request.cpp -+++ b/src/parser/request.cpp +Index: twinkle-1.4.2/src/parser/request.cpp +=================================================================== +--- twinkle-1.4.2.orig/src/parser/request.cpp 2009-01-18 15:06:11.000000000 +0100 ++++ twinkle-1.4.2/src/parser/request.cpp 2011-09-27 12:33:39.794913123 +0200 @@ -23,9 +23,11 @@ #include "milenage.h" #include "audits/memman.h" @@ -206,7 +206,7 @@ // AKAv1-MD5 algorithm specific helpers -@@ -148,10 +150,10 @@ int b64_dec(const u8 * src, u8 * dst, int len) +@@ -148,10 +150,10 @@ int b64_dec(const u8 * src, u8 * dst, in // authentication with AKAv1-MD5 algorithm (RFC 3310) bool t_request::authorize_akav1_md5(const t_digest_challenge &dchlg, @@ -220,7 +220,7 @@ { u8 nonce64[B64_DEC_SZ(dchlg.nonce.size())]; int len = b64_dec((const u8 *)dchlg.nonce.c_str(), nonce64, dchlg.nonce.size()); -@@ -183,7 +185,7 @@ bool t_request::authorize_akav1_md5(const t_digest_challenge &dchlg, +@@ -183,7 +185,7 @@ bool t_request::authorize_akav1_md5(cons for (i=0; i < AKA_SQNLEN; i++) sqn[i] = sqnxoraka[i] ^ ak[i]; @@ -229,7 +229,7 @@ return authorize_md5(dchlg, username, res_str, nc, cnonce, qop, resp, fail_reason); -@@ -192,11 +194,11 @@ bool t_request::authorize_akav1_md5(const t_digest_challenge &dchlg, +@@ -192,11 +194,11 @@ bool t_request::authorize_akav1_md5(cons // authentication with MD5 algorithm bool t_request::authorize_md5(const t_digest_challenge &dchlg, @@ -245,7 +245,7 @@ // RFC 2617 3.2.2.2 A1 = username + ":" + dchlg.realm + ":" + passwd; -@@ -207,60 +209,51 @@ bool t_request::authorize_md5(const t_digest_challenge &dchlg, +@@ -207,60 +209,51 @@ bool t_request::authorize_md5(const t_di A2 = method2str(method, unknown_method) + ":" + uri.encode(); A2 += ":"; if (body) { @@ -275,13 +275,14 @@ - MD5Digest MD5A2; - ostringstream HA1; - ostringstream HA2; -+ digest_t MD5A1 = "md5"; -+ digest_t MD5A2 = "md5"; - +- - MD5A1 << A1; - MD5A2 << A2; - HA1 << MD5A1; - HA2 << MD5A2; ++ digest_t MD5A1 = "md5"; ++ digest_t MD5A2 = "md5"; ++ + MD5A1.puts(A1.c_str()); + MD5A2.puts(A2.c_str()); @@ -328,7 +329,7 @@ { // Only Digest authentication is supported if (cmp_nocase(chlg.auth_scheme, AUTH_DIGEST) != 0) { -@@ -271,17 +264,17 @@ bool t_request::authorize(const t_challenge &chlg, t_user *user_config, +@@ -271,17 +264,17 @@ bool t_request::authorize(const t_challe const t_digest_challenge &dchlg = chlg.digest_challenge; @@ -349,7 +350,7 @@ dchlg.qop_options.begin(), dchlg.qop_options.end(), QOP_AUTH); if (j != dchlg.qop_options.end()) -@@ -297,7 +290,7 @@ bool t_request::authorize(const t_challenge &chlg, t_user *user_config, +@@ -297,7 +290,7 @@ bool t_request::authorize(const t_challe } bool ret = false; @@ -358,7 +359,7 @@ if (cmp_nocase(dchlg.algorithm, ALG_MD5) == 0) { ret = authorize_md5(dchlg, username, passwd, nc, cnonce, -@@ -359,15 +352,15 @@ t_request::t_request(const t_method m) : t_sip_message() { +@@ -359,15 +352,15 @@ t_request::t_request(const t_method m) : method = m; } @@ -377,7 +378,7 @@ s = method2str(method, unknown_method) + ' ' + uri.encode(); s += " SIP/"; -@@ -377,9 +370,9 @@ string t_request::encode(bool add_content_length) { +@@ -377,9 +370,9 @@ string t_request::encode(bool add_conten return s; } @@ -390,7 +391,7 @@ s = "SIPREQUEST_METHOD="; s += method2str(method, unknown_method); -@@ -431,7 +424,7 @@ void t_request::set_route(const t_url &target_uri, const list<t_route> &route_se +@@ -431,7 +424,7 @@ void t_request::set_route(const t_url &t } } @@ -399,7 +400,7 @@ { t_response *r; -@@ -458,7 +451,7 @@ t_response *t_request::create_response(int code, string reason) const +@@ -458,7 +451,7 @@ t_response *t_request::create_response(i return r; } @@ -408,7 +409,7 @@ if (!t_sip_message::is_valid(fatal, reason)) return false; fatal = false; -@@ -702,8 +695,8 @@ void t_request::set_destination(const t_ip_port &ip_port) { +@@ -702,8 +695,8 @@ void t_request::set_destination(const t_ } bool t_request::www_authorize(const t_challenge &chlg, t_user *user_config, @@ -419,7 +420,7 @@ { if (!authorize(chlg, user_config, username, passwd, nc, cnonce, cr, fail_reason)) { return false; -@@ -715,8 +708,8 @@ bool t_request::www_authorize(const t_challenge &chlg, t_user *user_config, +@@ -715,8 +708,8 @@ bool t_request::www_authorize(const t_ch } bool t_request::proxy_authorize(const t_challenge &chlg, t_user *user_config, @@ -430,10 +431,10 @@ { if (!authorize(chlg, user_config, username, passwd, nc, cnonce, cr, fail_reason)) { return false; -diff --git a/src/parser/sip_body.h b/src/parser/sip_body.h -index 88c93a7..a63115b 100644 ---- a/src/parser/sip_body.h -+++ b/src/parser/sip_body.h +Index: twinkle-1.4.2/src/parser/sip_body.h +=================================================================== +--- twinkle-1.4.2.orig/src/parser/sip_body.h 2009-01-03 17:54:00.000000000 +0100 ++++ twinkle-1.4.2/src/parser/sip_body.h 2011-09-27 12:33:39.794913123 +0200 @@ -20,7 +20,7 @@ #ifndef _H_SIP_BODY #define _H_SIP_BODY @@ -443,21 +444,21 @@ #include <string> #include <libxml/tree.h> -diff --git a/src/presence/presence_dialog.cpp b/src/presence/presence_dialog.cpp -index f281493..070dbc2 100644 ---- a/src/presence/presence_dialog.cpp -+++ b/src/presence/presence_dialog.cpp -@@ -32,4 +32,5 @@ t_presence_dialog::t_presence_dialog(t_phone_user *_phone_user, t_presence_state +Index: twinkle-1.4.2/src/presence/presence_dialog.cpp +=================================================================== +--- twinkle-1.4.2.orig/src/presence/presence_dialog.cpp 2009-01-03 17:54:07.000000000 +0100 ++++ twinkle-1.4.2/src/presence/presence_dialog.cpp 2011-09-27 12:33:39.849913648 +0200 +@@ -32,4 +32,5 @@ t_presence_dialog::t_presence_dialog(t_p t_presence_dialog *t_presence_dialog::copy(void) { // Copy is not needed. assert(false); + return NULL; } -diff --git a/src/sdp/sdp.cpp b/src/sdp/sdp.cpp -index 7d5de3b..3c9a93d 100644 ---- a/src/sdp/sdp.cpp -+++ b/src/sdp/sdp.cpp -@@ -37,6 +37,7 @@ string sdp_ntwk_type2str(t_sdp_ntwk_type n) { +Index: twinkle-1.4.2/src/sdp/sdp.cpp +=================================================================== +--- twinkle-1.4.2.orig/src/sdp/sdp.cpp 2009-01-03 17:54:03.000000000 +0100 ++++ twinkle-1.4.2/src/sdp/sdp.cpp 2011-09-27 12:33:39.850913659 +0200 +@@ -37,6 +37,7 @@ string sdp_ntwk_type2str(t_sdp_ntwk_type default: assert(false); } @@ -465,7 +466,7 @@ } t_sdp_ntwk_type str2sdp_ntwk_type(string s) { -@@ -53,6 +54,7 @@ string sdp_addr_type2str(t_sdp_addr_type a) { +@@ -53,6 +54,7 @@ string sdp_addr_type2str(t_sdp_addr_type default: assert(false); } @@ -473,7 +474,7 @@ } t_sdp_addr_type str2sdp_addr_type(string s) { -@@ -69,6 +71,7 @@ string sdp_transport2str(t_sdp_transport t) { +@@ -69,6 +71,7 @@ string sdp_transport2str(t_sdp_transport default: assert(false); } @@ -481,7 +482,7 @@ } t_sdp_transport str2sdp_transport(string s) { -@@ -92,6 +95,7 @@ string sdp_media_type2str(t_sdp_media_type m) { +@@ -92,6 +95,7 @@ string sdp_media_type2str(t_sdp_media_ty default: assert(false); } @@ -489,7 +490,7 @@ } string get_rtpmap(unsigned format, t_audio_codec codec) { -@@ -153,6 +157,7 @@ string sdp_media_direction2str(t_sdp_media_direction d) { +@@ -153,6 +157,7 @@ string sdp_media_direction2str(t_sdp_med default: assert(false); } @@ -497,10 +498,10 @@ } /////////////////////////////////// -diff --git a/src/sequence_number.h b/src/sequence_number.h -index c192012..6119506 100644 ---- a/src/sequence_number.h -+++ b/src/sequence_number.h +Index: twinkle-1.4.2/src/sequence_number.h +=================================================================== +--- twinkle-1.4.2.orig/src/sequence_number.h 2009-01-03 17:53:58.000000000 +0100 ++++ twinkle-1.4.2/src/sequence_number.h 2011-09-27 12:33:39.850913659 +0200 @@ -24,7 +24,6 @@ #ifndef _SEQUENCE_NUMBER_H #define _SEQUENCE_NUMBER_H @@ -509,11 +510,11 @@ /** * Sequence numbers. -diff --git a/src/sys_settings.cpp b/src/sys_settings.cpp -index 36e7142..9a9ee11 100644 ---- a/src/sys_settings.cpp -+++ b/src/sys_settings.cpp -@@ -1064,7 +1064,7 @@ string t_sys_settings::about(bool html) const { +Index: twinkle-1.4.2/src/sys_settings.cpp +=================================================================== +--- twinkle-1.4.2.orig/src/sys_settings.cpp 2009-02-11 22:46:13.000000000 +0100 ++++ twinkle-1.4.2/src/sys_settings.cpp 2011-09-27 12:33:39.851913671 +0200 +@@ -1064,7 +1064,7 @@ string t_sys_settings::about(bool html) if (html) s += "<BR>"; s += "\n"; @@ -522,21 +523,21 @@ if (html) s += "<BR><BR>"; s += "\n\n"; -diff --git a/src/timekeeper.cpp b/src/timekeeper.cpp -index 9a1a515..88983e1 100644 ---- a/src/timekeeper.cpp -+++ b/src/timekeeper.cpp +Index: twinkle-1.4.2/src/timekeeper.cpp +=================================================================== +--- twinkle-1.4.2.orig/src/timekeeper.cpp 2009-01-18 15:45:26.000000000 +0100 ++++ twinkle-1.4.2/src/timekeeper.cpp 2011-09-27 12:33:39.851913671 +0200 @@ -782,4 +782,5 @@ void *timekeeper_sigwait(void *arg) { if (sigwait(&sigset, &sig) == EINTR) continue; evq_timekeeper->interrupt(); } + return NULL; } -diff --git a/src/user.cpp b/src/user.cpp -index 224e291..b3de725 100644 ---- a/src/user.cpp -+++ b/src/user.cpp -@@ -225,6 +225,7 @@ string t_user::bit_rate_type2str(t_bit_rate_type b) const { +Index: twinkle-1.4.2/src/user.cpp +=================================================================== +--- twinkle-1.4.2.orig/src/user.cpp 2009-02-24 21:33:16.000000000 +0100 ++++ twinkle-1.4.2/src/user.cpp 2011-09-27 12:33:39.852913682 +0200 +@@ -225,6 +225,7 @@ string t_user::bit_rate_type2str(t_bit_r default: assert(false); } @@ -544,7 +545,7 @@ } t_dtmf_transport t_user::str2dtmf_transport(const string &s) const { -@@ -244,6 +245,7 @@ string t_user::dtmf_transport2str(t_dtmf_transport d) const { +@@ -244,6 +245,7 @@ string t_user::dtmf_transport2str(t_dtmf default: assert(false); } @@ -552,7 +553,7 @@ } t_g726_packing t_user::str2g726_packing(const string &s) const { -@@ -259,6 +261,7 @@ string t_user::g726_packing2str(t_g726_packing packing) const { +@@ -259,6 +261,7 @@ string t_user::g726_packing2str(t_g726_p default: assert(false); } @@ -560,7 +561,7 @@ } t_sip_transport t_user::str2sip_transport(const string &s) const { -@@ -276,6 +279,7 @@ string t_user::sip_transport2str(t_sip_transport transport) const { +@@ -276,6 +279,7 @@ string t_user::sip_transport2str(t_sip_t default: assert(false); } @@ -568,10 +569,10 @@ } string t_user::expand_filename(const string &filename) { -diff --git a/src/user.h b/src/user.h -index 94c015a..f78652d 100644 ---- a/src/user.h -+++ b/src/user.h +Index: twinkle-1.4.2/src/user.h +=================================================================== +--- twinkle-1.4.2.orig/src/user.h 2009-02-18 22:14:52.000000000 +0100 ++++ twinkle-1.4.2/src/user.h 2011-09-27 12:33:39.853913692 +0200 @@ -25,7 +25,6 @@ #include <string> @@ -580,10 +581,10 @@ #include "protocol.h" #include "sys_settings.h" #include "audio/audio_codecs.h" -diff --git a/src/util.h b/src/util.h -index b2509df..2f246da 100644 ---- a/src/util.h -+++ b/src/util.h +Index: twinkle-1.4.2/src/util.h +=================================================================== +--- twinkle-1.4.2.orig/src/util.h 2009-01-18 16:01:53.000000000 +0100 ++++ twinkle-1.4.2/src/util.h 2011-09-27 12:33:39.853913692 +0200 @@ -26,7 +26,7 @@ #include <vector> @@ -593,3 +594,16 @@ using namespace std; +Index: twinkle-1.4.2/src/gui/twinkle.pro +=================================================================== +--- twinkle-1.4.2.orig/src/gui/twinkle.pro 2009-02-25 21:14:55.000000000 +0100 ++++ twinkle-1.4.2/src/gui/twinkle.pro 2011-09-27 12:33:51.309024215 +0200 +@@ -3,7 +3,7 @@ LANGUAGE = C++ + + CONFIG += qt warn_on release thread + +-LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a ../im/libim.a ../patterns/libpatterns.a ../presence/libpresence.a ../utils/libutils.a -lsndfile -lmagic -lncurses -lreadline ++LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a ../im/libim.a ../patterns/libpatterns.a ../presence/libpresence.a ../utils/libutils.a -lsndfile -lmagic -lncurses -lreadline -lkio + + DEFINES += QT_NO_STL + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
