commit twinkle for openSUSE:Factory
Hello community,
here is the log from the commit of package twinkle for openSUSE:Factory checked
in at 2019-11-08 15:28:46
Comparing /work/SRC/openSUSE:Factory/twinkle (Old)
and /work/SRC/openSUSE:Factory/.twinkle.new.2990 (New)
Package is "twinkle"
Fri Nov 8 15:28:46 2019 rev:44 rq:746583 version:1.10.2
Changes:
--- /work/SRC/openSUSE:Factory/twinkle/twinkle.changes 2019-07-11
13:16:58.802794107 +0200
+++ /work/SRC/openSUSE:Factory/.twinkle.new.2990/twinkle.changes
2019-11-08 15:28:49.987199368 +0100
@@ -1,0 +2,17 @@
+Fri Nov 8 10:04:57 UTC 2019 - Michal Kubecek
+
+- one more twinkle -> %{name} cleanup in specfile
+
+---
+Fri Nov 8 09:27:07 UTC 2019 - Michal Kubecek
+
+- enable G.729 support (with libbcg729)
+ * add Add-support-for-the-new-bcg729-API-introduced-in-ver.patch
+(compatibility with libbcg729 >= 1.0.2)
+- specfile cleanup
+ * rename v1.10.2.tar.gz -> twinkle-1.10.2.tar.gz
+ * adjust Source URL
+ * drop compatibility tweaks for openSUSE < 15.0 (those didn't
+build after dropping gcc 4.8 patches anyway)
+
+---
Old:
v1.10.2.tar.gz
New:
Add-support-for-the-new-bcg729-API-introduced-in-ver.patch
twinkle-1.10.2.tar.gz
Other differences:
--
++ twinkle.spec ++
--- /var/tmp/diff_new_pack.EYWOEj/_old 2019-11-08 15:28:50.771200250 +0100
+++ /var/tmp/diff_new_pack.EYWOEj/_new 2019-11-08 15:28:50.775200254 +0100
@@ -22,14 +22,15 @@
Summary:A SIP Soft Phone
License:GPL-2.0-or-later
Group: Productivity/Telephony/SIP/Clients
-Url:https://twinkle.dolezel.info/
-Source: https://github.com/LubosD/%{name}/archive/v%{version}.tar.gz
+URL:https://twinkle.dolezel.info/
+Source:
https://github.com/LubosD/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
BuildRequires: alsa-devel
BuildRequires: bison
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: file-devel
BuildRequires: flex
+BuildRequires: ilbc-devel
BuildRequires: libgsm-devel
BuildRequires: libqt5-qtbase-devel
BuildRequires: libqt5-qttools-devel
@@ -41,19 +42,14 @@
BuildRequires: xorg-x11-devel
BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(commoncpp)
+BuildRequires: pkgconfig(libbcg729)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(speex)
BuildRequires: pkgconfig(speexdsp)
Requires(post): update-desktop-files
Requires(postun): update-desktop-files
-%if 0%{?suse_version} <= 1320
-BuildRequires: boost-devel
-%endif
-%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})
-BuildRequires: ilbc-devel
-%else
-BuildRequires: ilbc
-%endif
+
+Patch1: Add-support-for-the-new-bcg729-API-introduced-in-ver.patch
%description
Twinkle is a SIP-based soft phone for making telephone calls over IP
@@ -62,6 +58,7 @@
%prep
%setup -q
+%patch1 -p1
%build
%cmake \
@@ -69,6 +66,7 @@
-DWITH_SPEEX=ON \
-DWITH_ILBC=ON \
-DWITH_GSM=ON \
+ -DWITH_G729=ON \
-DWITH_ALSA=ON \
-DWITH_QT5=ON
make %{?_smp_mflags}
++ Add-support-for-the-new-bcg729-API-introduced-in-ver.patch ++
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?=
Subject: Add support for the new bcg729 API, introduced in version 1.0.2
Patch-mainline: submitted - PR#152
Git-repo: g...@github.com:fbriere/twinkle.git
Git-commit: 6d2cef01a7065542ab3310ed3cad1320ce6b2cd7
References: #104
Starting with version 1.0.2, bcg729 has changed its API to add support
for G.729B, thus requiring us to adjust our function calls depending on
which version is installed.
When dealing with the new API, we merely need to add a few parameters to
disable all G.729B features, namely:
* On the decoder side: When `SIDFrameFlag` is not set, the decoder will
behave just like before, decoding the payload as a standard G.729A
voice frame (or concealing an erased frame). The other parameters,
`rfc3389PayloadFlag` and `bitStreamLength`, are only of use when
dealing with a SID frame sent as per RFC 3389, and are ignored if
`SIDFrameFlag` is not set.
* On the encoder side: When `enableVAD` is disabled, the encoder will
behave just like before, producing only standard G.729A voice frames.
The only API difference is the introduction of `*bitStreamLength`, to
return the length of the encoded frame (0, 2 or 10 bytes). In our
case, this will always be 10 bytes just like before; an assert() was
added to guarantee this.
Closes #104
---
CMakeLists.txt | 4
cmake/FindG729.cmake| 36
src/audio/audio_decoder.cpp | 8
commit twinkle for openSUSE:Factory
Hello community,
here is the log from the commit of package twinkle for openSUSE:Factory checked
in at 2019-07-11 13:16:57
Comparing /work/SRC/openSUSE:Factory/twinkle (Old)
and /work/SRC/openSUSE:Factory/.twinkle.new.4615 (New)
Package is "twinkle"
Thu Jul 11 13:16:57 2019 rev:43 rq:714183 version:1.10.2
Changes:
--- /work/SRC/openSUSE:Factory/twinkle/twinkle.changes 2018-06-08
23:16:29.301847454 +0200
+++ /work/SRC/openSUSE:Factory/.twinkle.new.4615/twinkle.changes
2019-07-11 13:16:58.802794107 +0200
@@ -1,0 +2,12 @@
+Mon Jul 8 13:48:48 UTC 2019 - Joop Boonen
+
+- update to version 1.10.2
+ * Fix sound not working with ALSA 1.1.7.
+ * Translation updates.
+ * Various bug fixes.
+- patch Include-QRegExpValidator-explicitly.patch is included in the code
+- removed patches Revert-Build-fix-for-a-probably-broken-std-match_res.patch
and
+ Revert-Replaced-Boost-regex-dependency-with-C-11-reg.patch as gcc 4.8 is not
+ used any more in a supported openSUSE version
+
+---
Old:
Include-QRegExpValidator-explicitly.patch
Revert-Build-fix-for-a-probably-broken-std-match_res.patch
Revert-Replaced-Boost-regex-dependency-with-C-11-reg.patch
twinkle-1.10.1.tar.xz
New:
v1.10.2.tar.gz
Other differences:
--
++ twinkle.spec ++
--- /var/tmp/diff_new_pack.479Zbf/_old 2019-07-11 13:17:00.618793536 +0200
+++ /var/tmp/diff_new_pack.479Zbf/_new 2019-07-11 13:17:00.618793536 +0200
@@ -1,7 +1,7 @@
#
# spec file for package twinkle
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,18 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: twinkle
-Version:1.10.1
+Version:1.10.2
Release:0
Summary:A SIP Soft Phone
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: Productivity/Telephony/SIP/Clients
Url:https://twinkle.dolezel.info/
-Source: %{name}-%{version}.tar.xz
+Source: https://github.com/LubosD/%{name}/archive/v%{version}.tar.gz
BuildRequires: alsa-devel
BuildRequires: bison
BuildRequires: cmake
@@ -55,11 +55,6 @@
BuildRequires: ilbc
%endif
-Patch1: Include-QRegExpValidator-explicitly.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
-
%description
Twinkle is a SIP-based soft phone for making telephone calls over IP
networks.
@@ -67,12 +62,6 @@
%prep
%setup -q
-%patch1 -p1
-# workaround for broken std::regex in gcc 4.8
-%if 0%{?suse_version} <= 1320
-%patch91 -p1
-%patch92 -p1
-%endif
%build
%cmake \
commit twinkle for openSUSE:Factory
Hello community,
here is the log from the commit of package twinkle for openSUSE:Factory checked
in at 2018-06-08 23:16:23
Comparing /work/SRC/openSUSE:Factory/twinkle (Old)
and /work/SRC/openSUSE:Factory/.twinkle.new (New)
Package is "twinkle"
Fri Jun 8 23:16:23 2018 rev:42 rq:614547 version:1.10.1
Changes:
--- /work/SRC/openSUSE:Factory/twinkle/twinkle.changes 2016-11-04
21:00:46.0 +0100
+++ /work/SRC/openSUSE:Factory/.twinkle.new/twinkle.changes 2018-06-08
23:16:29.301847454 +0200
@@ -1,0 +2,7 @@
+Wed Jun 6 05:23:53 UTC 2018 - mkube...@suse.cz
+
+- add Include-QRegExpValidator-explicitly.patch
+ fix build against Qt 5.11
+- use %license for license file
+
+---
New:
Include-QRegExpValidator-explicitly.patch
Other differences:
--
++ twinkle.spec ++
--- /var/tmp/diff_new_pack.89nNjq/_old 2018-06-08 23:16:29.997822316 +0200
+++ /var/tmp/diff_new_pack.89nNjq/_new 2018-06-08 23:16:29.997822316 +0200
@@ -1,7 +1,7 @@
#
# spec file for package twinkle
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -55,6 +55,7 @@
BuildRequires: ilbc
%endif
+Patch1: Include-QRegExpValidator-explicitly.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
@@ -66,6 +67,7 @@
%prep
%setup -q
+%patch1 -p1
# workaround for broken std::regex in gcc 4.8
%if 0%{?suse_version} <= 1320
%patch91 -p1
@@ -96,7 +98,8 @@
%files
%defattr(-, root, root)
-%doc AUTHORS COPYING README.md
+%doc AUTHORS README.md
+%license COPYING
%{_bindir}/twinkle
%{_bindir}/twinkle-console
%{_datadir}/%{name}
++ Include-QRegExpValidator-explicitly.patch ++
From: Michal Kubecek
Date: Wed, 6 Jun 2018 10:07:21 +0200
Subject: Include explicitly
Patch-mainline: v1.10.2?
Git-commit: 4b42755619011c117a76bdf98e417ebedc47e319
Since Qt 5.11, generated ui_getprofilename.h no longer includes QHeaderView
which breaks the chain that included qvalidator.h in getprofilename.cpp.
As it feels rather fragile to rely on such indirect includes, let's include
explicitly in each file using QRegExpValidator class.
---
src/gui/diamondcardprofileform.cpp | 1 +
src/gui/getprofilenameform.cpp | 2 +-
src/gui/inviteform.cpp | 1 +
src/gui/mphoneform.cpp | 1 +
src/gui/numberconversionform.cpp | 1 +
src/gui/syssettingsform.cpp| 1 +
src/gui/userprofileform.cpp| 1 +
src/gui/wizardform.cpp | 1 +
8 files changed, 8 insertions(+), 1 deletion(-)
--- a/src/gui/diamondcardprofileform.cpp
+++ b/src/gui/diamondcardprofileform.cpp
@@ -21,6 +21,7 @@
#include
#include
+#include
#include "gui.h"
#include "diamondcard.h"
#include "getprofilenameform.h"
--- a/src/gui/getprofilenameform.cpp
+++ b/src/gui/getprofilenameform.cpp
@@ -1,7 +1,7 @@
#include "getprofilenameform.h"
-
#include
#include
+#include
#include "user.h"
#include "protocol.h"
--- a/src/gui/inviteform.cpp
+++ b/src/gui/inviteform.cpp
@@ -7,6 +7,7 @@
#include "sys_settings.h"
#include
#include
+#include
/*
Copyright (C) 2005-2009 Michel de Boer
--- a/src/gui/mphoneform.cpp
+++ b/src/gui/mphoneform.cpp
@@ -54,6 +54,7 @@
#include
#include
#include
+#include
#include "buddyform.h"
#include "diamondcardprofileform.h"
#include "osd.h"
--- a/src/gui/numberconversionform.cpp
+++ b/src/gui/numberconversionform.cpp
@@ -1,5 +1,6 @@
#include "numberconversionform.h"
+#include
#include "gui.h"
/*
--- a/src/gui/syssettingsform.cpp
+++ b/src/gui/syssettingsform.cpp
@@ -28,6 +28,7 @@
#include "twinkle_config.h"
#include
#include
+#include
#include "syssettingsform.h"
/*
* Constructs a SysSettingsForm as a child of 'parent', with the
--- a/src/gui/userprofileform.cpp
+++ b/src/gui/userprofileform.cpp
@@ -31,6 +31,7 @@
#include
#include "twinkle_config.h"
#include
+#include
#include "numberconversionform.h"
#include "util.h"
#include "userprofileform.h"
--- a/src/gui/wizardform.cpp
+++ b/src/gui/wizardform.cpp
@@ -23,6 +23,7 @@
#include
#include "gui.h"
#include
+#include
#include "wizardform.h"
#define PROV_NONE QT_TRANSLATE_NOOP("WizardForm", "None (direct IP to IP
calls)")
commit twinkle for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.twinkle.new/twinkle.changes 2016-11-04
21:00:46.0 +0100
@@ -1,0 +2,13 @@
+Mon Oct 24 11:46:58 UTC 2016 - mkube...@suse.cz
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.XPtTER/_new 2016-11-04 21:00:47.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.XPtTER/_new 2016-11-04 21:00:47.0 +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 ) {
+@@ -295,9 +295,9 @@ bool t_call_record::populate_from_file_record(const
vector ) {
// 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::reverse_iterator i =
conversions.rbegin(); i != conversions.rend(); i++, j++)
+ for (list::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);
commit twinkle for openSUSE:Factory
Hello community, here is the log from the commit of package twinkle for openSUSE:Factory checked in at 2016-09-01 14:03:22 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-05-23 16:39:44.0 +0200 +++ /work/SRC/openSUSE:Factory/.twinkle.new/twinkle.changes 2016-09-01 14:03:23.0 +0200 @@ -1,0 +2,6 @@ +Wed Aug 31 08:48:39 UTC 2016 - dims...@opensuse.org + +- Drop bogus pkgconfig(Qt5Declarative) BuildRequires: the build + system does not check for this. + +--- Other differences: -- ++ twinkle.spec ++ --- /var/tmp/diff_new_pack.9tNJbH/_old 2016-09-01 14:03:24.0 +0200 +++ /var/tmp/diff_new_pack.9tNJbH/_new 2016-09-01 14:03:24.0 +0200 @@ -39,7 +39,6 @@ BuildRequires: readline-devel BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel -BuildRequires: pkgconfig(Qt5Declarative) BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(commoncpp) BuildRequires: pkgconfig(libxml-2.0)
commit twinkle for openSUSE:Factory
Hello community,
here is the log from the commit of package twinkle for openSUSE:Factory checked
in at 2016-05-23 16:39:42
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-01-09
23:13:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.twinkle.new/twinkle.changes 2016-05-23
16:39:44.0 +0200
@@ -1,0 +2,20 @@
+Fri May 20 11:36:41 UTC 2016 - mkube...@suse.cz
+
+- update to current git snapshot (commit 4627d49d5e2d)
+ * fix build against Qt 5.6
+ * drop Qt4 compatibility
+ * fix build against ucommon 7.0
+ * allow build against system libgsm
+ * crash fixes
+ * digest authentication case sensitivity fix
+ * other minor fixes (UI, spelling, translations)
+- build against system libgsm
+- fix-build-with-ucommon-7.0.patch:
+ deleted (merged into upstream)
+- twinkle-no-return-in-nonvoid-function.patch:
+ replace by DTMF-event-type-cleanup.patch (more complex, intended
+ for upstream)
+- Revert-Replaced-Boost-regex-dependency-with-C-11-reg.patch:
+ refresh
+
+---
Old:
fix-build-with-ucommon-7.0.patch
twinkle-1.9.0.tar.xz
twinkle-no-return-in-nonvoid-function.patch
New:
DTMF-event-type-cleanup.patch
twinkle-1.10~git20160520.tar.xz
Other differences:
--
++ twinkle.spec ++
--- /var/tmp/diff_new_pack.SMhSic/_old 2016-05-23 16:39:46.0 +0200
+++ /var/tmp/diff_new_pack.SMhSic/_new 2016-05-23 16:39:46.0 +0200
@@ -17,12 +17,20 @@
Name: twinkle
+Version:1.10~git20160520
+Release:0
+Summary:A SIP Soft Phone
+License:GPL-2.0+
+Group: Productivity/Telephony/SIP/Clients
+Url:https://twinkle.dolezel.info/
+Source: %{name}-%{version}.tar.xz
BuildRequires: alsa-devel
BuildRequires: bison
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: file-devel
BuildRequires: flex
+BuildRequires: libgsm-devel
BuildRequires: libqt5-qtbase-devel
BuildRequires: libqt5-qttools-devel
BuildRequires: libsndfile-devel
@@ -30,8 +38,6 @@
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)
@@ -39,6 +45,8 @@
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(speex)
BuildRequires: pkgconfig(speexdsp)
+Requires(post): update-desktop-files
+Requires(postun): update-desktop-files
%if 0%{?suse_version} <= 1320
BuildRequires: boost-devel
%endif
@@ -47,27 +55,20 @@
%else
BuildRequires: ilbc
%endif
-Summary:A SIP Soft Phone
-License:GPL-2.0+
-Group: Productivity/Telephony/SIP/Clients
-Version:1.9.0
-Release:0
-Source: %{name}-%{version}.tar.xz
-Patch1: twinkle-no-return-in-nonvoid-function.patch
-Patch2: fix-build-with-ucommon-7.0.patch
+
+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
-Url:https://twinkle.dolezel.info/
%description
Twinkle is a SIP-based soft phone for making telephone calls over IP
networks.
+
%prep
%setup -q
%patch1 -p1
-%patch2 -p1
# workaround for broken std::regex in gcc 4.8
%if 0%{?suse_version} <= 1320
%patch91 -p1
@@ -79,6 +80,7 @@
-DWITH_ZRTP=ON \
-DWITH_SPEEX=ON \
-DWITH_ILBC=ON \
+ -DWITH_GSM=ON \
-DWITH_ALSA=ON \
-DWITH_QT5=ON
make %{?_smp_mflags}
@@ -102,6 +104,8 @@
%{_bindir}/twinkle-console
%{_datadir}/%{name}
%{_datadir}/pixmaps/twinkle.png
+%{_datadir}/icons/hicolor
%{_datadir}/applications/twinkle.desktop
+%{_mandir}/man1/twinkle.1.gz
%changelog
++ DTMF-event-type-cleanup.patch ++
From: Michal Kubecek
Date: Fri, 20 May 2016 09:48:18 +0200
Subject: DTMF event type cleanup
Patch-mainline: Not yet, going to submit
DTMF event constants handling is a bit messy as three different types
are used in different source files, triggering various compiler
warnings. Introduce t_dtmf_ev type and use it everywhere, also replace
helper macros by inline functions.
---
src/audio/audio_rx.cpp| 2 +-
src/audio/audio_rx.h | 4 ++--
src/audio/dtmf_player.cpp | 6 +++---
src/audio/dtmf_player.h | 8
src/audio/freq_gen.cpp| 3 ++-
commit twinkle for openSUSE:Factory
Hello community,
here is the log from the commit of package twinkle for openSUSE:Factory checked
in at 2016-01-09 23:13:37
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-10-12
10:02:10.0 +0200
+++ /work/SRC/openSUSE:Factory/.twinkle.new/twinkle.changes 2016-01-09
23:13:49.0 +0100
@@ -1,0 +2,8 @@
+Thu Jan 7 12:58:30 UTC 2016 - mkube...@suse.cz
+
+- fix-build-with-ucommon-7.0.patch:
+ fix build with ucommon 7.0
+- reorder patches so that the optional gcc 4.8 workaround comes
+ after normal patches
+
+---
New:
fix-build-with-ucommon-7.0.patch
Other differences:
--
++ twinkle.spec ++
--- /var/tmp/diff_new_pack.hn2nBN/_old 2016-01-09 23:13:50.0 +0100
+++ /var/tmp/diff_new_pack.hn2nBN/_new 2016-01-09 23:13:50.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package twinkle
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -53,9 +53,11 @@
Version:1.9.0
Release:0
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
+Patch1: twinkle-no-return-in-nonvoid-function.patch
+Patch2: fix-build-with-ucommon-7.0.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
Url:https://twinkle.dolezel.info/
%description
@@ -64,12 +66,13 @@
%prep
%setup -q
+%patch1 -p1
+%patch2 -p1
# workaround for broken std::regex in gcc 4.8
%if 0%{?suse_version} <= 1320
-%patch11 -p1
-%patch12 -p1
+%patch91 -p1
+%patch92 -p1
%endif
-%patch13 -p1
%build
%cmake \
++ fix-build-with-ucommon-7.0.patch ++
From: Michal Kubecek
Date: Thu, 7 Jan 2016 11:22:16 +0100
Subject: fix build with ucommon 7.0
New version of ucommon adds some restriction to Digest class which
break the way twinkle is using it:
- proper initialization using constructor is needed
- c_str() method is gone; fortunately, str() result can be used to
initialize std::string instead
Neither of these changes breaks build with ucommon 6.x.
---
src/parser/request.cpp | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/parser/request.cpp b/src/parser/request.cpp
index 550a011e4c06..348d679a5ac7 100644
--- a/src/parser/request.cpp
+++ b/src/parser/request.cpp
@@ -207,19 +207,19 @@ bool t_request::authorize_md5(const t_digest_challenge
,
A2 = method2str(method, unknown_method) + ":" + uri.encode();
A2 += ":";
if (body) {
- digest_t MD5body = "md5";
+ digest_t MD5body("md5");
MD5body.puts(body->encode().c_str());
- A2 += std::string(MD5body.c_str());
+ A2 += std::string(MD5body.str());
} else {
- digest_t MD5body = "md5";
+ digest_t MD5body("md5");
MD5body.puts("");
- A2 += std::string(MD5body.c_str());
+ A2 += std::string(MD5body.str());
}
}
// RFC 2716 3.2.2.1
// Caculate digest
- digest_t MD5A1 = "md5";
- digest_t MD5A2 = "md5";
+ digest_t MD5A1("md5");
+ digest_t MD5A2("md5");
MD5A1.puts(A1.c_str());
MD5A2.puts(A2.c_str());
@@ -227,24 +227,24 @@ bool t_request::authorize_md5(const t_digest_challenge
,
std::string x;
if (cmp_nocase(qop, QOP_AUTH) == 0 || cmp_nocase(qop, QOP_AUTH_INT) ==
0) {
- x = std::string(MD5A1.c_str());
+ x = std::string(MD5A1.str());
x += ":";
x += dchlg.nonce + ":";
x += int2str(nc, "%08x") + ":";
x += cnonce + ":";
x += qop + ":";
- x += std::string(MD5A2.c_str());
+ x += std::string(MD5A2.str());
} else {
-x = std::string(MD5A1.c_str());
+ x = std::string(MD5A1.str());
commit twinkle for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.twinkle.new/twinkle.changes 2015-10-12
10:02:10.0 +0200
@@ -1,0 +2,7 @@
+Thu Oct 8 08:19:36 UTC 2015 - mplus...@suse.com
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.gTuxgD/_new 2015-10-12 10:02:11.0 +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;
}
commit twinkle for openSUSE:Factory
Hello community,
here is the log from the commit of package twinkle for openSUSE:Factory checked
in at 2015-09-30 05:53:23
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-07-25
07:44:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.twinkle.new/twinkle.changes 2015-09-30
05:53:25.0 +0200
@@ -1,0 +2,9 @@
+Tue Sep 29 07:43:31 UTC 2015 - mkube...@suse.cz
+
+- fix Leap 42.1 build
+ Leap 42.1 sets suse_version to 1315 but it already has ilbc-devel
+ split out of the main package unlike 13.2. Add some more specfile
+ hacks to fix the build. This version builds correctly on 13.1,
+ 13.2, Factory and Leap.
+
+---
Other differences:
--
++ twinkle.spec ++
--- /var/tmp/diff_new_pack.iDMxtK/_old 2015-09-30 05:53:26.0 +0200
+++ /var/tmp/diff_new_pack.iDMxtK/_new 2015-09-30 05:53:26.0 +0200
@@ -37,10 +37,12 @@
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(speex)
BuildRequires: pkgconfig(speexdsp)
-%if %{?suse_version} > 1320
+%if 0%{?suse_version} <= 1320
+BuildRequires: boost-devel
+%endif
+%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})
BuildRequires: ilbc-devel
%else
-BuildRequires: boost-devel
BuildRequires: ilbc
%endif
Summary:A SIP Soft Phone
commit twinkle for openSUSE:Factory
Hello community,
here is the log from the commit of package twinkle for openSUSE:Factory checked
in at 2015-07-25 07:44:34
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-06-09
08:48:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.twinkle.new/twinkle.changes 2015-07-25
07:44:35.0 +0200
@@ -1,0 +2,19 @@
+Sat Jul 18 15:15:32 UTC 2015 - mkube...@suse.cz
+
+- update to version 1.9.0
+ * migration to Qt5 and cmake
+ * added in-call OSD
+ * remember window geometry and state
+ * visual feedback when entering DTMF from keyboard
+ * support past into DTMF window
+ * remove boost dependency (if gcc = 4.9)
+ * eliminated some GUI freezes/stalls
+- dependencies and build phase cleanup
+- twinkle-ucommon.diff:
+ removed (no longer needed)
+- Revert-Build-fix-for-a-probably-broken-std-match_res.patch:
+ Revert-Replaced-Boost-regex-dependency-with-C-11-reg.patch:
+ use boost regex for gcc 4.8 distributions (std::regex is broken
+ in gcc 4.8)
+
+---
Old:
twinkle-1.4.2.tar.bz2
twinkle-ucommon.diff
New:
Revert-Build-fix-for-a-probably-broken-std-match_res.patch
Revert-Replaced-Boost-regex-dependency-with-C-11-reg.patch
twinkle-1.9.0.tar.xz
Other differences:
--
++ twinkle.spec ++
--- /var/tmp/diff_new_pack.t6E8d0/_old 2015-07-25 07:44:36.0 +0200
+++ /var/tmp/diff_new_pack.t6E8d0/_new 2015-07-25 07:44:36.0 +0200
@@ -16,30 +16,42 @@
#
-%define _prefix /opt/kde3
Name: twinkle
-# BRs in openSUSE:
+BuildRequires: alsa-devel
BuildRequires: bison
-BuildRequires: boost-devel
+BuildRequires: cmake
+BuildRequires: fdupes
BuildRequires: file-devel
-BuildRequires: ilbc-devel
-BuildRequires: kdelibs3-devel
+BuildRequires: flex
+BuildRequires: libqt5-qtbase-devel
+BuildRequires: libqt5-qttools-devel
BuildRequires: libsndfile-devel
-BuildRequires: qt3-devel-tools
+BuildRequires: libzrtpcpp-devel = 2.0.0
+BuildRequires: pkgconfig
BuildRequires: readline-devel
+BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel
-# BRs in network:telephony
-BuildRequires: libzrtpcpp2-devel = 2.0.0
-BuildRequires: speex-devel
+BuildRequires: pkgconfig(Qt5Declarative)
+BuildRequires: pkgconfig(Qt5Quick)
+BuildRequires: pkgconfig(commoncpp)
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(speex)
+BuildRequires: pkgconfig(speexdsp)
+%if %{?suse_version} 1320
+BuildRequires: ilbc-devel
+%else
+BuildRequires: boost-devel
+BuildRequires: ilbc
+%endif
Summary:A SIP Soft Phone
License:GPL-2.0+
Group: Productivity/Telephony/SIP/Clients
-Version:1.4.2
+Version:1.9.0
Release:0
-Source: %{name}-%{version}.tar.bz2
-Patch0: twinkle-ucommon.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Url:http://www.twinklephone.com
+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
+Url:https://twinkle.dolezel.info/
%description
Twinkle is a SIP-based soft phone for making telephone calls over IP
@@ -47,30 +59,33 @@
%prep
%setup -q
-%patch0 -p1
+# workaround for broken std::regex in gcc 4.8
+%if 0%{?suse_version} = 1320
+%patch11 -p1
+%patch12 -p1
+%endif
%build
-autoreconf -fi
-. /etc/opt/kde3/common_options
-export QTDIR=/usr/lib/qt3
-export CFLAGS=$RPM_OPT_FLAGS CPPFLAGS=$RPM_OPT_FLAGS
-%configure \
---without-arts --with-qt-libraries=/usr/lib/qt3/%{_lib}
-make
+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 .
+make %{?_smp_mflags}
%install
%makeinstall
install -d 755 %{buildroot}%{_datadir}/pixmaps
-install -m 644 src/gui/images/twinkle48.png
%{buildroot}%{_datadir}/pixmaps/twinkle.png
%suse_update_desktop_file -c twinkle Twinkle SIP VoIP Phone twinkle twinkle
Network Telephony
+%fdupes %{buildroot}%{_prefix}
%files
%defattr(-, root, root)
-%doc AUTHORS COPYING README ChangeLog
-%{_bindir}/%{name}
+%doc AUTHORS COPYING README.md
+%{_bindir}/twinkle
+%{_bindir}/twinkle-console
%{_datadir}/%{name}
%{_datadir}/pixmaps/twinkle.png
-/usr/share/applications/twinkle.desktop
-%dir %{_datadir}/pixmaps
+%{_datadir}/applications/twinkle.desktop
%changelog
++ Revert-Build-fix-for-a-probably-broken-std-match_res.patch ++
From: Michal Kubecek mkube...@suse.cz
Date: Tue, 14 Jul
commit twinkle for openSUSE:Factory
Hello community, here is the log from the commit of package twinkle for openSUSE:Factory checked in at 2015-06-09 08:48:53 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 2013-10-21 20:03:37.0 +0200 +++ /work/SRC/openSUSE:Factory/.twinkle.new/twinkle.changes 2015-06-09 08:48:54.0 +0200 @@ -1,0 +2,5 @@ +Tue May 26 13:41:49 UTC 2015 - lmue...@suse.com + +- Add ilbc as build time requirement again; (boo#707856) + +--- Other differences: -- ++ twinkle.spec ++ --- /var/tmp/diff_new_pack.vmTBBR/_old 2015-06-09 08:48:55.0 +0200 +++ /var/tmp/diff_new_pack.vmTBBR/_new 2015-06-09 08:48:55.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package twinkle # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,6 +22,7 @@ BuildRequires: bison BuildRequires: boost-devel BuildRequires: file-devel +BuildRequires: ilbc-devel BuildRequires: kdelibs3-devel BuildRequires: libsndfile-devel BuildRequires: qt3-devel-tools
commit twinkle for openSUSE:Factory
Hello community,
here is the log from the commit of package twinkle for openSUSE:Factory checked
in at 2013-10-21 20:03:36
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 2012-01-25
10:41:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.twinkle.new/twinkle.changes 2013-10-21
20:03:37.0 +0200
@@ -1,0 +2,6 @@
+Thu Sep 26 16:04:22 UTC 2013 - jeng...@inai.de
+
+- Shift BuildRequires to explicitly use zrtpcpp2
+- Remove redundant %clean section
+
+---
Other differences:
--
++ twinkle.spec ++
--- /var/tmp/diff_new_pack.OksFnQ/_old 2013-10-21 20:03:38.0 +0200
+++ /var/tmp/diff_new_pack.OksFnQ/_new 2013-10-21 20:03:38.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package twinkle
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,16 +18,23 @@
%define _prefix /opt/kde3
Name: twinkle
-# 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
+# BRs in openSUSE:
+BuildRequires: bison
+BuildRequires: boost-devel
+BuildRequires: file-devel
+BuildRequires: kdelibs3-devel
+BuildRequires: libsndfile-devel
+BuildRequires: qt3-devel-tools
+BuildRequires: readline-devel
+BuildRequires: xorg-x11-devel
+# BRs in network:telephony
+BuildRequires: libzrtpcpp2-devel = 2.0.0
BuildRequires: speex-devel
Summary:A SIP Soft Phone
-Version:1.4.2
-Release:14
License:GPL-2.0+
Group: Productivity/Telephony/SIP/Clients
+Version:1.4.2
+Release:0
Source: %{name}-%{version}.tar.bz2
Patch0: twinkle-ucommon.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -56,9 +63,6 @@
install -m 644 src/gui/images/twinkle48.png
%{buildroot}%{_datadir}/pixmaps/twinkle.png
%suse_update_desktop_file -c twinkle Twinkle SIP VoIP Phone twinkle twinkle
Network Telephony
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-, root, root)
%doc AUTHORS COPYING README ChangeLog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit twinkle for openSUSE:Factory
Hello community,
here is the log from the commit of package twinkle for openSUSE:Factory checked
in at 2011-12-06 19:09:49
Comparing /work/SRC/openSUSE:Factory/twinkle (Old)
and /work/SRC/openSUSE:Factory/.twinkle.new (New)
Package is twinkle, Maintainer is hvo...@suse.com
Changes:
Other differences:
--
++ twinkle.spec ++
--- /var/tmp/diff_new_pack.54HZM7/_old 2011-12-06 19:44:17.0 +0100
+++ /var/tmp/diff_new_pack.54HZM7/_new 2011-12-06 19:44:17.0 +0100
@@ -26,7 +26,7 @@
Summary:A SIP Soft Phone
Version:1.4.2
Release:14
-License:GPLv2+
+License:GPL-2.0+
Group: Productivity/Telephony/SIP/Clients
Source: %{name}-%{version}.tar.bz2
Patch0: twinkle-ucommon.diff
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit twinkle for openSUSE:Factory
Hello community,
here is the log from the commit of package twinkle for openSUSE:Factory
checked in at Mon Aug 22 11:13:09 CEST 2011.
--- twinkle/twinkle.changes 2011-06-06 14:50:10.0 +0200
+++ /mounts/work_src_done/STABLE/twinkle/twinkle.changes2011-07-24
18:53:31.0 +0200
@@ -1,0 +2,7 @@
+Sun Jul 24 18:48:44 CEST 2011 - werner.dittm...@t-online.de
+
+- add patch to modify Twinkle to use the new GNU uCommon/commoncpp libraries
+- remove dependency to common C++ library
+- merged the small non-void patch into the ucommon patch
+
+---
calling whatdependson for head-i586
Old:
twinkle-nonvoid.diff
New:
twinkle-ucommon.diff
Other differences:
--
++ twinkle.spec ++
--- /var/tmp/diff_new_pack.R29zJS/_old 2011-08-22 11:12:39.0 +0200
+++ /var/tmp/diff_new_pack.R29zJS/_new 2011-08-22 11:12:39.0 +0200
@@ -21,14 +21,14 @@
# 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 speex-devel
+BuildRequires: libzrtpcpp-devel = 2.0.0 speex-devel
Summary:A SIP Soft Phone
Version:1.4.2
-Release:12
+Release:14
License:GPLv2+
Group: Productivity/Telephony/SIP/Clients
Source: %{name}-%{version}.tar.bz2
-Patch0: twinkle-nonvoid.diff
+Patch0: twinkle-ucommon.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url:http://www.twinklephone.com
@@ -42,7 +42,7 @@
%prep
%setup -q
-%patch0
+%patch0 -p1
%build
autoreconf -fi
++ twinkle-ucommon.diff ++
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],[],[],[
# Check version of the Common C++ library.
# This also sets the cc++2 include directory in CXXFLAGS
-OST_CCXX2_VERSION(1.6.0,,exit)
+#OST_CCXX2_VERSION(1.6.0,,exit)
# Temporarily add some default directories to PKG_CONFIG_PATH such that
# the user will not be burdened with setting PKG_CONFIG_PATH
@@ -66,7 +66,9 @@ fi
export PKG_CONFIG_PATH
-PKG_CHECK_MODULES(CCRTP, libccrtp1 = 1.6.0)
+PKG_CHECK_MODULES(CCRTP, libccrtp = 2.0.0)
+PKG_CHECK_MODULES(UCOMMON, ucommon = 5.0.0)
+CCRTP_LIBS=$CCRTP_LIBS $UCOMMON_LIBS
PKG_CHECK_MODULES(XML2, libxml-2.0)
# AC_CHECK_HEADER(libxml/tree.h, [],
@@ -136,7 +138,7 @@ done
#echo INCLUDEPATH += `$CCGNU2_CONFIG --includes` | sed -e s/-I//g
$QT_INCL_PRO
# libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and
# should include above flags !
-echo INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp1` | sed -e s/-I//g
$QT_INCL_PRO
+echo INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp` | sed -e s/-I//g
$QT_INCL_PRO
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
echo LIBS += `$CCGNU2_CONFIG --stdlibs` $QT_INCL_PRO
echo LIBS += $CCRTP_LIBS $QT_INCL_PRO
+echo LIBS += $UCOMMON_LIBS $QT_INCL_PRO
echo LIBS += $XML2_LIBS $QT_INCL_PRO
# Check if KDE is available
@@ -264,7 +267,7 @@ fi
# Check if zrtp is available
if test x$ac_cv_zrtp = xyes
then
- PKG_CHECK_MODULES(ZRTP, libzrtpcpp = 1.3.0)
+ PKG_CHECK_MODULES(ZRTP, libzrtpcpp = 2.0.0)
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
@@ -21,7 +21,6 @@
#ifndef _AUDIO_DECODER_H
#define _AUDIO_DECODER_H
-#include cc++/config.h
#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
@@ -21,7 +21,6 @@
#ifndef _AUDIO_ENCODER_H
#define _AUDIO_ENCODER_H
-#include cc++/config.h
#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
@@ -22,7 +22,6 @@
#include cstdlib
#include sys/types.h
#include sys/time.h
-#include cc++/config.h
#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
@@ -21,7 +21,6 @@
#ifndef _DTMF_PLAYER_H
#define _DTMF_PLAYER_H
-#include cc++/config.h
#include
commit twinkle for openSUSE:Factory
Hello community,
here is the log from the commit of package twinkle for openSUSE:Factory
checked in at Mon Jun 20 12:59:34 CEST 2011.
--- twinkle/twinkle.changes 2010-03-08 01:46:07.0 +0100
+++ /mounts/work_src_done/STABLE/twinkle/twinkle.changes2011-06-06
14:50:10.0 +0200
@@ -1,0 +2,5 @@
+Mon Jun 6 12:50:00 UTC 2011 - co...@novell.com
+
+- do not remove the original COPYING
+
+---
calling whatdependson for head-i586
Other differences:
--
++ twinkle.spec ++
--- /var/tmp/diff_new_pack.ajRxG7/_old 2011-06-20 12:55:18.0 +0200
+++ /var/tmp/diff_new_pack.ajRxG7/_new 2011-06-20 12:55:18.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package twinkle (Version 1.4.2)
+# spec file for package twinkle
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,10 +22,9 @@
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 speex-devel
-Requires: licenses
Summary:A SIP Soft Phone
Version:1.4.2
-Release:2
+Release:12
License:GPLv2+
Group: Productivity/Telephony/SIP/Clients
Source: %{name}-%{version}.tar.bz2
@@ -59,8 +58,6 @@
install -d 755 %{buildroot}%{_datadir}/pixmaps
install -m 644 src/gui/images/twinkle48.png
%{buildroot}%{_datadir}/pixmaps/twinkle.png
%suse_update_desktop_file -c twinkle Twinkle SIP VoIP Phone twinkle twinkle
Network Telephony
-rm COPYING
-ln -s /usr/share/doc/licenses/GPL-2.0.txt COPYING
%clean
rm -rf $RPM_BUILD_ROOT
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
