Hello community, here is the log from the commit of package twinkle for openSUSE:Factory checked in at 2016-11-04 21:00:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-09-01 14:03:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.twinkle.new/twinkle.changes 2016-11-04 21:00:46.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Oct 24 11:46:58 UTC 2016 - [email protected] + +- update to version 1.10.1 + * stability fixes (calling Qt methods from wrong thread) + * set PA role to phone to pause music playback automatically + * French translation updates + * remove obsolete commoncpp2 dependency +- DTMF-event-type-cleanup.patch: + drop (merged into upstream) +- Revert-Replaced-Boost-regex-dependency-with-C-11-reg.patch: + refresh + +------------------------------------------------------------------- Old: ---- DTMF-event-type-cleanup.patch twinkle-1.10~git20160520.tar.xz New: ---- twinkle-1.10.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ twinkle.spec ++++++ --- /var/tmp/diff_new_pack.XPtTER/_old 2016-11-04 21:00:47.000000000 +0100 +++ /var/tmp/diff_new_pack.XPtTER/_new 2016-11-04 21:00:47.000000000 +0100 @@ -17,7 +17,7 @@ Name: twinkle -Version: 1.10~git20160520 +Version: 1.10.1 Release: 0 Summary: A SIP Soft Phone License: GPL-2.0+ @@ -55,7 +55,6 @@ BuildRequires: ilbc %endif -Patch1: DTMF-event-type-cleanup.patch # workaround for broken std::regex in gcc 4.8; please keep at the end Patch91: Revert-Build-fix-for-a-probably-broken-std-match_res.patch Patch92: Revert-Replaced-Boost-regex-dependency-with-C-11-reg.patch @@ -67,7 +66,6 @@ %prep %setup -q -%patch1 -p1 # workaround for broken std::regex in gcc 4.8 %if 0%{?suse_version} <= 1320 %patch91 -p1 ++++++ Revert-Replaced-Boost-regex-dependency-with-C-11-reg.patch ++++++ --- /var/tmp/diff_new_pack.XPtTER/_old 2016-11-04 21:00:47.000000000 +0100 +++ /var/tmp/diff_new_pack.XPtTER/_new 2016-11-04 21:00:47.000000000 +0100 @@ -20,7 +20,7 @@ 9 files changed, 28 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d8841729dcf6..b6e2f92f0409 100644 +index 86a80330f2df..170fea8e1bbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,7 @@ find_package(LibSndfile REQUIRED) @@ -28,15 +28,15 @@ find_package(BISON REQUIRED) find_package(FLEX REQUIRED) +find_package(Boost REQUIRED COMPONENTS regex) + find_package(Ucommon REQUIRED) find_package(Commoncpp REQUIRED) find_package(Ccrtp REQUIRED) - find_package(Ucommon REQUIRED) diff --git a/README.md b/README.md -index 34d690865f8c..c539cf76b8d0 100644 +index 6c1ea7a70133..0bce84bd3f0b 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ To compile Twinkle you need the following libraries: - * commoncpp2 and ucommon (version >= 1.4.2) - [GNU Common C++](http://www.gnu.org/software/commoncpp/) + * ucommon [GNU uCommon C++](http://www.gnu.org/software/commoncpp/) * ccRTP (version >= 1.5.0) [GNU RTP Stack](http://www.gnu.org/software/ccrtp/) * libxml2 +* Boost regex @@ -56,10 +56,10 @@ ${G729_LIBRARY} ) diff --git a/src/call_history.cpp b/src/call_history.cpp -index cf9ff5cbebd4..4fa4af789f11 100644 +index c2d135b17e27..df662bc341f3 100644 --- a/src/call_history.cpp +++ b/src/call_history.cpp -@@ -296,9 +296,9 @@ bool t_call_record::populate_from_file_record(const vector<string> &v) { +@@ -295,9 +295,9 @@ bool t_call_record::populate_from_file_record(const vector<string> &v) { // Check number of fields if (v.size() != 20) return false; @@ -88,20 +88,20 @@ tr("Invalid regular expression.").toStdString(), MSG_CRITICAL); exprLineEdit->setFocus(); diff --git a/src/gui/userprofileform.cpp b/src/gui/userprofileform.cpp -index 788d87b1b983..d7f39a0091ac 100644 +index f20a0d9faece..978dd07ddea4 100644 --- a/src/gui/userprofileform.cpp +++ b/src/gui/userprofileform.cpp -@@ -598,7 +598,7 @@ void UserProfileForm::populate() +@@ -597,7 +597,7 @@ void UserProfileForm::populate() int j = 0; - for (list<t_number_conversion>::reverse_iterator i = conversions.rbegin(); i != conversions.rend(); i++, j++) + for (list<t_number_conversion>::iterator i = conversions.begin(); i != conversions.end(); i++, j++) { - QTableWidgetItem* item = new QTableWidgetItem(QString::fromStdString(i->re)); + QTableWidgetItem* item = new QTableWidgetItem(QString::fromStdString(i->re.str())); conversionListView->setItem(j, 0, item); item = new QTableWidgetItem(QString::fromStdString(i->fmt)); conversionListView->setItem(j, 1, item); -@@ -712,7 +712,7 @@ list<t_number_conversion> UserProfileForm::get_number_conversions() - item = conversionListView->item(0, 1); +@@ -711,7 +711,7 @@ list<t_number_conversion> UserProfileForm::get_number_conversions() + item = conversionListView->item(i, 1); c.fmt = item->text().toStdString(); conversions.push_back(c); - } catch (std::regex_error) { @@ -110,10 +110,10 @@ // checked already. Just being defensive here. } diff --git a/src/mwi/simple_msg_sum_body.cpp b/src/mwi/simple_msg_sum_body.cpp -index 1d206092009e..33683f7a07ee 100644 +index b42be6ac70f0..ab2a9fd510c0 100644 --- a/src/mwi/simple_msg_sum_body.cpp +++ b/src/mwi/simple_msg_sum_body.cpp -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ #include <iostream> #include <cstdlib> @@ -122,7 +122,7 @@ #include "protocol.h" #include "util.h" -@@ -43,20 +43,20 @@ bool t_msg_summary::parse(const string &s) { +@@ -42,20 +42,20 @@ bool t_msg_summary::parse(const string &s) { // msg-summary-line = message-context-class HCOLON newmsgs SLASH oldmsgs // [ LPAREN new-urgentmsgs SLASH old-urgentmsgs RPAREN ] // This regex matches the part after HCOLON @@ -153,10 +153,10 @@ } diff --git a/src/user.cpp b/src/user.cpp -index 206cf7ef1719..a6a2a95a7c5e 100644 +index 464bd8823451..6a4731789b40 100644 --- a/src/user.cpp +++ b/src/user.cpp -@@ -309,7 +309,7 @@ bool t_user::parse_num_conversion(const string &value, t_number_conversion &c) { +@@ -308,7 +308,7 @@ bool t_user::parse_num_conversion(const string &value, t_number_conversion &c) { try { c.re.assign(l[0]); c.fmt = l[1]; @@ -165,7 +165,7 @@ // Invalid regular expression log_file->write_header("t_user::parse_num_conversion", LOG_NORMAL, LOG_WARNING); -@@ -2832,7 +2832,7 @@ bool t_user::write_config(const string &filename, string &error_msg) { +@@ -2831,7 +2831,7 @@ bool t_user::write_config(const string &filename, string &error_msg) { i != number_conversions.end(); i++) { config << FLD_NUMBER_CONVERSION << '='; @@ -174,7 +174,7 @@ config << ','; config << escape(i->fmt, ','); config << endl; -@@ -3101,10 +3101,10 @@ string t_user::convert_number(const string &number, const list<t_number_conversi +@@ -3100,10 +3100,10 @@ string t_user::convert_number(const string &number, const list<t_number_conversi for (list<t_number_conversion>::const_iterator i = l.begin(); i != l.end(); i++) { @@ -188,10 +188,10 @@ log_file->write_header("t_user::convert_number", diff --git a/src/user.h b/src/user.h -index 2e9c2ca9b2a6..f78652d4a35b 100644 +index df1fd0d8f6e4..eb6c2fdc7d63 100644 --- a/src/user.h +++ b/src/user.h -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ #include "audio/audio_codecs.h" #include "sockets/url.h" #include "threads/mutex.h" @@ -200,7 +200,7 @@ // Forward declaration class t_request; -@@ -91,10 +91,10 @@ enum t_g726_packing { +@@ -90,10 +90,10 @@ enum t_g726_packing { }; struct t_number_conversion { @@ -215,5 +215,5 @@ -- -2.8.2 +2.10.1 ++++++ twinkle-1.10~git20160520.tar.xz -> twinkle-1.10.1.tar.xz ++++++ ++++ 5512 lines of diff (skipped)
