From 1d6caeb5dfde9bab796faf9df6092a108ec23c71 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 22 Jul 2015 15:49:21 +0200 Subject: [PATCH 01/30] Rebuild for newer evolution-data-server --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index 8042e02..dbe5cb2 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -319,6 +319,9 @@ fi %changelog +* Wed Jul 22 2015 Milan Crha - 1.4.1-14 +- Rebuild for newer evolution-data-server + * Thu Jun 25 2015 Sandro Mani - 1.4.1-13 - Add patch to fix memory corruption issues (#1222301) From 4abfdcb67498ad3914ad04033da64f1c428cb03b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 22 Jul 2015 15:49:21 +0200 Subject: [PATCH 02/30] Rebuild for newer evolution-data-server --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index 8042e02..dbe5cb2 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -319,6 +319,9 @@ fi %changelog +* Wed Jul 22 2015 Milan Crha - 1.4.1-14 +- Rebuild for newer evolution-data-server + * Thu Jun 25 2015 Sandro Mani - 1.4.1-13 - Add patch to fix memory corruption issues (#1222301) From 68ad0ec944bb5dab6f0e562aaae423b3f61ffd31 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 6 Aug 2015 16:58:10 +0200 Subject: [PATCH 03/30] Rebuild (ucommon) --- sflphone.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sflphone.spec b/sflphone.spec index dbe5cb2..4f4066b 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,10 +1,10 @@ Name: sflphone Version: 1.4.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ -URL: http://sflphone.org/ +URL: https://gitlab.savoirfairelinux.com/sfl-ports/sflphone # Note: the number in the URL is different for every release Source0: https://projects.savoirfairelinux.com/attachments/download/14805/%{name}-%{version}.tar.gz # Install icon to hicolor/scalable/apps @@ -319,6 +319,9 @@ fi %changelog +* Thu Aug 06 2015 Sandro Mani - 1.4.1-15 +- Rebuild (ucommon) + * Wed Jul 22 2015 Milan Crha - 1.4.1-14 - Rebuild for newer evolution-data-server From 9a27c0b0f93b83be0292ad599440167067adad56 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 26 Dec 2015 22:44:15 +0100 Subject: [PATCH 04/30] Rebuild (ucommon) --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index 4f4066b..a58c8e7 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -319,6 +319,9 @@ fi %changelog +* Sat Dec 26 2015 Sandro Mani - 1.4.1-16 +- Rebuild (ucommon) + * Thu Aug 06 2015 Sandro Mani - 1.4.1-15 - Rebuild (ucommon) From 5ba491c942bb1988e93b12372d3c199c7b80e816 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 23:54:22 +0000 Subject: [PATCH 05/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index a58c8e7..458203d 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -319,6 +319,9 @@ fi %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.4.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Dec 26 2015 Sandro Mani - 1.4.1-16 - Rebuild (ucommon) From 14c9d8d56dd26bf47287735d60296e79459ab8c8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 5 Feb 2016 19:51:33 +0100 Subject: [PATCH 06/30] Add patch to fix FTBFS --- sflphone.spec | 8 ++++- sflphone_gcc6.patch | 75 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 sflphone_gcc6.patch diff --git a/sflphone.spec b/sflphone.spec index 458203d..5ea15e5 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -27,6 +27,8 @@ Patch6: sflphone_sflphoned-dir.patch Patch7: sflphone_tls.patch # Fix memory corruption due to keeping pointer to local variable after scope ended Patch8: sflphone_memory-corruption.patch +# Fix GCC6 FTBFS due to "error: the compiler can assume that the address of 'other' will always evaluate to 'true'" +Patch9: sflphone_gcc6.patch # Because of pjproject arm endianness detection issues %if 0%{?fedora} < 22 @@ -181,6 +183,7 @@ This package includes the development files for the KDE client. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 # Unbundle bundled libraries %if 0%{?fedora} >= 22 @@ -319,6 +322,9 @@ fi %changelog +* Fri Feb 05 2016 Sandro Mani - 1.4.1-18 +- Add patch to fix FTBFS + * Thu Feb 04 2016 Fedora Release Engineering - 1.4.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sflphone_gcc6.patch b/sflphone_gcc6.patch new file mode 100644 index 0000000..afac507 --- /dev/null +++ b/sflphone_gcc6.patch @@ -0,0 +1,75 @@ +diff -rupN sflphone-1.4.1/kde/src/lib/contact.cpp sflphone-1.4.1-new/kde/src/lib/contact.cpp +--- sflphone-1.4.1/kde/src/lib/contact.cpp 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/contact.cpp 2016-02-05 19:02:48.755201247 +0100 +@@ -453,13 +453,3 @@ bool Contact::operator==(const Contact* + { + return other && this->d == other->d; + } +- +-bool Contact::operator==(Contact& other) +-{ +- return &other && this->d == other.d; +-} +- +-bool Contact::operator==(const Contact& other) const +-{ +- return &other && this->d == other.d; +-} +diff -rupN sflphone-1.4.1/kde/src/lib/contact.h sflphone-1.4.1-new/kde/src/lib/contact.h +--- sflphone-1.4.1/kde/src/lib/contact.h 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/contact.h 2016-02-05 19:02:42.812041560 +0100 +@@ -132,8 +132,6 @@ public: + //Operator + bool operator==(Contact* other); + bool operator==(const Contact* other) const; +- bool operator==(Contact& other); +- bool operator==(const Contact& other) const; + + private Q_SLOTS: + void slotPresenceChanged(); +diff -rupN sflphone-1.4.1/kde/src/lib/phonenumber.cpp sflphone-1.4.1-new/kde/src/lib/phonenumber.cpp +--- sflphone-1.4.1/kde/src/lib/phonenumber.cpp 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/phonenumber.cpp 2016-02-05 19:29:37.775461245 +0100 +@@ -547,16 +547,6 @@ bool PhoneNumber::operator==(const Phone + return other && this->d == other->d; + } + +-bool PhoneNumber::operator==(PhoneNumber& other) +-{ +- return &other && this->d == other.d; +-} +- +-bool PhoneNumber::operator==(const PhoneNumber& other) const +-{ +- return &other && this->d == other.d; +-} +- + /************************************************************************************ + * * + * Temporary phone number * +diff -rupN sflphone-1.4.1/kde/src/lib/phonenumber.h sflphone-1.4.1-new/kde/src/lib/phonenumber.h +--- sflphone-1.4.1/kde/src/lib/phonenumber.h 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/phonenumber.h 2016-02-05 19:29:27.722111681 +0100 +@@ -125,8 +125,6 @@ public: + //Operator + bool operator==(PhoneNumber* other); + bool operator==(const PhoneNumber* other) const; +- bool operator==(PhoneNumber& other); +- bool operator==(const PhoneNumber& other) const; + + protected: + //Constructor +diff -rupN sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp +--- sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp 2016-02-05 19:18:04.561964557 +0100 +@@ -49,10 +49,7 @@ struct SHMHeader{ + /* The header will be aligned on 16-byte boundaries */ + char padding[8]; + +-#pragma GCC diagnostic push +-#pragma GCC diagnostic ignored "-pedantic" + char m_Data[]; +-#pragma GCC diagnostic pop + }; + + ///Constructor From b4de7857f07d236cd8f52bbaa61a56aa276e1ff7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 23 Jul 2016 11:45:41 +0200 Subject: [PATCH 07/30] Rebuild (evolution-data-server) --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index 5ea15e5..ed1703c 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -322,6 +322,9 @@ fi %changelog +* Sat Jul 23 2016 Sandro Mani - 1.4.1-19 +- Rebuild (evolution-data-server) + * Fri Feb 05 2016 Sandro Mani - 1.4.1-18 - Add patch to fix FTBFS From 4649509fec8619fd768564dd76f11a2405c31b38 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 31 Oct 2016 14:52:31 +0100 Subject: [PATCH 08/30] Rebuild (evolution-data-server) --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index ed1703c..3418aa3 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -322,6 +322,9 @@ fi %changelog +* Mon Oct 31 2016 Sandro Mani - 1.4.1-20 +- Rebuild (evolution-data-server) + * Sat Jul 23 2016 Sandro Mani - 1.4.1-19 - Rebuild (evolution-data-server) From 43aed6a1894142d38299d6dc310cb886d830458e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 31 Oct 2016 15:44:35 +0100 Subject: [PATCH 09/30] Add missing BR --- sflphone.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sflphone.spec b/sflphone.spec index 3418aa3..3c42a73 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -40,6 +40,7 @@ BuildRequires: ccrtp-devel BuildRequires: check-devel BuildRequires: clutter-gtk-devel BuildRequires: cmake +BuildRequires: dbus-glib-devel BuildRequires: dbus-c++-devel BuildRequires: desktop-file-utils BuildRequires: expat-devel @@ -324,6 +325,7 @@ fi %changelog * Mon Oct 31 2016 Sandro Mani - 1.4.1-20 - Rebuild (evolution-data-server) +- BR: dbus-glib-devel * Sat Jul 23 2016 Sandro Mani - 1.4.1-19 - Rebuild (evolution-data-server) From 144a964d34dbf5cc73a43cef8b74c736bfa8306d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 13:21:02 +0000 Subject: [PATCH 10/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index 3c42a73..84cb6ab 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 20%{?dist} +Release: 21%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -323,6 +323,9 @@ fi %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.4.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Oct 31 2016 Sandro Mani - 1.4.1-20 - Rebuild (evolution-data-server) - BR: dbus-glib-devel From 5797efd275f748bfce7c03566b7e38afaa688f7b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 16 Feb 2017 18:02:07 +0100 Subject: [PATCH 11/30] Fix GCC7 FTBFS --- sflphone.spec | 50 +++++++++---------------------- sflphone_gcc7.patch | 71 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 36 deletions(-) create mode 100644 sflphone_gcc7.patch diff --git a/sflphone.spec b/sflphone.spec index 84cb6ab..685a1fe 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 21%{?dist} +Release: 22%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -11,12 +11,10 @@ Source0: https://projects.savoirfairelinux.com/attachments/download/14805 Patch0: sflphone_icondir.patch # Unbundle pjproject Patch1: sflphone_unbundle.patch -%if 0%{?fedora} >= 22 # ZRTP API changes Patch2: sflphone_zrtp.patch # Workaround for bad #includes in zrtp headers, see https://github.com/wernerd/ZRTPCPP/pull/19 Patch3: sflphone_zrtp-includes.patch -%endif # Disable video support in kde interface (video is not available without ffmpeg) Patch4: sflphone_novideo.patch # Fix gcc5 FTBFS issues @@ -29,11 +27,10 @@ Patch7: sflphone_tls.patch Patch8: sflphone_memory-corruption.patch # Fix GCC6 FTBFS due to "error: the compiler can assume that the address of 'other' will always evaluate to 'true'" Patch9: sflphone_gcc6.patch - -# Because of pjproject arm endianness detection issues -%if 0%{?fedora} < 22 -ExcludeArch: %{arm} -%endif +# Fix GCC7 FTBFS due to +# - ISO C++ forbids flexible array member 'm_Data' [-Werror=pedantic] +# - error: this statement may fall through [-Werror=implicit-fallthrough=] +Patch10: sflphone_gcc7.patch BuildRequires: alsa-lib-devel BuildRequires: ccrtp-devel @@ -50,9 +47,7 @@ BuildRequires: gnome-common BuildRequires: gnome-doc-utils BuildRequires: gnutls-devel BuildRequires: gsm-devel -%if 0%{?fedora} >= 22 BuildRequires: iaxclient-libiax-devel -%endif BuildRequires: ilbc-devel BuildRequires: intltool BuildRequires: kdepimlibs-devel @@ -70,9 +65,7 @@ BuildRequires: pjproject-devel BuildRequires: pulseaudio-libs-devel BuildRequires: rarian-compat BuildRequires: speex-devel -%if 0%{?fedora} >= 22 BuildRequires: speexdsp-devel -%endif BuildRequires: systemd-devel BuildRequires: yelp-tools @@ -102,9 +95,6 @@ This package includes common files for SFLPhone. Summary: SFLPhone daemon Requires: %{name}-common = %{version}-%{release} Requires: dbus%{?_isa} -%if 0%{?fedora} < 22 -Provides: bundled(libiax2) = 0.2.3 -%endif Obsoletes: %{name}-libs < 1.4.1-9 %description daemon @@ -172,26 +162,10 @@ This package includes the development files for the KDE client. %prep -%setup -q -n %{name}-%{version} -%patch0 -p1 -%patch1 -p1 -%if 0%{?fedora} >= 22 -%patch2 -p1 -%patch3 -p1 -%endif -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 +%autosetup -p1 -n %{name}-%{version} # Unbundle bundled libraries -%if 0%{?fedora} >= 22 rm -rf daemon/libs -%else -rm -rf daemon/libs/pjproject-2.2.1 -%endif # Fix FSF addresses find . -type f -print0 | xargs -0 sed -i 's|675 Mass Ave, Cambridge, MA 02139|51 Franklin Street, Fifth Floor, Boston, MA 02110-1301|' @@ -202,7 +176,7 @@ find . -type f -print0 | xargs -0 sed -i 's|675 Mass Ave, Cambridge, MA 02139|51 pushd daemon ./autogen.sh LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %configure --disable-video -make %{?_smp_mflags} V=1 +%make_build V=1 make doc popd @@ -210,21 +184,21 @@ popd pushd gnome ./autogen.sh LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %configure --disable-video -make %{?_smp_mflags} V=1 +%make_build V=1 popd ### Compile plugins ### pushd plugins ./autogen.sh LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %configure -make %{?_smp_mflags} V=1 +%make_build V=1 popd ### Compile kde client ### mkdir kde/build pushd kde/build LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %cmake .. -make %{?_smp_mflags} VERBOSE=1 +%make_build VERBOSE=1 popd @@ -323,6 +297,10 @@ fi %changelog +* Thu Feb 16 2017 Sandro Mani - 1.4.1-22 +- Drop F22 conditionals +- Add patch to fix GCC7 FTBFS + * Sat Feb 11 2017 Fedora Release Engineering - 1.4.1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sflphone_gcc7.patch b/sflphone_gcc7.patch new file mode 100644 index 0000000..68bc42a --- /dev/null +++ b/sflphone_gcc7.patch @@ -0,0 +1,71 @@ +diff -rupN sflphone-1.4.1/kde/src/eventmanager.cpp sflphone-1.4.1-new/kde/src/eventmanager.cpp +--- sflphone-1.4.1/kde/src/eventmanager.cpp 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/kde/src/eventmanager.cpp 2017-02-16 16:34:26.071363596 +0100 +@@ -63,6 +63,7 @@ protected: + break; + case Qt::WindowActive: + qDebug() << "The window is now active"; ++ break; + case Qt::WindowNoState: + default: + if (e->oldState() == Qt::WindowMinimized) +@@ -464,6 +465,7 @@ void EventManager::enter() + case Call::State::DIALING: + //Change account if it changed + call->setAccount(AccountListModel::instance()->currentAccount()); ++ break; + case Call::State::INCOMING: + case Call::State::TRANSFERRED: + case Call::State::TRANSF_HOLD: +diff -rupN sflphone-1.4.1/kde/src/lib/account.cpp sflphone-1.4.1-new/kde/src/lib/account.cpp +--- sflphone-1.4.1/kde/src/lib/account.cpp 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/account.cpp 2017-02-16 15:01:18.122412899 +0100 +@@ -374,8 +374,10 @@ QString Account::password() const + case Account::Protocol::SIP: + if (credentialsModel()->rowCount()) + return credentialsModel()->data(credentialsModel()->index(0,0),CredentialModel::Role::PASSWORD).toString(); ++ break; + case Account::Protocol::IAX: + return accountDetail(Account::MapField::PASSWORD); ++ break; + }; + return ""; + } +diff -rupN sflphone-1.4.1/kde/src/lib/call.cpp sflphone-1.4.1-new/kde/src/lib/call.cpp +--- sflphone-1.4.1/kde/src/lib/call.cpp 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/call.cpp 2017-02-16 14:51:22.512603859 +0100 +@@ -191,16 +191,22 @@ QDebug LIB_EXPORT operator<<(QDebug dbg, + switch (c) { + case Call::Action::ACCEPT: + dbg.nospace() << "ACCEPT"; ++ /* FALLTHRU */ + case Call::Action::REFUSE: + dbg.nospace() << "REFUSE"; ++ /* FALLTHRU */ + case Call::Action::TRANSFER: + dbg.nospace() << "TRANSFER"; ++ /* FALLTHRU */ + case Call::Action::HOLD: + dbg.nospace() << "HOLD"; ++ /* FALLTHRU */ + case Call::Action::RECORD: + dbg.nospace() << "RECORD"; ++ /* FALLTHRU */ + case Call::Action::__COUNT: + dbg.nospace() << "COUNT"; ++ /* FALLTHRU */ + }; + dbg.space(); + dbg.nospace() << '(' << static_cast(c) << ')'; +diff -rupN sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp +--- sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp 2017-02-16 14:35:42.351238109 +0100 ++++ sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp 2017-02-16 14:37:30.942915551 +0100 +@@ -49,7 +49,7 @@ struct SHMHeader{ + /* The header will be aligned on 16-byte boundaries */ + char padding[8]; + +- char m_Data[]; ++ char* m_Data; + }; + + ///Constructor From 60dc8992a88587cc0cbd3501703cf94a9b9198c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 18:29:30 +0000 Subject: [PATCH 12/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index 685a1fe..2d50d15 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 22%{?dist} +Release: 23%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -297,6 +297,9 @@ fi %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.4.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Feb 16 2017 Sandro Mani - 1.4.1-22 - Drop F22 conditionals - Add patch to fix GCC7 FTBFS From 9cad3e32189cd80f5c6798f77a591a83f36476be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 08:22:27 +0000 Subject: [PATCH 13/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index 2d50d15..9e53fdf 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 23%{?dist} +Release: 24%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -297,6 +297,9 @@ fi %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.4.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.4.1-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 67234addb811bb783e3755bdc9426fbf247544bc Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 28 Aug 2017 18:56:50 +0200 Subject: [PATCH 14/30] Add patch to not use --g-fatal-warnings for glib-genmarshal --- sflphone.spec | 7 ++++- sflphone_g-fatal-warnings.patch | 48 +++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 sflphone_g-fatal-warnings.patch diff --git a/sflphone.spec b/sflphone.spec index 9e53fdf..8b17eae 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 24%{?dist} +Release: 25%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -31,6 +31,8 @@ Patch9: sflphone_gcc6.patch # - ISO C++ forbids flexible array member 'm_Data' [-Werror=pedantic] # - error: this statement may fall through [-Werror=implicit-fallthrough=] Patch10: sflphone_gcc7.patch +# Don't use --g-fatal-warnings for glib-genmarshal +Patch11: sflphone_g-fatal-warnings.patch BuildRequires: alsa-lib-devel BuildRequires: ccrtp-devel @@ -297,6 +299,9 @@ fi %changelog +* Mon Aug 28 2017 Milan Crha - 1.4.1-25 +- Add patch to not use --g-fatal-warnings for glib-genmarshal + * Thu Aug 03 2017 Fedora Release Engineering - 1.4.1-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sflphone_g-fatal-warnings.patch b/sflphone_g-fatal-warnings.patch new file mode 100644 index 0000000..1550caf --- /dev/null +++ b/sflphone_g-fatal-warnings.patch @@ -0,0 +1,48 @@ +diff -up sflphone-1.4.1/gnome/src/dbus/Makefile.am.g-fatal-warnings sflphone-1.4.1/gnome/src/dbus/Makefile.am +--- sflphone-1.4.1/gnome/src/dbus/Makefile.am.g-fatal-warnings 2017-08-28 11:48:47.000000000 +0200 ++++ sflphone-1.4.1/gnome/src/dbus/Makefile.am 2017-08-28 11:50:48.611502817 +0200 +@@ -27,10 +27,10 @@ endif + + # Create the necessary marshallers for the signals implemented by the library + marshaller.c: marshaller.list +- glib-genmarshal --body --g-fatal-warnings $< > $@ ++ glib-genmarshal --body $< > $@ + + marshaller.h: marshaller.list +- glib-genmarshal --header --g-fatal-warnings $< > $@ ++ glib-genmarshal --header $< > $@ + + libdbus_la_SOURCES= \ + dbus.c \ +diff -up sflphone-1.4.1/gnome/src/dbus/Makefile.g-fatal-warnings sflphone-1.4.1/gnome/src/dbus/Makefile +--- sflphone-1.4.1/gnome/src/dbus/Makefile.g-fatal-warnings 2017-08-28 11:48:47.000000000 +0200 ++++ sflphone-1.4.1/gnome/src/dbus/Makefile 2017-08-28 11:50:27.804503104 +0200 +@@ -640,10 +640,10 @@ videomanager-glue.h: videomanager-intros + + # Create the necessary marshallers for the signals implemented by the library + marshaller.c: marshaller.list +- glib-genmarshal --body --g-fatal-warnings $< > $@ ++ glib-genmarshal --body $< > $@ + + marshaller.h: marshaller.list +- glib-genmarshal --header --g-fatal-warnings $< > $@ ++ glib-genmarshal --header $< > $@ + + -include $(top_srcdir)/git.mk + +diff -up sflphone-1.4.1/gnome/src/dbus/Makefile.in.g-fatal-warnings sflphone-1.4.1/gnome/src/dbus/Makefile.in +--- sflphone-1.4.1/gnome/src/dbus/Makefile.in.g-fatal-warnings 2017-08-28 11:48:47.000000000 +0200 ++++ sflphone-1.4.1/gnome/src/dbus/Makefile.in 2017-08-28 11:51:00.844502647 +0200 +@@ -640,10 +640,10 @@ indent: + + # Create the necessary marshallers for the signals implemented by the library + marshaller.c: marshaller.list +- glib-genmarshal --body --g-fatal-warnings $< > $@ ++ glib-genmarshal --body $< > $@ + + marshaller.h: marshaller.list +- glib-genmarshal --header --g-fatal-warnings $< > $@ ++ glib-genmarshal --header $< > $@ + + -include $(top_srcdir)/git.mk + From 787cd0dabce701df52a33e41f279fa73fb843d43 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 6 Sep 2017 17:47:16 +0200 Subject: [PATCH 15/30] Add patch to adapt to pjspi API change --- sflphone-pjspi-api-change.patch | 131 ++++++++++++++++++++++++++++++++ sflphone.spec | 7 +- 2 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 sflphone-pjspi-api-change.patch diff --git a/sflphone-pjspi-api-change.patch b/sflphone-pjspi-api-change.patch new file mode 100644 index 0000000..266db65 --- /dev/null +++ b/sflphone-pjspi-api-change.patch @@ -0,0 +1,131 @@ +diff -up sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp.pjsip-api-change sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp +--- sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp.pjsip-api-change 2017-09-06 16:49:23.087165453 +0200 ++++ sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp 2017-09-06 16:52:28.338162891 +0200 +@@ -122,12 +122,13 @@ PresSubServer::pres_on_rx_subscribe_requ + + /* Create UAS dialog: */ + const pj_str_t contact(acc->getContactHeader()); +- status = pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, &contact, &dlg); ++ status = pjsip_dlg_create_uas_and_inc_lock(pjsip_ua_instance(), rdata, &contact, &dlg); + + if (status != PJ_SUCCESS) { + char errmsg[PJ_ERR_MSG_SIZE]; + pj_strerror(status, errmsg, sizeof(errmsg)); + WARN("Unable to create UAS dialog for subscription: %s [status=%d]", errmsg, status); ++ pjsip_dlg_dec_lock(dlg); + pres->unlock(); + pjsip_endpt_respond_stateless(endpt, rdata, 400, NULL, NULL, NULL); + return PJ_TRUE; +@@ -156,6 +157,7 @@ PresSubServer::pres_on_rx_subscribe_requ + pjsip_dlg_send_response(dlg, pjsip_rdata_get_tsx(rdata), tdata); + } + ++ pjsip_dlg_dec_lock(dlg); + pres->unlock(); + return PJ_FALSE; + } +@@ -200,6 +202,7 @@ PresSubServer::pres_on_rx_subscribe_requ + if (status != PJ_SUCCESS) { + WARN("Unable to accept presence subscription %d", status); + pjsip_pres_terminate(sub, PJ_FALSE); ++ pjsip_dlg_dec_lock(dlg); + pres->unlock(); + return PJ_FALSE; + } +@@ -209,6 +212,7 @@ PresSubServer::pres_on_rx_subscribe_requ + + if (presSubServer->getExpires() == 0) { + // PJSIP_EVSUB_STATE_TERMINATED ++ pjsip_dlg_dec_lock(dlg); + pres->unlock(); + return PJ_TRUE; + } +@@ -245,10 +249,12 @@ PresSubServer::pres_on_rx_subscribe_requ + if (status != PJ_SUCCESS) { + WARN("Unable to create/send NOTIFY %d", status); + pjsip_pres_terminate(sub, PJ_FALSE); ++ pjsip_dlg_dec_lock(dlg); + pres->unlock(); + return status; + } + ++ pjsip_dlg_dec_lock(dlg); + pres->unlock(); + return PJ_TRUE; + } +diff -up sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp.pjsip-api-change sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp +--- sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp.pjsip-api-change 2017-09-06 16:49:38.812165235 +0200 ++++ sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp 2017-09-06 16:54:46.362160982 +0200 +@@ -405,9 +405,10 @@ transaction_request_cb(pjsip_rx_data *rd + + pjsip_dialog *dialog = 0; + +- if (pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, nullptr, &dialog) != PJ_SUCCESS) { ++ if (pjsip_dlg_create_uas_and_inc_lock(pjsip_ua_instance(), rdata, nullptr, &dialog) != PJ_SUCCESS) { + call.reset(); + try_respond_stateless(endpt_, rdata, PJSIP_SC_INTERNAL_SERVER_ERROR, nullptr, nullptr, nullptr); ++ pjsip_dlg_dec_lock(dialog); + return PJ_FALSE; + } + +@@ -415,11 +416,13 @@ transaction_request_cb(pjsip_rx_data *rd + + if (!dialog or pjsip_dlg_set_transport(dialog, &tp_sel) != PJ_SUCCESS) { + ERROR("Could not set transport for dialog"); ++ pjsip_dlg_dec_lock(dialog); + return PJ_FALSE; + } + + if (!call->inv) { + ERROR("Call invite is not initialized"); ++ pjsip_dlg_dec_lock(dialog); + return PJ_FALSE; + } + +@@ -443,6 +446,7 @@ transaction_request_cb(pjsip_rx_data *rd + try_respond_stateless(endpt_, rdata, PJSIP_SC_INTERNAL_SERVER_ERROR, NULL, NULL, NULL); + } + ++ pjsip_dlg_dec_lock(dialog); + return PJ_FALSE; + } + +@@ -464,11 +468,13 @@ transaction_request_cb(pjsip_rx_data *rd + } else { // Proceed with normal call flow + if (pjsip_inv_initial_answer(call->inv, rdata, PJSIP_SC_TRYING, NULL, NULL, &tdata) != PJ_SUCCESS) { + ERROR("Could not answer invite"); ++ pjsip_dlg_dec_lock(dialog); + return PJ_FALSE; + } + + if (pjsip_inv_send_msg(call->inv, tdata) != PJ_SUCCESS) { + ERROR("Could not send msg for invite"); ++ pjsip_dlg_dec_lock(dialog); + return PJ_FALSE; + } + +@@ -476,6 +482,7 @@ transaction_request_cb(pjsip_rx_data *rd + + if (pjsip_inv_answer(call->inv, PJSIP_SC_RINGING, NULL, NULL, &tdata) != PJ_SUCCESS) { + ERROR("Could not answer invite"); ++ pjsip_dlg_dec_lock(dialog); + return PJ_FALSE; + } + +@@ -485,6 +492,7 @@ transaction_request_cb(pjsip_rx_data *rd + + if (pjsip_inv_send_msg(call->inv, tdata) != PJ_SUCCESS) { + ERROR("Could not send msg for invite"); ++ pjsip_dlg_dec_lock(dialog); + return PJ_FALSE; + } + +@@ -494,6 +502,8 @@ transaction_request_cb(pjsip_rx_data *rd + Manager::instance().incomingCall(*call, account_id); + } + ++ pjsip_dlg_dec_lock(dialog); ++ + return PJ_FALSE; + } + diff --git a/sflphone.spec b/sflphone.spec index 8b17eae..fb3f924 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 25%{?dist} +Release: 26%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -33,6 +33,8 @@ Patch9: sflphone_gcc6.patch Patch10: sflphone_gcc7.patch # Don't use --g-fatal-warnings for glib-genmarshal Patch11: sflphone_g-fatal-warnings.patch +# Adapt to pjsip API change +Patch12: sflphone-pjspi-api-change.patch BuildRequires: alsa-lib-devel BuildRequires: ccrtp-devel @@ -299,6 +301,9 @@ fi %changelog +* Wed Sep 06 2017 Milan Crha - 1.4.1-26 +- Add patch to adapt to pjspi API change + * Mon Aug 28 2017 Milan Crha - 1.4.1-25 - Add patch to not use --g-fatal-warnings for glib-genmarshal From 4b767a8c7dbddbd1a4c053ed8220556bbc76c6f7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 6 Sep 2017 23:28:35 +0200 Subject: [PATCH 16/30] Add patch to fix deprecated dbus marshalling types --- sflphone.spec | 9 ++++--- sflphone_dbus.patch | 28 +++++++++++++++++++ sflphone_g-fatal-warnings.patch | 48 --------------------------------- 3 files changed, 34 insertions(+), 51 deletions(-) create mode 100644 sflphone_dbus.patch delete mode 100644 sflphone_g-fatal-warnings.patch diff --git a/sflphone.spec b/sflphone.spec index fb3f924..8a8d35e 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 26%{?dist} +Release: 27%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -31,8 +31,8 @@ Patch9: sflphone_gcc6.patch # - ISO C++ forbids flexible array member 'm_Data' [-Werror=pedantic] # - error: this statement may fall through [-Werror=implicit-fallthrough=] Patch10: sflphone_gcc7.patch -# Don't use --g-fatal-warnings for glib-genmarshal -Patch11: sflphone_g-fatal-warnings.patch +# Fix FTBFS due to ERROR: The token "BOOL" is deprecated; use "BOOLEAN" instead +Patch11: sflphone_dbus.patch # Adapt to pjsip API change Patch12: sflphone-pjspi-api-change.patch @@ -301,6 +301,9 @@ fi %changelog +* Wed Sep 06 2017 Sandro Mani - 1.4.1-27 +- Add patch to fix deprecated dbus marshalling types + * Wed Sep 06 2017 Milan Crha - 1.4.1-26 - Add patch to adapt to pjspi API change diff --git a/sflphone_dbus.patch b/sflphone_dbus.patch new file mode 100644 index 0000000..0743cd9 --- /dev/null +++ b/sflphone_dbus.patch @@ -0,0 +1,28 @@ +diff -rupN sflphone-1.4.1/gnome/src/dbus/dbus.c sflphone-1.4.1-new/gnome/src/dbus/dbus.c +--- sflphone-1.4.1/gnome/src/dbus/dbus.c 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/gnome/src/dbus/dbus.c 2017-08-09 16:43:51.217374161 +0200 +@@ -829,7 +829,7 @@ gboolean dbus_connect(GError **error, SF + + /* Register STRING STRING BOOL Marshaller */ + dbus_g_object_register_marshaller( +- g_cclosure_user_marshal_VOID__STRING_STRING_BOOL, G_TYPE_NONE, ++ g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN, G_TYPE_NONE, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID); + + /* Register STRING STRING INT Marshaller */ +diff -rupN sflphone-1.4.1/gnome/src/dbus/marshaller.list sflphone-1.4.1-new/gnome/src/dbus/marshaller.list +--- sflphone-1.4.1/gnome/src/dbus/marshaller.list 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/gnome/src/dbus/marshaller.list 2017-08-09 16:43:34.577383669 +0200 +@@ -5,9 +5,9 @@ VOID:STRING,INT + VOID:STRING,DOUBLE + VOID:STRING,STRING + VOID:STRING,INT,INT +-VOID:STRING,STRING,BOOL ++VOID:STRING,STRING,BOOLEAN + VOID:STRING,STRING,INT + VOID:STRING,STRING,STRING +-VOID:STRING,STRING,INT,INT,BOOL +-VOID:STRING,STRING,BOOL,STRING ++VOID:STRING,STRING,INT,INT,BOOLEAN ++VOID:STRING,STRING,BOOLEAN,STRING + VOID:STRING,BOXED diff --git a/sflphone_g-fatal-warnings.patch b/sflphone_g-fatal-warnings.patch deleted file mode 100644 index 1550caf..0000000 --- a/sflphone_g-fatal-warnings.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up sflphone-1.4.1/gnome/src/dbus/Makefile.am.g-fatal-warnings sflphone-1.4.1/gnome/src/dbus/Makefile.am ---- sflphone-1.4.1/gnome/src/dbus/Makefile.am.g-fatal-warnings 2017-08-28 11:48:47.000000000 +0200 -+++ sflphone-1.4.1/gnome/src/dbus/Makefile.am 2017-08-28 11:50:48.611502817 +0200 -@@ -27,10 +27,10 @@ endif - - # Create the necessary marshallers for the signals implemented by the library - marshaller.c: marshaller.list -- glib-genmarshal --body --g-fatal-warnings $< > $@ -+ glib-genmarshal --body $< > $@ - - marshaller.h: marshaller.list -- glib-genmarshal --header --g-fatal-warnings $< > $@ -+ glib-genmarshal --header $< > $@ - - libdbus_la_SOURCES= \ - dbus.c \ -diff -up sflphone-1.4.1/gnome/src/dbus/Makefile.g-fatal-warnings sflphone-1.4.1/gnome/src/dbus/Makefile ---- sflphone-1.4.1/gnome/src/dbus/Makefile.g-fatal-warnings 2017-08-28 11:48:47.000000000 +0200 -+++ sflphone-1.4.1/gnome/src/dbus/Makefile 2017-08-28 11:50:27.804503104 +0200 -@@ -640,10 +640,10 @@ videomanager-glue.h: videomanager-intros - - # Create the necessary marshallers for the signals implemented by the library - marshaller.c: marshaller.list -- glib-genmarshal --body --g-fatal-warnings $< > $@ -+ glib-genmarshal --body $< > $@ - - marshaller.h: marshaller.list -- glib-genmarshal --header --g-fatal-warnings $< > $@ -+ glib-genmarshal --header $< > $@ - - -include $(top_srcdir)/git.mk - -diff -up sflphone-1.4.1/gnome/src/dbus/Makefile.in.g-fatal-warnings sflphone-1.4.1/gnome/src/dbus/Makefile.in ---- sflphone-1.4.1/gnome/src/dbus/Makefile.in.g-fatal-warnings 2017-08-28 11:48:47.000000000 +0200 -+++ sflphone-1.4.1/gnome/src/dbus/Makefile.in 2017-08-28 11:51:00.844502647 +0200 -@@ -640,10 +640,10 @@ indent: - - # Create the necessary marshallers for the signals implemented by the library - marshaller.c: marshaller.list -- glib-genmarshal --body --g-fatal-warnings $< > $@ -+ glib-genmarshal --body $< > $@ - - marshaller.h: marshaller.list -- glib-genmarshal --header --g-fatal-warnings $< > $@ -+ glib-genmarshal --header $< > $@ - - -include $(top_srcdir)/git.mk - From eeeb05add16852b0083608ee5b7ea392d3f45db1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 18 Jan 2018 22:16:40 +0100 Subject: [PATCH 17/30] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- sflphone.spec | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/sflphone.spec b/sflphone.spec index 8a8d35e..37b2e8e 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 27%{?dist} +Release: 28%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -226,38 +226,9 @@ cd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ zcat sflphone-client-kde.svgz > sflphone-client-kde.svg && rm -f sflphone-client-kde.svgz ) +%post kde -p /usr/sbin/ldconfig -%post gnome -/usr/bin/update-desktop-database &> /dev/null || : -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun gnome -/usr/bin/update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans gnome -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - - -%post kde -/usr/sbin/ldconfig -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun kde -/usr/sbin/ldconfig -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans kde -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - +%postun kde -p /usr/sbin/ldconfig %files common %license COPYING @@ -301,6 +272,9 @@ fi %changelog +* Thu Jan 18 2018 Igor Gnatenko - 1.4.1-28 +- Remove obsolete scriptlets + * Wed Sep 06 2017 Sandro Mani - 1.4.1-27 - Add patch to fix deprecated dbus marshalling types From 8a142c361435ea9b2f1ac7b612c5511800f0c3f7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 26 Jan 2018 14:03:46 +0100 Subject: [PATCH 18/30] Fix ldconfig dependency Signed-off-by: Igor Gnatenko --- sflphone.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sflphone.spec b/sflphone.spec index 37b2e8e..88d89eb 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 28%{?dist} +Release: 29%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -226,9 +226,9 @@ cd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ zcat sflphone-client-kde.svgz > sflphone-client-kde.svg && rm -f sflphone-client-kde.svgz ) -%post kde -p /usr/sbin/ldconfig +%post kde -p /sbin/ldconfig -%postun kde -p /usr/sbin/ldconfig +%postun kde -p /sbin/ldconfig %files common %license COPYING @@ -272,6 +272,9 @@ zcat sflphone-client-kde.svgz > sflphone-client-kde.svg && rm -f sflphone-client %changelog +* Fri Jan 26 2018 Igor Gnatenko - 1.4.1-29 +- Fix ldconfig dependency + * Thu Jan 18 2018 Igor Gnatenko - 1.4.1-28 - Remove obsolete scriptlets From 74061b88799a14c7125daa395afdbec6ad99350a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 16:34:31 +0000 Subject: [PATCH 19/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index 88d89eb..8e698d1 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 29%{?dist} +Release: 30%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -272,6 +272,9 @@ zcat sflphone-client-kde.svgz > sflphone-client-kde.svg && rm -f sflphone-client %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.4.1-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Jan 26 2018 Igor Gnatenko - 1.4.1-29 - Fix ldconfig dependency From 3c2a9b09d17ef39a88444c8cd6474b87f1a7201f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 13 Feb 2018 11:14:50 +0100 Subject: [PATCH 20/30] Add patch to fix GCC8 FTBFS --- sflphone.spec | 2 ++ sflphone_gcc8.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 sflphone_gcc8.patch diff --git a/sflphone.spec b/sflphone.spec index 8e698d1..71cfce2 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -35,6 +35,8 @@ Patch10: sflphone_gcc7.patch Patch11: sflphone_dbus.patch # Adapt to pjsip API change Patch12: sflphone-pjspi-api-change.patch +# Fix GCC8 FTBFS +Patch13: sflphone_gcc8.patch BuildRequires: alsa-lib-devel BuildRequires: ccrtp-devel diff --git a/sflphone_gcc8.patch b/sflphone_gcc8.patch new file mode 100644 index 0000000..9bd11e0 --- /dev/null +++ b/sflphone_gcc8.patch @@ -0,0 +1,12 @@ +diff -rupN sflphone-1.4.1/kde/src/lib/call.h sflphone-1.4.1-new/kde/src/lib/call.h +--- sflphone-1.4.1/kde/src/lib/call.h 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/call.h 2018-02-13 10:57:14.159950044 +0100 +@@ -461,7 +461,7 @@ private: + //Automate functions + // See actionPerformedFunctionMap and stateChangedFunctionMap + // to know when it is called. +- void nothing () __attribute__ ((const)); ++ void nothing (); + void error () __attribute__ ((noreturn)); + void failure (); + void accept (); From 661ed307ea66770bbd5d1bbaaf5147792d41dfe3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 19 Feb 2018 10:56:27 +0100 Subject: [PATCH 21/30] Add missing BR: gcc-c++, make --- sflphone.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index 71cfce2..224f416 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 30%{?dist} +Release: 31%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -48,6 +48,7 @@ BuildRequires: dbus-c++-devel BuildRequires: desktop-file-utils BuildRequires: expat-devel BuildRequires: evolution-data-server-devel +BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: gnome-common BuildRequires: gnome-doc-utils @@ -64,6 +65,7 @@ BuildRequires: libsndfile-devel BuildRequires: libtool BuildRequires: libyaml-devel BuildRequires: libzrtpcpp-devel +BuildRequires: make BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: perl-podlators @@ -274,6 +276,9 @@ zcat sflphone-client-kde.svgz > sflphone-client-kde.svg && rm -f sflphone-client %changelog +* Mon Feb 19 2018 Sandro Mani - 1.4.1-31 +- Add missing BR: gcc-c++, make + * Fri Feb 09 2018 Fedora Release Engineering - 1.4.1-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 2324865b8b7430680d902878320dfbfc015aba20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 06:01:09 +0000 Subject: [PATCH 22/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index 224f416..bf91e4c 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 31%{?dist} +Release: 32%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -276,6 +276,9 @@ zcat sflphone-client-kde.svgz > sflphone-client-kde.svg && rm -f sflphone-client %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.4.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Feb 19 2018 Sandro Mani - 1.4.1-31 - Add missing BR: gcc-c++, make From d7e59a9790530dfbe242e89803e7c2fe2c8a04e5 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 21 Jul 2018 23:44:16 +0200 Subject: [PATCH 23/30] Update sflphone-pjspi-api-change.patch --- sflphone-pjspi-api-change.patch | 34 ++++++++++++++++++++++++++------ sflphone_dbus.patch | 4 ++-- sflphone_gcc5.patch | 4 ++-- sflphone_gcc6.patch | 10 +++++----- sflphone_gcc7.patch | 10 +++++----- sflphone_gcc8.patch | 2 +- sflphone_icondir.patch | 6 +++--- sflphone_memory-corruption.patch | 8 ++++---- sflphone_novideo.patch | 2 +- sflphone_sflphoned-dir.patch | 6 +++--- sflphone_tls.patch | 2 +- sflphone_unbundle.patch | 14 ++++++------- sflphone_zrtp-includes.patch | 4 ++-- sflphone_zrtp.patch | 2 +- 14 files changed, 65 insertions(+), 43 deletions(-) diff --git a/sflphone-pjspi-api-change.patch b/sflphone-pjspi-api-change.patch index 266db65..3645884 100644 --- a/sflphone-pjspi-api-change.patch +++ b/sflphone-pjspi-api-change.patch @@ -1,6 +1,6 @@ -diff -up sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp.pjsip-api-change sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp ---- sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp.pjsip-api-change 2017-09-06 16:49:23.087165453 +0200 -+++ sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp 2017-09-06 16:52:28.338162891 +0200 +diff -rupN sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp sflphone-1.4.1-new/daemon/src/sip/pres_sub_server.cpp +--- sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/pres_sub_server.cpp 2018-07-21 23:32:26.749184397 +0200 @@ -122,12 +122,13 @@ PresSubServer::pres_on_rx_subscribe_requ /* Create UAS dialog: */ @@ -53,9 +53,21 @@ diff -up sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp.pjsip-api-change sflp pres->unlock(); return PJ_TRUE; } -diff -up sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp.pjsip-api-change sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp ---- sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp.pjsip-api-change 2017-09-06 16:49:38.812165235 +0200 -+++ sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp 2017-09-06 16:54:46.362160982 +0200 +diff -rupN sflphone-1.4.1/daemon/src/sip/siptransport.cpp sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp +--- sflphone-1.4.1/daemon/src/sip/siptransport.cpp 2018-07-21 23:32:26.085184537 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp 2018-07-21 23:32:26.749184397 +0200 +@@ -447,7 +447,7 @@ SipTransport::findLocalAddressFromSTUN(p + + IpAddr mapped_addr; + pj_sock_t sipSocket = pjsip_udp_transport_get_socket(transport); +- const pjstun_setting stunOpt = {PJ_TRUE, *stunServerName, stunPort, *stunServerName, stunPort}; ++ const pjstun_setting stunOpt = {PJ_TRUE, AF_INET, *stunServerName, stunPort, *stunServerName, stunPort}; + const pj_status_t stunStatus = pjstun_get_mapped_addr2(&cp_.factory, &stunOpt, 1, &sipSocket, &static_cast(mapped_addr)); + + switch (stunStatus) { +diff -rupN sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp +--- sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp 2018-07-21 23:32:26.245184503 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp 2018-07-21 23:32:26.749184397 +0200 @@ -405,9 +405,10 @@ transaction_request_cb(pjsip_rx_data *rd pjsip_dialog *dialog = 0; @@ -129,3 +141,13 @@ diff -up sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp.pjsip-api-change sflphone return PJ_FALSE; } +@@ -575,6 +585,9 @@ SIPVoIPLink::SIPVoIPLink() : sipTranspor + outgoing_request_forked_cb, + transaction_state_changed_cb, + sdp_request_offer_cb, ++#if PJ_VERSION_NUM > (2 << 24 | 7 << 16) ++ nullptr /* on_rx_offer2 */, ++#endif + #if PJ_VERSION_NUM > (2 << 24 | 1 << 16) + nullptr /* on_rx_reinvite */, + #endif diff --git a/sflphone_dbus.patch b/sflphone_dbus.patch index 0743cd9..7058384 100644 --- a/sflphone_dbus.patch +++ b/sflphone_dbus.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/gnome/src/dbus/dbus.c sflphone-1.4.1-new/gnome/src/dbus/dbus.c --- sflphone-1.4.1/gnome/src/dbus/dbus.c 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/gnome/src/dbus/dbus.c 2017-08-09 16:43:51.217374161 +0200 ++++ sflphone-1.4.1-new/gnome/src/dbus/dbus.c 2018-07-21 23:32:26.583184432 +0200 @@ -829,7 +829,7 @@ gboolean dbus_connect(GError **error, SF /* Register STRING STRING BOOL Marshaller */ @@ -12,7 +12,7 @@ diff -rupN sflphone-1.4.1/gnome/src/dbus/dbus.c sflphone-1.4.1-new/gnome/src/dbu /* Register STRING STRING INT Marshaller */ diff -rupN sflphone-1.4.1/gnome/src/dbus/marshaller.list sflphone-1.4.1-new/gnome/src/dbus/marshaller.list --- sflphone-1.4.1/gnome/src/dbus/marshaller.list 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/gnome/src/dbus/marshaller.list 2017-08-09 16:43:34.577383669 +0200 ++++ sflphone-1.4.1-new/gnome/src/dbus/marshaller.list 2018-07-21 23:32:26.583184432 +0200 @@ -5,9 +5,9 @@ VOID:STRING,INT VOID:STRING,DOUBLE VOID:STRING,STRING diff --git a/sflphone_gcc5.patch b/sflphone_gcc5.patch index 1f01193..0d97d41 100644 --- a/sflphone_gcc5.patch +++ b/sflphone_gcc5.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/src/ip_utils.h sflphone-1.4.1-new/daemon/src/ip_utils.h --- sflphone-1.4.1/daemon/src/ip_utils.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/ip_utils.h 2015-02-21 23:27:06.631839605 +0100 ++++ sflphone-1.4.1-new/daemon/src/ip_utils.h 2018-07-21 23:32:25.599184640 +0200 @@ -33,6 +33,7 @@ #define IP_UTILS_H_ @@ -11,7 +11,7 @@ diff -rupN sflphone-1.4.1/daemon/src/ip_utils.h sflphone-1.4.1-new/daemon/src/ip #include diff -rupN sflphone-1.4.1/daemon/src/sip/sipaccount.cpp sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp --- sflphone-1.4.1/daemon/src/sip/sipaccount.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp 2015-02-21 23:42:40.570974842 +0100 ++++ sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp 2018-07-21 23:32:25.599184640 +0200 @@ -107,7 +107,7 @@ SIPAccount::SIPAccount(const std::string , tlsPassword_() , tlsMethod_("TLSv1") diff --git a/sflphone_gcc6.patch b/sflphone_gcc6.patch index afac507..e12c636 100644 --- a/sflphone_gcc6.patch +++ b/sflphone_gcc6.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/kde/src/lib/contact.cpp sflphone-1.4.1-new/kde/src/lib/contact.cpp --- sflphone-1.4.1/kde/src/lib/contact.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/contact.cpp 2016-02-05 19:02:48.755201247 +0100 ++++ sflphone-1.4.1-new/kde/src/lib/contact.cpp 2018-07-21 23:32:26.246184503 +0200 @@ -453,13 +453,3 @@ bool Contact::operator==(const Contact* { return other && this->d == other->d; @@ -17,7 +17,7 @@ diff -rupN sflphone-1.4.1/kde/src/lib/contact.cpp sflphone-1.4.1-new/kde/src/lib -} diff -rupN sflphone-1.4.1/kde/src/lib/contact.h sflphone-1.4.1-new/kde/src/lib/contact.h --- sflphone-1.4.1/kde/src/lib/contact.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/contact.h 2016-02-05 19:02:42.812041560 +0100 ++++ sflphone-1.4.1-new/kde/src/lib/contact.h 2018-07-21 23:32:26.247184503 +0200 @@ -132,8 +132,6 @@ public: //Operator bool operator==(Contact* other); @@ -29,7 +29,7 @@ diff -rupN sflphone-1.4.1/kde/src/lib/contact.h sflphone-1.4.1-new/kde/src/lib/c void slotPresenceChanged(); diff -rupN sflphone-1.4.1/kde/src/lib/phonenumber.cpp sflphone-1.4.1-new/kde/src/lib/phonenumber.cpp --- sflphone-1.4.1/kde/src/lib/phonenumber.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/phonenumber.cpp 2016-02-05 19:29:37.775461245 +0100 ++++ sflphone-1.4.1-new/kde/src/lib/phonenumber.cpp 2018-07-21 23:32:26.247184503 +0200 @@ -547,16 +547,6 @@ bool PhoneNumber::operator==(const Phone return other && this->d == other->d; } @@ -49,7 +49,7 @@ diff -rupN sflphone-1.4.1/kde/src/lib/phonenumber.cpp sflphone-1.4.1-new/kde/src * Temporary phone number * diff -rupN sflphone-1.4.1/kde/src/lib/phonenumber.h sflphone-1.4.1-new/kde/src/lib/phonenumber.h --- sflphone-1.4.1/kde/src/lib/phonenumber.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/phonenumber.h 2016-02-05 19:29:27.722111681 +0100 ++++ sflphone-1.4.1-new/kde/src/lib/phonenumber.h 2018-07-21 23:32:26.247184503 +0200 @@ -125,8 +125,6 @@ public: //Operator bool operator==(PhoneNumber* other); @@ -61,7 +61,7 @@ diff -rupN sflphone-1.4.1/kde/src/lib/phonenumber.h sflphone-1.4.1-new/kde/src/l //Constructor diff -rupN sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp --- sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp 2016-02-05 19:18:04.561964557 +0100 ++++ sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp 2018-07-21 23:32:26.247184503 +0200 @@ -49,10 +49,7 @@ struct SHMHeader{ /* The header will be aligned on 16-byte boundaries */ char padding[8]; diff --git a/sflphone_gcc7.patch b/sflphone_gcc7.patch index 68bc42a..d5629f8 100644 --- a/sflphone_gcc7.patch +++ b/sflphone_gcc7.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/kde/src/eventmanager.cpp sflphone-1.4.1-new/kde/src/eventmanager.cpp --- sflphone-1.4.1/kde/src/eventmanager.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/eventmanager.cpp 2017-02-16 16:34:26.071363596 +0100 ++++ sflphone-1.4.1-new/kde/src/eventmanager.cpp 2018-07-21 23:32:26.421184466 +0200 @@ -63,6 +63,7 @@ protected: break; case Qt::WindowActive: @@ -19,7 +19,7 @@ diff -rupN sflphone-1.4.1/kde/src/eventmanager.cpp sflphone-1.4.1-new/kde/src/ev case Call::State::TRANSF_HOLD: diff -rupN sflphone-1.4.1/kde/src/lib/account.cpp sflphone-1.4.1-new/kde/src/lib/account.cpp --- sflphone-1.4.1/kde/src/lib/account.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/account.cpp 2017-02-16 15:01:18.122412899 +0100 ++++ sflphone-1.4.1-new/kde/src/lib/account.cpp 2018-07-21 23:32:26.422184466 +0200 @@ -374,8 +374,10 @@ QString Account::password() const case Account::Protocol::SIP: if (credentialsModel()->rowCount()) @@ -33,7 +33,7 @@ diff -rupN sflphone-1.4.1/kde/src/lib/account.cpp sflphone-1.4.1-new/kde/src/lib } diff -rupN sflphone-1.4.1/kde/src/lib/call.cpp sflphone-1.4.1-new/kde/src/lib/call.cpp --- sflphone-1.4.1/kde/src/lib/call.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/call.cpp 2017-02-16 14:51:22.512603859 +0100 ++++ sflphone-1.4.1-new/kde/src/lib/call.cpp 2018-07-21 23:32:26.422184466 +0200 @@ -191,16 +191,22 @@ QDebug LIB_EXPORT operator<<(QDebug dbg, switch (c) { case Call::Action::ACCEPT: @@ -58,8 +58,8 @@ diff -rupN sflphone-1.4.1/kde/src/lib/call.cpp sflphone-1.4.1-new/kde/src/lib/ca dbg.space(); dbg.nospace() << '(' << static_cast(c) << ')'; diff -rupN sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp ---- sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp 2017-02-16 14:35:42.351238109 +0100 -+++ sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp 2017-02-16 14:37:30.942915551 +0100 +--- sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp 2018-07-21 23:32:26.420184466 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp 2018-07-21 23:32:26.422184466 +0200 @@ -49,7 +49,7 @@ struct SHMHeader{ /* The header will be aligned on 16-byte boundaries */ char padding[8]; diff --git a/sflphone_gcc8.patch b/sflphone_gcc8.patch index 9bd11e0..e776aa5 100644 --- a/sflphone_gcc8.patch +++ b/sflphone_gcc8.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/kde/src/lib/call.h sflphone-1.4.1-new/kde/src/lib/call.h --- sflphone-1.4.1/kde/src/lib/call.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/call.h 2018-02-13 10:57:14.159950044 +0100 ++++ sflphone-1.4.1-new/kde/src/lib/call.h 2018-07-21 23:32:26.913184362 +0200 @@ -461,7 +461,7 @@ private: //Automate functions // See actionPerformedFunctionMap and stateChangedFunctionMap diff --git a/sflphone_icondir.patch b/sflphone_icondir.patch index 4ef3829..310dc6d 100644 --- a/sflphone_icondir.patch +++ b/sflphone_icondir.patch @@ -1,6 +1,6 @@ -diff -rupN sflphone-1.4.0/gnome/pixmaps/Makefile.am sflphone-1.4.0-new/gnome/pixmaps/Makefile.am ---- sflphone-1.4.0/gnome/pixmaps/Makefile.am 2014-07-18 22:45:09.000000000 +0200 -+++ sflphone-1.4.0-new/gnome/pixmaps/Makefile.am 2014-08-10 15:07:48.842721079 +0200 +diff -rupN sflphone-1.4.1/gnome/pixmaps/Makefile.am sflphone-1.4.1-new/gnome/pixmaps/Makefile.am +--- sflphone-1.4.1/gnome/pixmaps/Makefile.am 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/gnome/pixmaps/Makefile.am 2018-07-21 23:32:24.764184816 +0200 @@ -1,4 +1,4 @@ -icondir = $(datadir)/pixmaps +icondir = $(datadir)/icons/hicolor/scalable/apps diff --git a/sflphone_memory-corruption.patch b/sflphone_memory-corruption.patch index 467bdd7..a62e874 100644 --- a/sflphone_memory-corruption.patch +++ b/sflphone_memory-corruption.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/src/sip/sipaccount.cpp sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp ---- sflphone-1.4.1/daemon/src/sip/sipaccount.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp 2015-06-07 00:15:17.460394766 +0200 +--- sflphone-1.4.1/daemon/src/sip/sipaccount.cpp 2018-07-21 23:32:25.757184606 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp 2018-07-21 23:32:26.087184537 +0200 @@ -1076,10 +1076,20 @@ void SIPAccount::initTlsConfiguration() // TLS listener is unique and should be only modified through IP2IP_PROFILE pjsip_tls_setting_default(&tlsSetting_); @@ -67,7 +67,7 @@ diff -rupN sflphone-1.4.1/daemon/src/sip/sipaccount.cpp sflphone-1.4.1-new/daemo } diff -rupN sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp --- sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp 2015-06-03 00:27:56.528068793 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp 2018-07-21 23:32:26.087184537 +0200 @@ -508,6 +508,11 @@ pjsip_module * SIPVoIPLink::getMod() return &mod_ua_; } @@ -82,7 +82,7 @@ diff -rupN sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp sflphone-1.4.1-new/daem #ifdef SFL_VIDEO diff -rupN sflphone-1.4.1/daemon/src/sip/sipvoiplink.h sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.h --- sflphone-1.4.1/daemon/src/sip/sipvoiplink.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.h 2015-06-03 00:27:35.439631448 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.h 2018-07-21 23:32:26.088184536 +0200 @@ -302,6 +302,8 @@ class SIPVoIPLink : public VoIPLink { int getModId(); pjsip_endpoint * getEndpoint(); diff --git a/sflphone_novideo.patch b/sflphone_novideo.patch index 8c4b467..b1b7e36 100644 --- a/sflphone_novideo.patch +++ b/sflphone_novideo.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/kde/src/CMakeLists.txt sflphone-1.4.1-new/kde/src/CMakeLists.txt --- sflphone-1.4.1/kde/src/CMakeLists.txt 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/CMakeLists.txt 2014-12-27 21:29:30.736654122 +0100 ++++ sflphone-1.4.1-new/kde/src/CMakeLists.txt 2018-07-21 23:32:25.423184677 +0200 @@ -7,6 +7,7 @@ if(POLICY CMP0022) endif(POLICY CMP0022) diff --git a/sflphone_sflphoned-dir.patch b/sflphone_sflphoned-dir.patch index ec266bf..63e7b05 100644 --- a/sflphone_sflphoned-dir.patch +++ b/sflphone_sflphoned-dir.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/src/client/dbus/Makefile.am sflphone-1.4.1-new/daemon/src/client/dbus/Makefile.am --- sflphone-1.4.1/daemon/src/client/dbus/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/client/dbus/Makefile.am 2015-05-06 14:35:15.551521795 +0200 ++++ sflphone-1.4.1-new/daemon/src/client/dbus/Makefile.am 2018-07-21 23:32:25.759184606 +0200 @@ -70,7 +70,7 @@ service_DATA = $(service_in_files:.servi # Rule to make the service file with bindir expanded @@ -11,8 +11,8 @@ diff -rupN sflphone-1.4.1/daemon/src/client/dbus/Makefile.am sflphone-1.4.1-new/ EXTRA_DIST = README $(service_in_files) \ callmanager-introspec.xml \ diff -rupN sflphone-1.4.1/daemon/src/Makefile.am sflphone-1.4.1-new/daemon/src/Makefile.am ---- sflphone-1.4.1/daemon/src/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/Makefile.am 2015-05-06 14:31:46.556525919 +0200 +--- sflphone-1.4.1/daemon/src/Makefile.am 2018-07-21 23:32:25.100184745 +0200 ++++ sflphone-1.4.1-new/daemon/src/Makefile.am 2018-07-21 23:32:25.759184606 +0200 @@ -1,6 +1,5 @@ include ../globals.mak diff --git a/sflphone_tls.patch b/sflphone_tls.patch index 2fbe526..9aad29b 100644 --- a/sflphone_tls.patch +++ b/sflphone_tls.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/src/sip/siptransport.cpp sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp --- sflphone-1.4.1/daemon/src/sip/siptransport.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp 2015-05-15 16:31:17.575239534 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp 2018-07-21 23:32:25.926184570 +0200 @@ -254,7 +254,7 @@ SipTransport::createTlsListener(SIPAccou listeningAddress.setPort(account.getTlsListenerPort()); diff --git a/sflphone_unbundle.patch b/sflphone_unbundle.patch index 34c0ea6..6a7b039 100644 --- a/sflphone_unbundle.patch +++ b/sflphone_unbundle.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/configure.ac sflphone-1.4.1-new/daemon/configure.ac --- sflphone-1.4.1/daemon/configure.ac 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/configure.ac 2014-12-13 23:38:33.295585251 +0100 ++++ sflphone-1.4.1-new/daemon/configure.ac 2018-07-21 23:32:24.936184780 +0200 @@ -431,8 +431,6 @@ AS_IF([test "x$enable_debug" = "xyes"], dnl What Makefiles to generate @@ -19,7 +19,7 @@ diff -rupN sflphone-1.4.1/daemon/configure.ac sflphone-1.4.1-new/daemon/configur +AC_MSG_NOTICE([[Configuration done! Run `make' to build the software.]]) diff -rupN sflphone-1.4.1/daemon/globals.mak sflphone-1.4.1-new/daemon/globals.mak --- sflphone-1.4.1/daemon/globals.mak 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/globals.mak 2014-12-13 23:38:33.296585270 +0100 ++++ sflphone-1.4.1-new/daemon/globals.mak 2018-07-21 23:32:24.936184780 +0200 @@ -7,18 +7,9 @@ sflplugindir=$(sfllibdir)/plugins ASTYLERC="$(top_srcdir)/../astylerc" @@ -56,7 +56,7 @@ diff -rupN sflphone-1.4.1/daemon/globals.mak sflphone-1.4.1-new/daemon/globals.m -DPROGSHAREDIR=\"${datadir}/sflphone\" \ diff -rupN sflphone-1.4.1/daemon/Makefile.am sflphone-1.4.1-new/daemon/Makefile.am --- sflphone-1.4.1/daemon/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/Makefile.am 2014-12-13 23:38:33.296585270 +0100 ++++ sflphone-1.4.1-new/daemon/Makefile.am 2018-07-21 23:32:24.936184780 +0200 @@ -19,7 +19,7 @@ unittest: endif @@ -68,7 +68,7 @@ diff -rupN sflphone-1.4.1/daemon/Makefile.am sflphone-1.4.1-new/daemon/Makefile. m4/lt~obsolete.m4 \ diff -rupN sflphone-1.4.1/daemon/src/iax/iaxcall.cpp sflphone-1.4.1-new/daemon/src/iax/iaxcall.cpp --- sflphone-1.4.1/daemon/src/iax/iaxcall.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/iax/iaxcall.cpp 2014-12-13 23:38:33.297585288 +0100 ++++ sflphone-1.4.1-new/daemon/src/iax/iaxcall.cpp 2018-07-21 23:32:24.936184780 +0200 @@ -31,8 +31,8 @@ #include @@ -82,7 +82,7 @@ diff -rupN sflphone-1.4.1/daemon/src/iax/iaxcall.cpp sflphone-1.4.1-new/daemon/s #include "logger.h" diff -rupN sflphone-1.4.1/daemon/src/iax/iaxvoiplink.h sflphone-1.4.1-new/daemon/src/iax/iaxvoiplink.h --- sflphone-1.4.1/daemon/src/iax/iaxvoiplink.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/iax/iaxvoiplink.h 2014-12-13 23:38:33.297585288 +0100 ++++ sflphone-1.4.1-new/daemon/src/iax/iaxvoiplink.h 2018-07-21 23:32:24.936184780 +0200 @@ -45,7 +45,7 @@ #include "noncopyable.h" #include "audio/resampler.h" @@ -94,7 +94,7 @@ diff -rupN sflphone-1.4.1/daemon/src/iax/iaxvoiplink.h sflphone-1.4.1-new/daemon diff -rupN sflphone-1.4.1/daemon/src/im/instant_messaging.h sflphone-1.4.1-new/daemon/src/im/instant_messaging.h --- sflphone-1.4.1/daemon/src/im/instant_messaging.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/im/instant_messaging.h 2014-12-13 23:38:33.298585307 +0100 ++++ sflphone-1.4.1-new/daemon/src/im/instant_messaging.h 2018-07-21 23:32:24.937184780 +0200 @@ -48,7 +48,7 @@ #include "config.h" @@ -106,7 +106,7 @@ diff -rupN sflphone-1.4.1/daemon/src/im/instant_messaging.h sflphone-1.4.1-new/d #define EMPTY_MESSAGE pj_str((char*)"") diff -rupN sflphone-1.4.1/daemon/src/Makefile.am sflphone-1.4.1-new/daemon/src/Makefile.am --- sflphone-1.4.1/daemon/src/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/Makefile.am 2014-12-13 23:38:33.298585307 +0100 ++++ sflphone-1.4.1-new/daemon/src/Makefile.am 2018-07-21 23:32:24.937184780 +0200 @@ -18,7 +18,7 @@ endif if USE_IAX IAX_SUBDIR=iax diff --git a/sflphone_zrtp-includes.patch b/sflphone_zrtp-includes.patch index deaa306..c9df5ea 100644 --- a/sflphone_zrtp-includes.patch +++ b/sflphone_zrtp-includes.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/src/audio/audiortp/Makefile.am sflphone-1.4.1-new/daemon/src/audio/audiortp/Makefile.am --- sflphone-1.4.1/daemon/src/audio/audiortp/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/audio/audiortp/Makefile.am 2014-12-27 21:56:46.320140246 +0100 ++++ sflphone-1.4.1-new/daemon/src/audio/audiortp/Makefile.am 2018-07-21 23:32:25.256184712 +0200 @@ -6,6 +6,8 @@ if BUILD_ZRTP SFL_ZRTP_SRC=audio_zrtp_session.h audio_zrtp_session.cpp zrtp_session_callback.cpp zrtp_session_callback.h endif @@ -12,7 +12,7 @@ diff -rupN sflphone-1.4.1/daemon/src/audio/audiortp/Makefile.am sflphone-1.4.1-n audio_rtp_session.cpp \ diff -rupN sflphone-1.4.1/daemon/src/client/Makefile.am sflphone-1.4.1-new/daemon/src/client/Makefile.am --- sflphone-1.4.1/daemon/src/client/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/client/Makefile.am 2014-12-27 21:56:23.078730082 +0100 ++++ sflphone-1.4.1-new/daemon/src/client/Makefile.am 2018-07-21 23:32:25.256184712 +0200 @@ -37,5 +37,6 @@ libclient_la_SOURCES = callmanager.cpp $(STUB_SRC) diff --git a/sflphone_zrtp.patch b/sflphone_zrtp.patch index 2bf5b32..378a9f4 100644 --- a/sflphone_zrtp.patch +++ b/sflphone_zrtp.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/src/audio/audiortp/audio_rtp_factory.cpp sflphone-1.4.1-new/daemon/src/audio/audiortp/audio_rtp_factory.cpp --- sflphone-1.4.1/daemon/src/audio/audiortp/audio_rtp_factory.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/audio/audiortp/audio_rtp_factory.cpp 2014-12-14 16:05:08.640248867 +0100 ++++ sflphone-1.4.1-new/daemon/src/audio/audiortp/audio_rtp_factory.cpp 2018-07-21 23:32:25.102184745 +0200 @@ -109,7 +109,7 @@ void AudioRtpFactory::initSession() // TODO: be careful with that. The hello hash is computed asynchronously. Maybe it's // not even available at that point. From d43265a3b2b9f9a6471bf8abfd3848f44791976c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:40:58 +0100 Subject: [PATCH 24/30] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- sflphone.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sflphone.spec b/sflphone.spec index bf91e4c..080e04d 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -230,9 +230,7 @@ cd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ zcat sflphone-client-kde.svgz > sflphone-client-kde.svg && rm -f sflphone-client-kde.svgz ) -%post kde -p /sbin/ldconfig - -%postun kde -p /sbin/ldconfig +%ldconfig_scriptlets kde %files common %license COPYING From 535650332b6486a0b23af696ad3ddde26d944e47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 15:15:55 +0000 Subject: [PATCH 25/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index 080e04d..8826762 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 32%{?dist} +Release: 33%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -274,6 +274,9 @@ zcat sflphone-client-kde.svgz > sflphone-client-kde.svg && rm -f sflphone-client %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 1.4.1-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 1.4.1-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From f11c144e4f0dfb8b4cbaa199108a4701a5fc91f3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 24 Apr 2019 18:47:34 +0200 Subject: [PATCH 26/30] Fix build against GCC9 --- sflphone-pjspi-api-change.patch | 10 +++---- sflphone.spec | 7 ++++- sflphone_dbus.patch | 4 +-- sflphone_gcc5.patch | 4 +-- sflphone_gcc6.patch | 10 +++---- sflphone_gcc7.patch | 10 +++---- sflphone_gcc8.patch | 2 +- sflphone_gcc9.patch | 47 ++++++++++++++++++++++++++++++++ sflphone_icondir.patch | 2 +- sflphone_memory-corruption.patch | 8 +++--- sflphone_novideo.patch | 2 +- sflphone_sflphoned-dir.patch | 6 ++-- sflphone_tls.patch | 2 +- sflphone_unbundle.patch | 14 +++++----- sflphone_zrtp-includes.patch | 4 +-- sflphone_zrtp.patch | 2 +- 16 files changed, 93 insertions(+), 41 deletions(-) create mode 100644 sflphone_gcc9.patch diff --git a/sflphone-pjspi-api-change.patch b/sflphone-pjspi-api-change.patch index 3645884..106a7df 100644 --- a/sflphone-pjspi-api-change.patch +++ b/sflphone-pjspi-api-change.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp sflphone-1.4.1-new/daemon/src/sip/pres_sub_server.cpp --- sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/pres_sub_server.cpp 2018-07-21 23:32:26.749184397 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/pres_sub_server.cpp 2019-04-02 18:20:14.819721209 +0200 @@ -122,12 +122,13 @@ PresSubServer::pres_on_rx_subscribe_requ /* Create UAS dialog: */ @@ -54,8 +54,8 @@ diff -rupN sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp sflphone-1.4.1-new/ return PJ_TRUE; } diff -rupN sflphone-1.4.1/daemon/src/sip/siptransport.cpp sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp ---- sflphone-1.4.1/daemon/src/sip/siptransport.cpp 2018-07-21 23:32:26.085184537 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp 2018-07-21 23:32:26.749184397 +0200 +--- sflphone-1.4.1/daemon/src/sip/siptransport.cpp 2019-04-02 18:20:14.214722211 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp 2019-04-02 18:20:14.819721209 +0200 @@ -447,7 +447,7 @@ SipTransport::findLocalAddressFromSTUN(p IpAddr mapped_addr; @@ -66,8 +66,8 @@ diff -rupN sflphone-1.4.1/daemon/src/sip/siptransport.cpp sflphone-1.4.1-new/dae switch (stunStatus) { diff -rupN sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp ---- sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp 2018-07-21 23:32:26.245184503 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp 2018-07-21 23:32:26.749184397 +0200 +--- sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp 2019-04-02 18:20:14.364721962 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp 2019-04-02 18:20:14.819721209 +0200 @@ -405,9 +405,10 @@ transaction_request_cb(pjsip_rx_data *rd pjsip_dialog *dialog = 0; diff --git a/sflphone.spec b/sflphone.spec index 8826762..53780d2 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 33%{?dist} +Release: 34%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -37,6 +37,8 @@ Patch11: sflphone_dbus.patch Patch12: sflphone-pjspi-api-change.patch # Fix GCC8 FTBFS Patch13: sflphone_gcc8.patch +# Fix GCC9 FTBFS +Patch14: sflphone_gcc9.patch BuildRequires: alsa-lib-devel BuildRequires: ccrtp-devel @@ -274,6 +276,9 @@ zcat sflphone-client-kde.svgz > sflphone-client-kde.svg && rm -f sflphone-client %changelog +* Wed Apr 24 2019 Sandro Mani - 1.4.1-34 +- Fix build against GCC9 + * Sat Feb 02 2019 Fedora Release Engineering - 1.4.1-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sflphone_dbus.patch b/sflphone_dbus.patch index 7058384..0728524 100644 --- a/sflphone_dbus.patch +++ b/sflphone_dbus.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/gnome/src/dbus/dbus.c sflphone-1.4.1-new/gnome/src/dbus/dbus.c --- sflphone-1.4.1/gnome/src/dbus/dbus.c 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/gnome/src/dbus/dbus.c 2018-07-21 23:32:26.583184432 +0200 ++++ sflphone-1.4.1-new/gnome/src/dbus/dbus.c 2019-04-02 18:20:14.670721456 +0200 @@ -829,7 +829,7 @@ gboolean dbus_connect(GError **error, SF /* Register STRING STRING BOOL Marshaller */ @@ -12,7 +12,7 @@ diff -rupN sflphone-1.4.1/gnome/src/dbus/dbus.c sflphone-1.4.1-new/gnome/src/dbu /* Register STRING STRING INT Marshaller */ diff -rupN sflphone-1.4.1/gnome/src/dbus/marshaller.list sflphone-1.4.1-new/gnome/src/dbus/marshaller.list --- sflphone-1.4.1/gnome/src/dbus/marshaller.list 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/gnome/src/dbus/marshaller.list 2018-07-21 23:32:26.583184432 +0200 ++++ sflphone-1.4.1-new/gnome/src/dbus/marshaller.list 2019-04-02 18:20:14.670721456 +0200 @@ -5,9 +5,9 @@ VOID:STRING,INT VOID:STRING,DOUBLE VOID:STRING,STRING diff --git a/sflphone_gcc5.patch b/sflphone_gcc5.patch index 0d97d41..0439547 100644 --- a/sflphone_gcc5.patch +++ b/sflphone_gcc5.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/src/ip_utils.h sflphone-1.4.1-new/daemon/src/ip_utils.h --- sflphone-1.4.1/daemon/src/ip_utils.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/ip_utils.h 2018-07-21 23:32:25.599184640 +0200 ++++ sflphone-1.4.1-new/daemon/src/ip_utils.h 2019-04-02 18:20:13.765722954 +0200 @@ -33,6 +33,7 @@ #define IP_UTILS_H_ @@ -11,7 +11,7 @@ diff -rupN sflphone-1.4.1/daemon/src/ip_utils.h sflphone-1.4.1-new/daemon/src/ip #include diff -rupN sflphone-1.4.1/daemon/src/sip/sipaccount.cpp sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp --- sflphone-1.4.1/daemon/src/sip/sipaccount.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp 2018-07-21 23:32:25.599184640 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp 2019-04-02 18:20:13.766722953 +0200 @@ -107,7 +107,7 @@ SIPAccount::SIPAccount(const std::string , tlsPassword_() , tlsMethod_("TLSv1") diff --git a/sflphone_gcc6.patch b/sflphone_gcc6.patch index e12c636..b86bcd0 100644 --- a/sflphone_gcc6.patch +++ b/sflphone_gcc6.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/kde/src/lib/contact.cpp sflphone-1.4.1-new/kde/src/lib/contact.cpp --- sflphone-1.4.1/kde/src/lib/contact.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/contact.cpp 2018-07-21 23:32:26.246184503 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/contact.cpp 2019-04-02 18:20:14.366721959 +0200 @@ -453,13 +453,3 @@ bool Contact::operator==(const Contact* { return other && this->d == other->d; @@ -17,7 +17,7 @@ diff -rupN sflphone-1.4.1/kde/src/lib/contact.cpp sflphone-1.4.1-new/kde/src/lib -} diff -rupN sflphone-1.4.1/kde/src/lib/contact.h sflphone-1.4.1-new/kde/src/lib/contact.h --- sflphone-1.4.1/kde/src/lib/contact.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/contact.h 2018-07-21 23:32:26.247184503 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/contact.h 2019-04-02 18:20:14.366721959 +0200 @@ -132,8 +132,6 @@ public: //Operator bool operator==(Contact* other); @@ -29,7 +29,7 @@ diff -rupN sflphone-1.4.1/kde/src/lib/contact.h sflphone-1.4.1-new/kde/src/lib/c void slotPresenceChanged(); diff -rupN sflphone-1.4.1/kde/src/lib/phonenumber.cpp sflphone-1.4.1-new/kde/src/lib/phonenumber.cpp --- sflphone-1.4.1/kde/src/lib/phonenumber.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/phonenumber.cpp 2018-07-21 23:32:26.247184503 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/phonenumber.cpp 2019-04-02 18:20:14.366721959 +0200 @@ -547,16 +547,6 @@ bool PhoneNumber::operator==(const Phone return other && this->d == other->d; } @@ -49,7 +49,7 @@ diff -rupN sflphone-1.4.1/kde/src/lib/phonenumber.cpp sflphone-1.4.1-new/kde/src * Temporary phone number * diff -rupN sflphone-1.4.1/kde/src/lib/phonenumber.h sflphone-1.4.1-new/kde/src/lib/phonenumber.h --- sflphone-1.4.1/kde/src/lib/phonenumber.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/phonenumber.h 2018-07-21 23:32:26.247184503 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/phonenumber.h 2019-04-02 18:20:14.367721958 +0200 @@ -125,8 +125,6 @@ public: //Operator bool operator==(PhoneNumber* other); @@ -61,7 +61,7 @@ diff -rupN sflphone-1.4.1/kde/src/lib/phonenumber.h sflphone-1.4.1-new/kde/src/l //Constructor diff -rupN sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp --- sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp 2018-07-21 23:32:26.247184503 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp 2019-04-02 18:20:14.367721958 +0200 @@ -49,10 +49,7 @@ struct SHMHeader{ /* The header will be aligned on 16-byte boundaries */ char padding[8]; diff --git a/sflphone_gcc7.patch b/sflphone_gcc7.patch index d5629f8..62624b2 100644 --- a/sflphone_gcc7.patch +++ b/sflphone_gcc7.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/kde/src/eventmanager.cpp sflphone-1.4.1-new/kde/src/eventmanager.cpp --- sflphone-1.4.1/kde/src/eventmanager.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/eventmanager.cpp 2018-07-21 23:32:26.421184466 +0200 ++++ sflphone-1.4.1-new/kde/src/eventmanager.cpp 2019-04-02 18:20:14.515721712 +0200 @@ -63,6 +63,7 @@ protected: break; case Qt::WindowActive: @@ -19,7 +19,7 @@ diff -rupN sflphone-1.4.1/kde/src/eventmanager.cpp sflphone-1.4.1-new/kde/src/ev case Call::State::TRANSF_HOLD: diff -rupN sflphone-1.4.1/kde/src/lib/account.cpp sflphone-1.4.1-new/kde/src/lib/account.cpp --- sflphone-1.4.1/kde/src/lib/account.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/account.cpp 2018-07-21 23:32:26.422184466 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/account.cpp 2019-04-02 18:20:14.515721712 +0200 @@ -374,8 +374,10 @@ QString Account::password() const case Account::Protocol::SIP: if (credentialsModel()->rowCount()) @@ -33,7 +33,7 @@ diff -rupN sflphone-1.4.1/kde/src/lib/account.cpp sflphone-1.4.1-new/kde/src/lib } diff -rupN sflphone-1.4.1/kde/src/lib/call.cpp sflphone-1.4.1-new/kde/src/lib/call.cpp --- sflphone-1.4.1/kde/src/lib/call.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/call.cpp 2018-07-21 23:32:26.422184466 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/call.cpp 2019-04-02 18:20:14.516721711 +0200 @@ -191,16 +191,22 @@ QDebug LIB_EXPORT operator<<(QDebug dbg, switch (c) { case Call::Action::ACCEPT: @@ -58,8 +58,8 @@ diff -rupN sflphone-1.4.1/kde/src/lib/call.cpp sflphone-1.4.1-new/kde/src/lib/ca dbg.space(); dbg.nospace() << '(' << static_cast(c) << ')'; diff -rupN sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp ---- sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp 2018-07-21 23:32:26.420184466 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp 2018-07-21 23:32:26.422184466 +0200 +--- sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp 2019-04-02 18:20:14.513721716 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp 2019-04-02 18:20:14.516721711 +0200 @@ -49,7 +49,7 @@ struct SHMHeader{ /* The header will be aligned on 16-byte boundaries */ char padding[8]; diff --git a/sflphone_gcc8.patch b/sflphone_gcc8.patch index e776aa5..5d19fbf 100644 --- a/sflphone_gcc8.patch +++ b/sflphone_gcc8.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/kde/src/lib/call.h sflphone-1.4.1-new/kde/src/lib/call.h --- sflphone-1.4.1/kde/src/lib/call.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/call.h 2018-07-21 23:32:26.913184362 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/call.h 2019-04-02 18:20:14.971720957 +0200 @@ -461,7 +461,7 @@ private: //Automate functions // See actionPerformedFunctionMap and stateChangedFunctionMap diff --git a/sflphone_gcc9.patch b/sflphone_gcc9.patch new file mode 100644 index 0000000..1d8c625 --- /dev/null +++ b/sflphone_gcc9.patch @@ -0,0 +1,47 @@ +diff -rupN sflphone-1.4.1/kde/src/lib/uri.cpp sflphone-1.4.1-new/kde/src/lib/uri.cpp +--- sflphone-1.4.1/kde/src/lib/uri.cpp 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/uri.cpp 2019-04-02 19:10:53.047714894 +0200 +@@ -32,6 +32,17 @@ URI::URI(const URI& o):QString(),m_Parse + (*static_cast(this)) = o.m_Stripped; + } + ++URI& URI::operator=(const URI& o) ++{ ++ m_Parsed = o.m_Parsed; ++ m_Hostname = o.m_Hostname; ++ m_HeaderType = o.m_HeaderType; ++ m_Userinfo = o.m_Userinfo; ++ m_Stripped = o.m_Stripped; ++ (*static_cast(this)) = o.m_Stripped; ++ return *this; ++} ++ + ///Strip out from the URI + QString URI::strip(const QString& uri, SchemeType& sheme) + { +@@ -97,4 +108,4 @@ QString URI::fullUri() const + return QString("<%1%2>") + .arg(schemeNames[static_cast(m_HeaderType == SchemeType::NONE?SchemeType::SIP:m_HeaderType)]) + .arg(*this); +-} +\ No newline at end of file ++} +diff -rupN sflphone-1.4.1/kde/src/lib/uri.h sflphone-1.4.1-new/kde/src/lib/uri.h +--- sflphone-1.4.1/kde/src/lib/uri.h 2014-09-19 18:09:33.000000000 +0200 ++++ sflphone-1.4.1-new/kde/src/lib/uri.h 2019-04-02 18:36:31.108264839 +0200 +@@ -76,6 +76,8 @@ public: + URI(const QString& other); + URI(const URI& other); + ++ URI& operator=(const URI& other); ++ + ///@enum SchemeType The very first part of the URI followed by a ':' + enum class SchemeType { + NONE , //Implicit SIP or IAX, use account type as reference +@@ -128,4 +130,4 @@ private: + }; + // Q_DECLARE_METATYPE(URI*) + +-#endif //URI_H +\ No newline at end of file ++#endif //URI_H diff --git a/sflphone_icondir.patch b/sflphone_icondir.patch index 310dc6d..43c5eb1 100644 --- a/sflphone_icondir.patch +++ b/sflphone_icondir.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/gnome/pixmaps/Makefile.am sflphone-1.4.1-new/gnome/pixmaps/Makefile.am --- sflphone-1.4.1/gnome/pixmaps/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/gnome/pixmaps/Makefile.am 2018-07-21 23:32:24.764184816 +0200 ++++ sflphone-1.4.1-new/gnome/pixmaps/Makefile.am 2019-04-02 18:20:12.989724240 +0200 @@ -1,4 +1,4 @@ -icondir = $(datadir)/pixmaps +icondir = $(datadir)/icons/hicolor/scalable/apps diff --git a/sflphone_memory-corruption.patch b/sflphone_memory-corruption.patch index a62e874..ffa5881 100644 --- a/sflphone_memory-corruption.patch +++ b/sflphone_memory-corruption.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/src/sip/sipaccount.cpp sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp ---- sflphone-1.4.1/daemon/src/sip/sipaccount.cpp 2018-07-21 23:32:25.757184606 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp 2018-07-21 23:32:26.087184537 +0200 +--- sflphone-1.4.1/daemon/src/sip/sipaccount.cpp 2019-04-02 18:20:13.914722708 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp 2019-04-02 18:20:14.216722207 +0200 @@ -1076,10 +1076,20 @@ void SIPAccount::initTlsConfiguration() // TLS listener is unique and should be only modified through IP2IP_PROFILE pjsip_tls_setting_default(&tlsSetting_); @@ -67,7 +67,7 @@ diff -rupN sflphone-1.4.1/daemon/src/sip/sipaccount.cpp sflphone-1.4.1-new/daemo } diff -rupN sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp --- sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp 2018-07-21 23:32:26.087184537 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp 2019-04-02 18:20:14.216722207 +0200 @@ -508,6 +508,11 @@ pjsip_module * SIPVoIPLink::getMod() return &mod_ua_; } @@ -82,7 +82,7 @@ diff -rupN sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp sflphone-1.4.1-new/daem #ifdef SFL_VIDEO diff -rupN sflphone-1.4.1/daemon/src/sip/sipvoiplink.h sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.h --- sflphone-1.4.1/daemon/src/sip/sipvoiplink.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.h 2018-07-21 23:32:26.088184536 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.h 2019-04-02 18:20:14.216722207 +0200 @@ -302,6 +302,8 @@ class SIPVoIPLink : public VoIPLink { int getModId(); pjsip_endpoint * getEndpoint(); diff --git a/sflphone_novideo.patch b/sflphone_novideo.patch index b1b7e36..32a5d79 100644 --- a/sflphone_novideo.patch +++ b/sflphone_novideo.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/kde/src/CMakeLists.txt sflphone-1.4.1-new/kde/src/CMakeLists.txt --- sflphone-1.4.1/kde/src/CMakeLists.txt 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/CMakeLists.txt 2018-07-21 23:32:25.423184677 +0200 ++++ sflphone-1.4.1-new/kde/src/CMakeLists.txt 2019-04-02 18:20:13.616723201 +0200 @@ -7,6 +7,7 @@ if(POLICY CMP0022) endif(POLICY CMP0022) diff --git a/sflphone_sflphoned-dir.patch b/sflphone_sflphoned-dir.patch index 63e7b05..54425b1 100644 --- a/sflphone_sflphoned-dir.patch +++ b/sflphone_sflphoned-dir.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/src/client/dbus/Makefile.am sflphone-1.4.1-new/daemon/src/client/dbus/Makefile.am --- sflphone-1.4.1/daemon/src/client/dbus/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/client/dbus/Makefile.am 2018-07-21 23:32:25.759184606 +0200 ++++ sflphone-1.4.1-new/daemon/src/client/dbus/Makefile.am 2019-04-02 18:20:13.916722704 +0200 @@ -70,7 +70,7 @@ service_DATA = $(service_in_files:.servi # Rule to make the service file with bindir expanded @@ -11,8 +11,8 @@ diff -rupN sflphone-1.4.1/daemon/src/client/dbus/Makefile.am sflphone-1.4.1-new/ EXTRA_DIST = README $(service_in_files) \ callmanager-introspec.xml \ diff -rupN sflphone-1.4.1/daemon/src/Makefile.am sflphone-1.4.1-new/daemon/src/Makefile.am ---- sflphone-1.4.1/daemon/src/Makefile.am 2018-07-21 23:32:25.100184745 +0200 -+++ sflphone-1.4.1-new/daemon/src/Makefile.am 2018-07-21 23:32:25.759184606 +0200 +--- sflphone-1.4.1/daemon/src/Makefile.am 2019-04-02 18:20:13.312723705 +0200 ++++ sflphone-1.4.1-new/daemon/src/Makefile.am 2019-04-02 18:20:13.916722704 +0200 @@ -1,6 +1,5 @@ include ../globals.mak diff --git a/sflphone_tls.patch b/sflphone_tls.patch index 9aad29b..ccfe66f 100644 --- a/sflphone_tls.patch +++ b/sflphone_tls.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/src/sip/siptransport.cpp sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp --- sflphone-1.4.1/daemon/src/sip/siptransport.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp 2018-07-21 23:32:25.926184570 +0200 ++++ sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp 2019-04-02 18:20:14.063722461 +0200 @@ -254,7 +254,7 @@ SipTransport::createTlsListener(SIPAccou listeningAddress.setPort(account.getTlsListenerPort()); diff --git a/sflphone_unbundle.patch b/sflphone_unbundle.patch index 6a7b039..e4d53cb 100644 --- a/sflphone_unbundle.patch +++ b/sflphone_unbundle.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/configure.ac sflphone-1.4.1-new/daemon/configure.ac --- sflphone-1.4.1/daemon/configure.ac 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/configure.ac 2018-07-21 23:32:24.936184780 +0200 ++++ sflphone-1.4.1-new/daemon/configure.ac 2019-04-02 18:20:13.148723977 +0200 @@ -431,8 +431,6 @@ AS_IF([test "x$enable_debug" = "xyes"], dnl What Makefiles to generate @@ -19,7 +19,7 @@ diff -rupN sflphone-1.4.1/daemon/configure.ac sflphone-1.4.1-new/daemon/configur +AC_MSG_NOTICE([[Configuration done! Run `make' to build the software.]]) diff -rupN sflphone-1.4.1/daemon/globals.mak sflphone-1.4.1-new/daemon/globals.mak --- sflphone-1.4.1/daemon/globals.mak 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/globals.mak 2018-07-21 23:32:24.936184780 +0200 ++++ sflphone-1.4.1-new/daemon/globals.mak 2019-04-02 18:20:13.148723977 +0200 @@ -7,18 +7,9 @@ sflplugindir=$(sfllibdir)/plugins ASTYLERC="$(top_srcdir)/../astylerc" @@ -56,7 +56,7 @@ diff -rupN sflphone-1.4.1/daemon/globals.mak sflphone-1.4.1-new/daemon/globals.m -DPROGSHAREDIR=\"${datadir}/sflphone\" \ diff -rupN sflphone-1.4.1/daemon/Makefile.am sflphone-1.4.1-new/daemon/Makefile.am --- sflphone-1.4.1/daemon/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/Makefile.am 2018-07-21 23:32:24.936184780 +0200 ++++ sflphone-1.4.1-new/daemon/Makefile.am 2019-04-02 18:20:13.148723977 +0200 @@ -19,7 +19,7 @@ unittest: endif @@ -68,7 +68,7 @@ diff -rupN sflphone-1.4.1/daemon/Makefile.am sflphone-1.4.1-new/daemon/Makefile. m4/lt~obsolete.m4 \ diff -rupN sflphone-1.4.1/daemon/src/iax/iaxcall.cpp sflphone-1.4.1-new/daemon/src/iax/iaxcall.cpp --- sflphone-1.4.1/daemon/src/iax/iaxcall.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/iax/iaxcall.cpp 2018-07-21 23:32:24.936184780 +0200 ++++ sflphone-1.4.1-new/daemon/src/iax/iaxcall.cpp 2019-04-02 18:20:13.148723977 +0200 @@ -31,8 +31,8 @@ #include @@ -82,7 +82,7 @@ diff -rupN sflphone-1.4.1/daemon/src/iax/iaxcall.cpp sflphone-1.4.1-new/daemon/s #include "logger.h" diff -rupN sflphone-1.4.1/daemon/src/iax/iaxvoiplink.h sflphone-1.4.1-new/daemon/src/iax/iaxvoiplink.h --- sflphone-1.4.1/daemon/src/iax/iaxvoiplink.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/iax/iaxvoiplink.h 2018-07-21 23:32:24.936184780 +0200 ++++ sflphone-1.4.1-new/daemon/src/iax/iaxvoiplink.h 2019-04-02 18:20:13.148723977 +0200 @@ -45,7 +45,7 @@ #include "noncopyable.h" #include "audio/resampler.h" @@ -94,7 +94,7 @@ diff -rupN sflphone-1.4.1/daemon/src/iax/iaxvoiplink.h sflphone-1.4.1-new/daemon diff -rupN sflphone-1.4.1/daemon/src/im/instant_messaging.h sflphone-1.4.1-new/daemon/src/im/instant_messaging.h --- sflphone-1.4.1/daemon/src/im/instant_messaging.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/im/instant_messaging.h 2018-07-21 23:32:24.937184780 +0200 ++++ sflphone-1.4.1-new/daemon/src/im/instant_messaging.h 2019-04-02 18:20:13.149723975 +0200 @@ -48,7 +48,7 @@ #include "config.h" @@ -106,7 +106,7 @@ diff -rupN sflphone-1.4.1/daemon/src/im/instant_messaging.h sflphone-1.4.1-new/d #define EMPTY_MESSAGE pj_str((char*)"") diff -rupN sflphone-1.4.1/daemon/src/Makefile.am sflphone-1.4.1-new/daemon/src/Makefile.am --- sflphone-1.4.1/daemon/src/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/Makefile.am 2018-07-21 23:32:24.937184780 +0200 ++++ sflphone-1.4.1-new/daemon/src/Makefile.am 2019-04-02 18:20:13.149723975 +0200 @@ -18,7 +18,7 @@ endif if USE_IAX IAX_SUBDIR=iax diff --git a/sflphone_zrtp-includes.patch b/sflphone_zrtp-includes.patch index c9df5ea..f7c10e6 100644 --- a/sflphone_zrtp-includes.patch +++ b/sflphone_zrtp-includes.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/src/audio/audiortp/Makefile.am sflphone-1.4.1-new/daemon/src/audio/audiortp/Makefile.am --- sflphone-1.4.1/daemon/src/audio/audiortp/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/audio/audiortp/Makefile.am 2018-07-21 23:32:25.256184712 +0200 ++++ sflphone-1.4.1-new/daemon/src/audio/audiortp/Makefile.am 2019-04-02 18:20:13.466723450 +0200 @@ -6,6 +6,8 @@ if BUILD_ZRTP SFL_ZRTP_SRC=audio_zrtp_session.h audio_zrtp_session.cpp zrtp_session_callback.cpp zrtp_session_callback.h endif @@ -12,7 +12,7 @@ diff -rupN sflphone-1.4.1/daemon/src/audio/audiortp/Makefile.am sflphone-1.4.1-n audio_rtp_session.cpp \ diff -rupN sflphone-1.4.1/daemon/src/client/Makefile.am sflphone-1.4.1-new/daemon/src/client/Makefile.am --- sflphone-1.4.1/daemon/src/client/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/client/Makefile.am 2018-07-21 23:32:25.256184712 +0200 ++++ sflphone-1.4.1-new/daemon/src/client/Makefile.am 2019-04-02 18:20:13.466723450 +0200 @@ -37,5 +37,6 @@ libclient_la_SOURCES = callmanager.cpp $(STUB_SRC) diff --git a/sflphone_zrtp.patch b/sflphone_zrtp.patch index 378a9f4..e8b5c60 100644 --- a/sflphone_zrtp.patch +++ b/sflphone_zrtp.patch @@ -1,6 +1,6 @@ diff -rupN sflphone-1.4.1/daemon/src/audio/audiortp/audio_rtp_factory.cpp sflphone-1.4.1-new/daemon/src/audio/audiortp/audio_rtp_factory.cpp --- sflphone-1.4.1/daemon/src/audio/audiortp/audio_rtp_factory.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/audio/audiortp/audio_rtp_factory.cpp 2018-07-21 23:32:25.102184745 +0200 ++++ sflphone-1.4.1-new/daemon/src/audio/audiortp/audio_rtp_factory.cpp 2019-04-02 18:20:13.314723701 +0200 @@ -109,7 +109,7 @@ void AudioRtpFactory::initSession() // TODO: be careful with that. The hello hash is computed asynchronously. Maybe it's // not even available at that point. From e1d98cbd7fe3ce9c5a04988af8ef6006950be614 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 21 May 2019 13:47:19 +0200 Subject: [PATCH 27/30] Rebuild (evolution-data-server) --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index 53780d2..3cfba4a 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 34%{?dist} +Release: 35%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -276,6 +276,9 @@ zcat sflphone-client-kde.svgz > sflphone-client-kde.svg && rm -f sflphone-client %changelog +* Tue May 21 2019 Milan Crha - 1.4.1-35 +- Rebuild (evolution-data-server) + * Wed Apr 24 2019 Sandro Mani - 1.4.1-34 - Fix build against GCC9 From f8fadcc12b71af431d4c5100970550821a37dab0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 23:08:56 +0000 Subject: [PATCH 28/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index 3cfba4a..7f161d3 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 35%{?dist} +Release: 36%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -276,6 +276,9 @@ zcat sflphone-client-kde.svgz > sflphone-client-kde.svg && rm -f sflphone-client %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1.4.1-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue May 21 2019 Milan Crha - 1.4.1-35 - Rebuild (evolution-data-server) From 1b342b096b152df40910c2008a6b1304bf9b3d7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:18:32 +0000 Subject: [PATCH 29/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sflphone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sflphone.spec b/sflphone.spec index 7f161d3..47a6640 100644 --- a/sflphone.spec +++ b/sflphone.spec @@ -1,6 +1,6 @@ Name: sflphone Version: 1.4.1 -Release: 36%{?dist} +Release: 37%{?dist} Summary: SIP/IAX2 compatible enterprise-class software phone License: GPLv3+ @@ -276,6 +276,9 @@ zcat sflphone-client-kde.svgz > sflphone-client-kde.svg && rm -f sflphone-client %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 1.4.1-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 1.4.1-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 38cc735945a96f9a0bae5e978691f9c17022b27c Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 13 Feb 2020 10:31:16 +0100 Subject: [PATCH 30/30] Dead upstream and FTBFS due to pjproject API changes --- .gitignore | 1 - dead.package | 1 + sflphone-pjspi-api-change.patch | 153 ------------ sflphone.spec | 398 ------------------------------- sflphone_dbus.patch | 28 --- sflphone_gcc5.patch | 23 -- sflphone_gcc6.patch | 75 ------ sflphone_gcc7.patch | 71 ------ sflphone_gcc8.patch | 12 - sflphone_gcc9.patch | 47 ---- sflphone_icondir.patch | 9 - sflphone_memory-corruption.patch | 94 -------- sflphone_novideo.patch | 11 - sflphone_sflphoned-dir.patch | 22 -- sflphone_tls.patch | 12 - sflphone_unbundle.patch | 118 --------- sflphone_zrtp-includes.patch | 22 -- sflphone_zrtp.patch | 12 - sources | 1 - 19 files changed, 1 insertion(+), 1109 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sflphone-pjspi-api-change.patch delete mode 100644 sflphone.spec delete mode 100644 sflphone_dbus.patch delete mode 100644 sflphone_gcc5.patch delete mode 100644 sflphone_gcc6.patch delete mode 100644 sflphone_gcc7.patch delete mode 100644 sflphone_gcc8.patch delete mode 100644 sflphone_gcc9.patch delete mode 100644 sflphone_icondir.patch delete mode 100644 sflphone_memory-corruption.patch delete mode 100644 sflphone_novideo.patch delete mode 100644 sflphone_sflphoned-dir.patch delete mode 100644 sflphone_tls.patch delete mode 100644 sflphone_unbundle.patch delete mode 100644 sflphone_zrtp-includes.patch delete mode 100644 sflphone_zrtp.patch delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a407d1c..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/sflphone-1.4.1.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..8498874 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Dead upstream and FTBFS due to pjproject API changes diff --git a/sflphone-pjspi-api-change.patch b/sflphone-pjspi-api-change.patch deleted file mode 100644 index 106a7df..0000000 --- a/sflphone-pjspi-api-change.patch +++ /dev/null @@ -1,153 +0,0 @@ -diff -rupN sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp sflphone-1.4.1-new/daemon/src/sip/pres_sub_server.cpp ---- sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/pres_sub_server.cpp 2019-04-02 18:20:14.819721209 +0200 -@@ -122,12 +122,13 @@ PresSubServer::pres_on_rx_subscribe_requ - - /* Create UAS dialog: */ - const pj_str_t contact(acc->getContactHeader()); -- status = pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, &contact, &dlg); -+ status = pjsip_dlg_create_uas_and_inc_lock(pjsip_ua_instance(), rdata, &contact, &dlg); - - if (status != PJ_SUCCESS) { - char errmsg[PJ_ERR_MSG_SIZE]; - pj_strerror(status, errmsg, sizeof(errmsg)); - WARN("Unable to create UAS dialog for subscription: %s [status=%d]", errmsg, status); -+ pjsip_dlg_dec_lock(dlg); - pres->unlock(); - pjsip_endpt_respond_stateless(endpt, rdata, 400, NULL, NULL, NULL); - return PJ_TRUE; -@@ -156,6 +157,7 @@ PresSubServer::pres_on_rx_subscribe_requ - pjsip_dlg_send_response(dlg, pjsip_rdata_get_tsx(rdata), tdata); - } - -+ pjsip_dlg_dec_lock(dlg); - pres->unlock(); - return PJ_FALSE; - } -@@ -200,6 +202,7 @@ PresSubServer::pres_on_rx_subscribe_requ - if (status != PJ_SUCCESS) { - WARN("Unable to accept presence subscription %d", status); - pjsip_pres_terminate(sub, PJ_FALSE); -+ pjsip_dlg_dec_lock(dlg); - pres->unlock(); - return PJ_FALSE; - } -@@ -209,6 +212,7 @@ PresSubServer::pres_on_rx_subscribe_requ - - if (presSubServer->getExpires() == 0) { - // PJSIP_EVSUB_STATE_TERMINATED -+ pjsip_dlg_dec_lock(dlg); - pres->unlock(); - return PJ_TRUE; - } -@@ -245,10 +249,12 @@ PresSubServer::pres_on_rx_subscribe_requ - if (status != PJ_SUCCESS) { - WARN("Unable to create/send NOTIFY %d", status); - pjsip_pres_terminate(sub, PJ_FALSE); -+ pjsip_dlg_dec_lock(dlg); - pres->unlock(); - return status; - } - -+ pjsip_dlg_dec_lock(dlg); - pres->unlock(); - return PJ_TRUE; - } -diff -rupN sflphone-1.4.1/daemon/src/sip/siptransport.cpp sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp ---- sflphone-1.4.1/daemon/src/sip/siptransport.cpp 2019-04-02 18:20:14.214722211 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp 2019-04-02 18:20:14.819721209 +0200 -@@ -447,7 +447,7 @@ SipTransport::findLocalAddressFromSTUN(p - - IpAddr mapped_addr; - pj_sock_t sipSocket = pjsip_udp_transport_get_socket(transport); -- const pjstun_setting stunOpt = {PJ_TRUE, *stunServerName, stunPort, *stunServerName, stunPort}; -+ const pjstun_setting stunOpt = {PJ_TRUE, AF_INET, *stunServerName, stunPort, *stunServerName, stunPort}; - const pj_status_t stunStatus = pjstun_get_mapped_addr2(&cp_.factory, &stunOpt, 1, &sipSocket, &static_cast(mapped_addr)); - - switch (stunStatus) { -diff -rupN sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp ---- sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp 2019-04-02 18:20:14.364721962 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp 2019-04-02 18:20:14.819721209 +0200 -@@ -405,9 +405,10 @@ transaction_request_cb(pjsip_rx_data *rd - - pjsip_dialog *dialog = 0; - -- if (pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, nullptr, &dialog) != PJ_SUCCESS) { -+ if (pjsip_dlg_create_uas_and_inc_lock(pjsip_ua_instance(), rdata, nullptr, &dialog) != PJ_SUCCESS) { - call.reset(); - try_respond_stateless(endpt_, rdata, PJSIP_SC_INTERNAL_SERVER_ERROR, nullptr, nullptr, nullptr); -+ pjsip_dlg_dec_lock(dialog); - return PJ_FALSE; - } - -@@ -415,11 +416,13 @@ transaction_request_cb(pjsip_rx_data *rd - - if (!dialog or pjsip_dlg_set_transport(dialog, &tp_sel) != PJ_SUCCESS) { - ERROR("Could not set transport for dialog"); -+ pjsip_dlg_dec_lock(dialog); - return PJ_FALSE; - } - - if (!call->inv) { - ERROR("Call invite is not initialized"); -+ pjsip_dlg_dec_lock(dialog); - return PJ_FALSE; - } - -@@ -443,6 +446,7 @@ transaction_request_cb(pjsip_rx_data *rd - try_respond_stateless(endpt_, rdata, PJSIP_SC_INTERNAL_SERVER_ERROR, NULL, NULL, NULL); - } - -+ pjsip_dlg_dec_lock(dialog); - return PJ_FALSE; - } - -@@ -464,11 +468,13 @@ transaction_request_cb(pjsip_rx_data *rd - } else { // Proceed with normal call flow - if (pjsip_inv_initial_answer(call->inv, rdata, PJSIP_SC_TRYING, NULL, NULL, &tdata) != PJ_SUCCESS) { - ERROR("Could not answer invite"); -+ pjsip_dlg_dec_lock(dialog); - return PJ_FALSE; - } - - if (pjsip_inv_send_msg(call->inv, tdata) != PJ_SUCCESS) { - ERROR("Could not send msg for invite"); -+ pjsip_dlg_dec_lock(dialog); - return PJ_FALSE; - } - -@@ -476,6 +482,7 @@ transaction_request_cb(pjsip_rx_data *rd - - if (pjsip_inv_answer(call->inv, PJSIP_SC_RINGING, NULL, NULL, &tdata) != PJ_SUCCESS) { - ERROR("Could not answer invite"); -+ pjsip_dlg_dec_lock(dialog); - return PJ_FALSE; - } - -@@ -485,6 +492,7 @@ transaction_request_cb(pjsip_rx_data *rd - - if (pjsip_inv_send_msg(call->inv, tdata) != PJ_SUCCESS) { - ERROR("Could not send msg for invite"); -+ pjsip_dlg_dec_lock(dialog); - return PJ_FALSE; - } - -@@ -494,6 +502,8 @@ transaction_request_cb(pjsip_rx_data *rd - Manager::instance().incomingCall(*call, account_id); - } - -+ pjsip_dlg_dec_lock(dialog); -+ - return PJ_FALSE; - } - -@@ -575,6 +585,9 @@ SIPVoIPLink::SIPVoIPLink() : sipTranspor - outgoing_request_forked_cb, - transaction_state_changed_cb, - sdp_request_offer_cb, -+#if PJ_VERSION_NUM > (2 << 24 | 7 << 16) -+ nullptr /* on_rx_offer2 */, -+#endif - #if PJ_VERSION_NUM > (2 << 24 | 1 << 16) - nullptr /* on_rx_reinvite */, - #endif diff --git a/sflphone.spec b/sflphone.spec deleted file mode 100644 index 47a6640..0000000 --- a/sflphone.spec +++ /dev/null @@ -1,398 +0,0 @@ -Name: sflphone -Version: 1.4.1 -Release: 37%{?dist} -Summary: SIP/IAX2 compatible enterprise-class software phone - -License: GPLv3+ -URL: https://gitlab.savoirfairelinux.com/sfl-ports/sflphone -# Note: the number in the URL is different for every release -Source0: https://projects.savoirfairelinux.com/attachments/download/14805/%{name}-%{version}.tar.gz -# Install icon to hicolor/scalable/apps -Patch0: sflphone_icondir.patch -# Unbundle pjproject -Patch1: sflphone_unbundle.patch -# ZRTP API changes -Patch2: sflphone_zrtp.patch -# Workaround for bad #includes in zrtp headers, see https://github.com/wernerd/ZRTPCPP/pull/19 -Patch3: sflphone_zrtp-includes.patch -# Disable video support in kde interface (video is not available without ffmpeg) -Patch4: sflphone_novideo.patch -# Fix gcc5 FTBFS issues -Patch5: sflphone_gcc5.patch -# Install sflphoned in libexecdir -Patch6: sflphone_sflphoned-dir.patch -# Fix incorrect conditional in SipTransport::createTlsListener -Patch7: sflphone_tls.patch -# Fix memory corruption due to keeping pointer to local variable after scope ended -Patch8: sflphone_memory-corruption.patch -# Fix GCC6 FTBFS due to "error: the compiler can assume that the address of 'other' will always evaluate to 'true'" -Patch9: sflphone_gcc6.patch -# Fix GCC7 FTBFS due to -# - ISO C++ forbids flexible array member 'm_Data' [-Werror=pedantic] -# - error: this statement may fall through [-Werror=implicit-fallthrough=] -Patch10: sflphone_gcc7.patch -# Fix FTBFS due to ERROR: The token "BOOL" is deprecated; use "BOOLEAN" instead -Patch11: sflphone_dbus.patch -# Adapt to pjsip API change -Patch12: sflphone-pjspi-api-change.patch -# Fix GCC8 FTBFS -Patch13: sflphone_gcc8.patch -# Fix GCC9 FTBFS -Patch14: sflphone_gcc9.patch - -BuildRequires: alsa-lib-devel -BuildRequires: ccrtp-devel -BuildRequires: check-devel -BuildRequires: clutter-gtk-devel -BuildRequires: cmake -BuildRequires: dbus-glib-devel -BuildRequires: dbus-c++-devel -BuildRequires: desktop-file-utils -BuildRequires: expat-devel -BuildRequires: evolution-data-server-devel -BuildRequires: gcc-c++ -BuildRequires: gettext -BuildRequires: gnome-common -BuildRequires: gnome-doc-utils -BuildRequires: gnutls-devel -BuildRequires: gsm-devel -BuildRequires: iaxclient-libiax-devel -BuildRequires: ilbc-devel -BuildRequires: intltool -BuildRequires: kdepimlibs-devel -BuildRequires: libnotify-devel -BuildRequires: libsamplerate-devel -BuildRequires: libsexy-devel -BuildRequires: libsndfile-devel -BuildRequires: libtool -BuildRequires: libyaml-devel -BuildRequires: libzrtpcpp-devel -BuildRequires: make -BuildRequires: openssl-devel -BuildRequires: pcre-devel -BuildRequires: perl-podlators -BuildRequires: pjproject-devel -BuildRequires: pulseaudio-libs-devel -BuildRequires: rarian-compat -BuildRequires: speex-devel -BuildRequires: speexdsp-devel -BuildRequires: systemd-devel -BuildRequires: yelp-tools - - -%description -SFLphone is a robust standards-compliant enterprise software phone, -for desktop and embedded systems. It is designed to handle -several hundreds of calls a day. It supports both SIP and IAX2 -protocols. - - -%package common -Summary: Common files for SFLPhone -Requires: %{name}-daemon = %{version}-%{release} -BuildArch: noarch - -%description common -SFLphone is a robust standards-compliant enterprise software phone, -for desktop and embedded systems. It is designed to handle -several hundreds of calls a day. It supports both SIP and IAX2 -protocols. - -This package includes common files for SFLPhone. - - -%package daemon -Summary: SFLPhone daemon -Requires: %{name}-common = %{version}-%{release} -Requires: dbus%{?_isa} -Obsoletes: %{name}-libs < 1.4.1-9 - -%description daemon -SFLphone is a robust standards-compliant enterprise software phone, -for desktop and embedded systems. It is designed to handle -several hundreds of calls a day. It supports both SIP and IAX2 -protocols. - -This package includes the SFLPhone daemon. - - -%package gnome -Summary: SIP/IAX2 compatible enterprise-class software phone -Requires: %{name}-daemon%{?_isa} = %{version}-%{release} -Requires: hicolor-icon-theme - -%description gnome -SFLphone is a robust standards-compliant enterprise software phone, -for desktop and embedded systems. It is designed to handle -several hundreds of calls a day. It supports both SIP and IAX2 -protocols. - -This package includes the Gnome client. - - -%package gnome-plugins -Summary: Plugins (address book) for SFLphone -Requires: %{name}-gnome%{?_isa} = %{version}-%{release} - -%description gnome-plugins -SFLphone is a robust standards-compliant enterprise software phone, -for desktop and embedded systems. It is designed to handle -several hundreds of calls a day. It supports both SIP and IAX2 -protocols. - -This package includes the address book plugin. - - -%package kde -Summary: KDE interface for SFLphone -Requires: %{name}-daemon%{?_isa} = %{version}-%{release} -Requires: hicolor-icon-theme -Requires: kde-filesystem - -%description kde -SFLphone is a robust standards-compliant enterprise software phone, -for desktop and embedded systems. It is designed to handle -several hundreds of calls a day. It supports both SIP and IAX2 -protocols. - -This package includes the KDE client. - - -%package kde-devel -Summary: Development files for the KDE interface for SFLphone -Requires: %{name}-kde%{?_isa} = %{version}-%{release} - -%description kde-devel -SFLphone is a robust standards-compliant enterprise software phone, -for desktop and embedded systems. It is designed to handle -several hundreds of calls a day. It supports both SIP and IAX2 -protocols. - -This package includes the development files for the KDE client. - - -%prep -%autosetup -p1 -n %{name}-%{version} - -# Unbundle bundled libraries -rm -rf daemon/libs - -# Fix FSF addresses -find . -type f -print0 | xargs -0 sed -i 's|675 Mass Ave, Cambridge, MA 02139|51 Franklin Street, Fifth Floor, Boston, MA 02110-1301|' - - -%build -### Compile the daemon ### -pushd daemon -./autogen.sh -LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %configure --disable-video -%make_build V=1 -make doc -popd - -### Compile gnome client ### -pushd gnome -./autogen.sh -LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %configure --disable-video -%make_build V=1 -popd - -### Compile plugins ### -pushd plugins -./autogen.sh -LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %configure -%make_build V=1 -popd - -### Compile kde client ### -mkdir kde/build -pushd kde/build -LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %cmake .. -%make_build VERBOSE=1 -popd - - -%install -%make_install -C daemon -%make_install -C gnome -%make_install -C plugins -%make_install -C kde/build - -%find_lang sflphone --with-gnome -%find_lang sflphone-client-kde --with-kde -f sflphone-client-kde -%find_lang sflphone-kde --with-kde -f sflphone-kde - -# Fix error: file contains group "Protocol", but groups extending the format should start with "X-" -sed -i 's|\[Protocol\]|\[X-Protocol\]|' %{buildroot}%{_datadir}/applications/kde4/sflphone-client-kde.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop - -# Fix gzipped-svg-icon -( -cd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ -zcat sflphone-client-kde.svgz > sflphone-client-kde.svg && rm -f sflphone-client-kde.svgz -) - -%ldconfig_scriptlets kde - -%files common -%license COPYING -%doc daemon/AUTHORS NEWS README -%{_datadir}/%{name}/ - -%files daemon -%{_libdir}/%{name}/ -%{_datadir}/dbus-1/services/org.%{name}.SFLphone.service -%exclude %{_libdir}/%{name}/plugins/ -%{_mandir}/man1/sflphoned.1.gz* -%{_libexecdir}/sflphoned - -%files gnome -f sflphone.lang -%{_bindir}/sflphone -%{_bindir}/sflphone-client-gnome -%{_datadir}/applications/%{name}.desktop -%{_datadir}/glib-2.0/schemas/org.sflphone.SFLphone.gschema.xml -%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg -%{_mandir}/man1/sflphone.1.gz -%{_mandir}/man1/sflphone-client-gnome.1.gz - -%files gnome-plugins -%{_libdir}/%{name}/plugins/ - -%files kde -f sflphone-client-kde -f sflphone-kde -%{_bindir}/sflphone-client-kde -%{_datadir}/applications/kde4/sflphone-client-kde.desktop -%{_datadir}/config.kcfg/sflphone-client-kde.kcfg -%{_datadir}/icons/hicolor/*/apps/sflphone-client-kde* -%{_datadir}/kde4/apps/sflphone-client-kde -%{_libdir}/libksflphone.so.* -%{_libdir}/libqtsflphone.so.* -%{_mandir}/man1/*kde* - -%files kde-devel -%{_includedir}/ksflphone/ -%{_includedir}/qtsflphone/ -%{_libdir}/libksflphone.so -%{_libdir}/libqtsflphone.so - - -%changelog -* Thu Jan 30 2020 Fedora Release Engineering - 1.4.1-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 1.4.1-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue May 21 2019 Milan Crha - 1.4.1-35 -- Rebuild (evolution-data-server) - -* Wed Apr 24 2019 Sandro Mani - 1.4.1-34 -- Fix build against GCC9 - -* Sat Feb 02 2019 Fedora Release Engineering - 1.4.1-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.4.1-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Feb 19 2018 Sandro Mani - 1.4.1-31 -- Add missing BR: gcc-c++, make - -* Fri Feb 09 2018 Fedora Release Engineering - 1.4.1-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Jan 26 2018 Igor Gnatenko - 1.4.1-29 -- Fix ldconfig dependency - -* Thu Jan 18 2018 Igor Gnatenko - 1.4.1-28 -- Remove obsolete scriptlets - -* Wed Sep 06 2017 Sandro Mani - 1.4.1-27 -- Add patch to fix deprecated dbus marshalling types - -* Wed Sep 06 2017 Milan Crha - 1.4.1-26 -- Add patch to adapt to pjspi API change - -* Mon Aug 28 2017 Milan Crha - 1.4.1-25 -- Add patch to not use --g-fatal-warnings for glib-genmarshal - -* Thu Aug 03 2017 Fedora Release Engineering - 1.4.1-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.4.1-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Feb 16 2017 Sandro Mani - 1.4.1-22 -- Drop F22 conditionals -- Add patch to fix GCC7 FTBFS - -* Sat Feb 11 2017 Fedora Release Engineering - 1.4.1-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Oct 31 2016 Sandro Mani - 1.4.1-20 -- Rebuild (evolution-data-server) -- BR: dbus-glib-devel - -* Sat Jul 23 2016 Sandro Mani - 1.4.1-19 -- Rebuild (evolution-data-server) - -* Fri Feb 05 2016 Sandro Mani - 1.4.1-18 -- Add patch to fix FTBFS - -* Thu Feb 04 2016 Fedora Release Engineering - 1.4.1-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Dec 26 2015 Sandro Mani - 1.4.1-16 -- Rebuild (ucommon) - -* Thu Aug 06 2015 Sandro Mani - 1.4.1-15 -- Rebuild (ucommon) - -* Wed Jul 22 2015 Milan Crha - 1.4.1-14 -- Rebuild for newer evolution-data-server - -* Thu Jun 25 2015 Sandro Mani - 1.4.1-13 -- Add patch to fix memory corruption issues (#1222301) - -* Fri Jun 19 2015 Fedora Release Engineering - 1.4.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri May 15 2015 Sandro Mani - 1.4.1-10 -- Add patch to fix incorrect conditional in SipTransport::createTlsListener - -* Wed May 06 2015 Sandro Mani - 1.4.1-9 -- Install sflphoned in /usr/libexec -- Rename sflphone-libs -> sflphone-daemon - -* Tue Apr 28 2015 Milan Crha - 1.4.1-8 -- Rebuild for newer evolution-data-server - -* Sat Apr 18 2015 Sandro Mani - 1.4.1-7 -- Pass --disable-video to Gnome client configure - -* Tue Feb 17 2015 Sandro Mani - 1.4.1-6 -- Rebuild (evolution-data-server) - -* Tue Jan 27 2015 Sandro Mani - 1.4.1-5 -- Put org.sflphone.SFLphone.service in -libs package (it contains an arch specific path) - -* Tue Jan 27 2015 Sandro Mani - 1.4.1-4 -- Remove -Wl,--as-needed, makes the application crash with -Wl,-z,relro - -* Mon Jan 26 2015 Sandro Mani - 1.4.1-3 -- Set %%{__global_ldflags} in LDFLAGS override - -* Thu Jan 22 2015 Sandro Mani - 1.4.1-2 -- Use %%license -- Add Requires: dbus to sflphone-common -- Fixed ownership of %%{_datadir}/icons/hicolor, added Requires: hicolor-icon-theme -- Fixed ownership of %%{_datadir}/applications/kde4/ -- Require sflphone-libs in sflphone-kde, sflphone-gnome, not sflphone-common -- Fix desktop file -- Add LDFLAGS="-Wl,--as-needed" -- Fix FSF addresses - -* Sun Dec 14 2014 Sandro Mani - 1.4.1-1 -- 1.4.1 - -* Sun Aug 10 2014 Sandro Mani - 1.4.0-1 -- Initial package diff --git a/sflphone_dbus.patch b/sflphone_dbus.patch deleted file mode 100644 index 0728524..0000000 --- a/sflphone_dbus.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -rupN sflphone-1.4.1/gnome/src/dbus/dbus.c sflphone-1.4.1-new/gnome/src/dbus/dbus.c ---- sflphone-1.4.1/gnome/src/dbus/dbus.c 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/gnome/src/dbus/dbus.c 2019-04-02 18:20:14.670721456 +0200 -@@ -829,7 +829,7 @@ gboolean dbus_connect(GError **error, SF - - /* Register STRING STRING BOOL Marshaller */ - dbus_g_object_register_marshaller( -- g_cclosure_user_marshal_VOID__STRING_STRING_BOOL, G_TYPE_NONE, -+ g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN, G_TYPE_NONE, - G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID); - - /* Register STRING STRING INT Marshaller */ -diff -rupN sflphone-1.4.1/gnome/src/dbus/marshaller.list sflphone-1.4.1-new/gnome/src/dbus/marshaller.list ---- sflphone-1.4.1/gnome/src/dbus/marshaller.list 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/gnome/src/dbus/marshaller.list 2019-04-02 18:20:14.670721456 +0200 -@@ -5,9 +5,9 @@ VOID:STRING,INT - VOID:STRING,DOUBLE - VOID:STRING,STRING - VOID:STRING,INT,INT --VOID:STRING,STRING,BOOL -+VOID:STRING,STRING,BOOLEAN - VOID:STRING,STRING,INT - VOID:STRING,STRING,STRING --VOID:STRING,STRING,INT,INT,BOOL --VOID:STRING,STRING,BOOL,STRING -+VOID:STRING,STRING,INT,INT,BOOLEAN -+VOID:STRING,STRING,BOOLEAN,STRING - VOID:STRING,BOXED diff --git a/sflphone_gcc5.patch b/sflphone_gcc5.patch deleted file mode 100644 index 0439547..0000000 --- a/sflphone_gcc5.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -rupN sflphone-1.4.1/daemon/src/ip_utils.h sflphone-1.4.1-new/daemon/src/ip_utils.h ---- sflphone-1.4.1/daemon/src/ip_utils.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/ip_utils.h 2019-04-02 18:20:13.765722954 +0200 -@@ -33,6 +33,7 @@ - #define IP_UTILS_H_ - - #include -+#undef isblank // macro collides with symbol... - #include // For ost::IPV*Address - - #include -diff -rupN sflphone-1.4.1/daemon/src/sip/sipaccount.cpp sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp ---- sflphone-1.4.1/daemon/src/sip/sipaccount.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp 2019-04-02 18:20:13.766722953 +0200 -@@ -107,7 +107,7 @@ SIPAccount::SIPAccount(const std::string - , tlsPassword_() - , tlsMethod_("TLSv1") - , tlsCiphers_() -- , tlsServerName_(0, 0) -+ , tlsServerName_() - , tlsVerifyServer_(false) - , tlsVerifyClient_(true) - , tlsRequireClientCertificate_(true) diff --git a/sflphone_gcc6.patch b/sflphone_gcc6.patch deleted file mode 100644 index b86bcd0..0000000 --- a/sflphone_gcc6.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -rupN sflphone-1.4.1/kde/src/lib/contact.cpp sflphone-1.4.1-new/kde/src/lib/contact.cpp ---- sflphone-1.4.1/kde/src/lib/contact.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/contact.cpp 2019-04-02 18:20:14.366721959 +0200 -@@ -453,13 +453,3 @@ bool Contact::operator==(const Contact* - { - return other && this->d == other->d; - } -- --bool Contact::operator==(Contact& other) --{ -- return &other && this->d == other.d; --} -- --bool Contact::operator==(const Contact& other) const --{ -- return &other && this->d == other.d; --} -diff -rupN sflphone-1.4.1/kde/src/lib/contact.h sflphone-1.4.1-new/kde/src/lib/contact.h ---- sflphone-1.4.1/kde/src/lib/contact.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/contact.h 2019-04-02 18:20:14.366721959 +0200 -@@ -132,8 +132,6 @@ public: - //Operator - bool operator==(Contact* other); - bool operator==(const Contact* other) const; -- bool operator==(Contact& other); -- bool operator==(const Contact& other) const; - - private Q_SLOTS: - void slotPresenceChanged(); -diff -rupN sflphone-1.4.1/kde/src/lib/phonenumber.cpp sflphone-1.4.1-new/kde/src/lib/phonenumber.cpp ---- sflphone-1.4.1/kde/src/lib/phonenumber.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/phonenumber.cpp 2019-04-02 18:20:14.366721959 +0200 -@@ -547,16 +547,6 @@ bool PhoneNumber::operator==(const Phone - return other && this->d == other->d; - } - --bool PhoneNumber::operator==(PhoneNumber& other) --{ -- return &other && this->d == other.d; --} -- --bool PhoneNumber::operator==(const PhoneNumber& other) const --{ -- return &other && this->d == other.d; --} -- - /************************************************************************************ - * * - * Temporary phone number * -diff -rupN sflphone-1.4.1/kde/src/lib/phonenumber.h sflphone-1.4.1-new/kde/src/lib/phonenumber.h ---- sflphone-1.4.1/kde/src/lib/phonenumber.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/phonenumber.h 2019-04-02 18:20:14.367721958 +0200 -@@ -125,8 +125,6 @@ public: - //Operator - bool operator==(PhoneNumber* other); - bool operator==(const PhoneNumber* other) const; -- bool operator==(PhoneNumber& other); -- bool operator==(const PhoneNumber& other) const; - - protected: - //Constructor -diff -rupN sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp ---- sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp 2019-04-02 18:20:14.367721958 +0200 -@@ -49,10 +49,7 @@ struct SHMHeader{ - /* The header will be aligned on 16-byte boundaries */ - char padding[8]; - --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-pedantic" - char m_Data[]; --#pragma GCC diagnostic pop - }; - - ///Constructor diff --git a/sflphone_gcc7.patch b/sflphone_gcc7.patch deleted file mode 100644 index 62624b2..0000000 --- a/sflphone_gcc7.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -rupN sflphone-1.4.1/kde/src/eventmanager.cpp sflphone-1.4.1-new/kde/src/eventmanager.cpp ---- sflphone-1.4.1/kde/src/eventmanager.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/eventmanager.cpp 2019-04-02 18:20:14.515721712 +0200 -@@ -63,6 +63,7 @@ protected: - break; - case Qt::WindowActive: - qDebug() << "The window is now active"; -+ break; - case Qt::WindowNoState: - default: - if (e->oldState() == Qt::WindowMinimized) -@@ -464,6 +465,7 @@ void EventManager::enter() - case Call::State::DIALING: - //Change account if it changed - call->setAccount(AccountListModel::instance()->currentAccount()); -+ break; - case Call::State::INCOMING: - case Call::State::TRANSFERRED: - case Call::State::TRANSF_HOLD: -diff -rupN sflphone-1.4.1/kde/src/lib/account.cpp sflphone-1.4.1-new/kde/src/lib/account.cpp ---- sflphone-1.4.1/kde/src/lib/account.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/account.cpp 2019-04-02 18:20:14.515721712 +0200 -@@ -374,8 +374,10 @@ QString Account::password() const - case Account::Protocol::SIP: - if (credentialsModel()->rowCount()) - return credentialsModel()->data(credentialsModel()->index(0,0),CredentialModel::Role::PASSWORD).toString(); -+ break; - case Account::Protocol::IAX: - return accountDetail(Account::MapField::PASSWORD); -+ break; - }; - return ""; - } -diff -rupN sflphone-1.4.1/kde/src/lib/call.cpp sflphone-1.4.1-new/kde/src/lib/call.cpp ---- sflphone-1.4.1/kde/src/lib/call.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/call.cpp 2019-04-02 18:20:14.516721711 +0200 -@@ -191,16 +191,22 @@ QDebug LIB_EXPORT operator<<(QDebug dbg, - switch (c) { - case Call::Action::ACCEPT: - dbg.nospace() << "ACCEPT"; -+ /* FALLTHRU */ - case Call::Action::REFUSE: - dbg.nospace() << "REFUSE"; -+ /* FALLTHRU */ - case Call::Action::TRANSFER: - dbg.nospace() << "TRANSFER"; -+ /* FALLTHRU */ - case Call::Action::HOLD: - dbg.nospace() << "HOLD"; -+ /* FALLTHRU */ - case Call::Action::RECORD: - dbg.nospace() << "RECORD"; -+ /* FALLTHRU */ - case Call::Action::__COUNT: - dbg.nospace() << "COUNT"; -+ /* FALLTHRU */ - }; - dbg.space(); - dbg.nospace() << '(' << static_cast(c) << ')'; -diff -rupN sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp ---- sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp 2019-04-02 18:20:14.513721716 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp 2019-04-02 18:20:14.516721711 +0200 -@@ -49,7 +49,7 @@ struct SHMHeader{ - /* The header will be aligned on 16-byte boundaries */ - char padding[8]; - -- char m_Data[]; -+ char* m_Data; - }; - - ///Constructor diff --git a/sflphone_gcc8.patch b/sflphone_gcc8.patch deleted file mode 100644 index 5d19fbf..0000000 --- a/sflphone_gcc8.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN sflphone-1.4.1/kde/src/lib/call.h sflphone-1.4.1-new/kde/src/lib/call.h ---- sflphone-1.4.1/kde/src/lib/call.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/call.h 2019-04-02 18:20:14.971720957 +0200 -@@ -461,7 +461,7 @@ private: - //Automate functions - // See actionPerformedFunctionMap and stateChangedFunctionMap - // to know when it is called. -- void nothing () __attribute__ ((const)); -+ void nothing (); - void error () __attribute__ ((noreturn)); - void failure (); - void accept (); diff --git a/sflphone_gcc9.patch b/sflphone_gcc9.patch deleted file mode 100644 index 1d8c625..0000000 --- a/sflphone_gcc9.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -rupN sflphone-1.4.1/kde/src/lib/uri.cpp sflphone-1.4.1-new/kde/src/lib/uri.cpp ---- sflphone-1.4.1/kde/src/lib/uri.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/uri.cpp 2019-04-02 19:10:53.047714894 +0200 -@@ -32,6 +32,17 @@ URI::URI(const URI& o):QString(),m_Parse - (*static_cast(this)) = o.m_Stripped; - } - -+URI& URI::operator=(const URI& o) -+{ -+ m_Parsed = o.m_Parsed; -+ m_Hostname = o.m_Hostname; -+ m_HeaderType = o.m_HeaderType; -+ m_Userinfo = o.m_Userinfo; -+ m_Stripped = o.m_Stripped; -+ (*static_cast(this)) = o.m_Stripped; -+ return *this; -+} -+ - ///Strip out from the URI - QString URI::strip(const QString& uri, SchemeType& sheme) - { -@@ -97,4 +108,4 @@ QString URI::fullUri() const - return QString("<%1%2>") - .arg(schemeNames[static_cast(m_HeaderType == SchemeType::NONE?SchemeType::SIP:m_HeaderType)]) - .arg(*this); --} -\ No newline at end of file -+} -diff -rupN sflphone-1.4.1/kde/src/lib/uri.h sflphone-1.4.1-new/kde/src/lib/uri.h ---- sflphone-1.4.1/kde/src/lib/uri.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/lib/uri.h 2019-04-02 18:36:31.108264839 +0200 -@@ -76,6 +76,8 @@ public: - URI(const QString& other); - URI(const URI& other); - -+ URI& operator=(const URI& other); -+ - ///@enum SchemeType The very first part of the URI followed by a ':' - enum class SchemeType { - NONE , //Implicit SIP or IAX, use account type as reference -@@ -128,4 +130,4 @@ private: - }; - // Q_DECLARE_METATYPE(URI*) - --#endif //URI_H -\ No newline at end of file -+#endif //URI_H diff --git a/sflphone_icondir.patch b/sflphone_icondir.patch deleted file mode 100644 index 43c5eb1..0000000 --- a/sflphone_icondir.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -rupN sflphone-1.4.1/gnome/pixmaps/Makefile.am sflphone-1.4.1-new/gnome/pixmaps/Makefile.am ---- sflphone-1.4.1/gnome/pixmaps/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/gnome/pixmaps/Makefile.am 2019-04-02 18:20:12.989724240 +0200 -@@ -1,4 +1,4 @@ --icondir = $(datadir)/pixmaps -+icondir = $(datadir)/icons/hicolor/scalable/apps - - icon_DATA = sflphone.svg - diff --git a/sflphone_memory-corruption.patch b/sflphone_memory-corruption.patch deleted file mode 100644 index ffa5881..0000000 --- a/sflphone_memory-corruption.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -rupN sflphone-1.4.1/daemon/src/sip/sipaccount.cpp sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp ---- sflphone-1.4.1/daemon/src/sip/sipaccount.cpp 2019-04-02 18:20:13.914722708 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp 2019-04-02 18:20:14.216722207 +0200 -@@ -1076,10 +1076,20 @@ void SIPAccount::initTlsConfiguration() - // TLS listener is unique and should be only modified through IP2IP_PROFILE - pjsip_tls_setting_default(&tlsSetting_); - -- pj_cstr(&tlsSetting_.ca_list_file, tlsCaListFile_.c_str()); -- pj_cstr(&tlsSetting_.cert_file, tlsCertificateFile_.c_str()); -- pj_cstr(&tlsSetting_.privkey_file, tlsPrivateKeyFile_.c_str()); -- pj_cstr(&tlsSetting_.password, tlsPassword_.c_str()); -+ pj_pool_t *pool = link_.getMemoryPool(); -+ -+ pj_str_t tlsCaListFile_str = pj_str((char*) tlsCaListFile_.c_str()); -+ pj_strdup(pool, &tlsSetting_.ca_list_file, &tlsCaListFile_str); -+ -+ pj_str_t tlsCertificateFile_str = pj_str((char*) tlsCertificateFile_.c_str()); -+ pj_strdup(pool, &tlsSetting_.cert_file, &tlsCertificateFile_str); -+ -+ pj_str_t tlsPrivateKeyFile_str = pj_str((char*) tlsPrivateKeyFile_.c_str()); -+ pj_strdup(pool, &tlsSetting_.privkey_file, &tlsPrivateKeyFile_str); -+ -+ pj_str_t tlsPassword_str = pj_str((char*) tlsPassword_.c_str()); -+ pj_strdup(pool, &tlsSetting_.password, &tlsPassword_str); -+ - tlsSetting_.method = sslMethodStringToPjEnum(tlsMethod_); - tlsSetting_.ciphers_num = ciphers_.size(); - tlsSetting_.ciphers = &ciphers_.front(); -@@ -1451,6 +1461,8 @@ void SIPAccount::setCredentials(const st - - size_t i = 0; - -+ pj_pool_t *pool = link_.getMemoryPool(); -+ - for (const auto &item : credentials_) { - map::const_iterator val = item.find(CONFIG_ACCOUNT_PASSWORD); - const std::string password = val != item.end() ? val->second : ""; -@@ -1461,17 +1473,25 @@ void SIPAccount::setCredentials(const st - val = item.find(CONFIG_ACCOUNT_USERNAME); - - if (val != item.end()) -- cred_[i].username = pj_str((char*) val->second.c_str()); -+ { -+ pj_str_t username_str = pj_str((char*) val->second.c_str()); -+ pj_strdup(pool, &cred_[i].username, &username_str); -+ } - -- cred_[i].data = pj_str((char*) password.c_str()); -+ pj_str_t password_str = pj_str((char*) password.c_str()); -+ pj_strdup(pool, &cred_[i].data, &password_str); - - val = item.find(CONFIG_ACCOUNT_REALM); - - if (val != item.end()) -- cred_[i].realm = pj_str((char*) val->second.c_str()); -+ { -+ pj_str_t realm_str = pj_str((char*) val->second.c_str()); -+ pj_strdup(pool, &cred_[i].realm, &realm_str); -+ } - - cred_[i].data_type = dataType; -- cred_[i].scheme = pj_str((char*) "digest"); -+ pj_str_t scheme_str = pj_str((char*) "digest"); -+ pj_strdup(pool, &cred_[i].scheme, &scheme_str); - ++i; - } - } -diff -rupN sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp ---- sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp 2019-04-02 18:20:14.216722207 +0200 -@@ -508,6 +508,11 @@ pjsip_module * SIPVoIPLink::getMod() - return &mod_ua_; - } - -+pj_pool_t * SIPVoIPLink::getMemoryPool() const -+{ -+ return pool_; -+} -+ - SIPVoIPLink::SIPVoIPLink() : sipTransport(), sipAccountMap_(), - sipCallMapMutex_(), sipCallMap_() - #ifdef SFL_VIDEO -diff -rupN sflphone-1.4.1/daemon/src/sip/sipvoiplink.h sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.h ---- sflphone-1.4.1/daemon/src/sip/sipvoiplink.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.h 2019-04-02 18:20:14.216722207 +0200 -@@ -302,6 +302,8 @@ class SIPVoIPLink : public VoIPLink { - int getModId(); - pjsip_endpoint * getEndpoint(); - pjsip_module * getMod(); -+ pj_pool_t * getMemoryPool() const; -+ - private: - - NON_COPYABLE(SIPVoIPLink); diff --git a/sflphone_novideo.patch b/sflphone_novideo.patch deleted file mode 100644 index 32a5d79..0000000 --- a/sflphone_novideo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN sflphone-1.4.1/kde/src/CMakeLists.txt sflphone-1.4.1-new/kde/src/CMakeLists.txt ---- sflphone-1.4.1/kde/src/CMakeLists.txt 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/kde/src/CMakeLists.txt 2019-04-02 18:20:13.616723201 +0200 -@@ -7,6 +7,7 @@ if(POLICY CMP0022) - endif(POLICY CMP0022) - - # set(CMAKE_AUTOMOC ON) -+set(ENABLE_VIDEO false) - - FIND_PACKAGE ( KDE4 REQUIRED ) - diff --git a/sflphone_sflphoned-dir.patch b/sflphone_sflphoned-dir.patch deleted file mode 100644 index 54425b1..0000000 --- a/sflphone_sflphoned-dir.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -rupN sflphone-1.4.1/daemon/src/client/dbus/Makefile.am sflphone-1.4.1-new/daemon/src/client/dbus/Makefile.am ---- sflphone-1.4.1/daemon/src/client/dbus/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/client/dbus/Makefile.am 2019-04-02 18:20:13.916722704 +0200 -@@ -70,7 +70,7 @@ service_DATA = $(service_in_files:.servi - - # Rule to make the service file with bindir expanded - $(service_DATA): $(service_in_files) Makefile -- sed -e "s|libexec|$(libdir)/sflphone|" $<> $@ -+ sed -e "s|libexec|$(libexecdir)|" $<> $@ - - EXTRA_DIST = README $(service_in_files) \ - callmanager-introspec.xml \ -diff -rupN sflphone-1.4.1/daemon/src/Makefile.am sflphone-1.4.1-new/daemon/src/Makefile.am ---- sflphone-1.4.1/daemon/src/Makefile.am 2019-04-02 18:20:13.312723705 +0200 -+++ sflphone-1.4.1-new/daemon/src/Makefile.am 2019-04-02 18:20:13.916722704 +0200 -@@ -1,6 +1,5 @@ - include ../globals.mak - --libexecdir=$(libdir)/sflphone - libexec_PROGRAMS = sflphoned - - if SFL_VIDEO diff --git a/sflphone_tls.patch b/sflphone_tls.patch deleted file mode 100644 index ccfe66f..0000000 --- a/sflphone_tls.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN sflphone-1.4.1/daemon/src/sip/siptransport.cpp sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp ---- sflphone-1.4.1/daemon/src/sip/siptransport.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp 2019-04-02 18:20:14.063722461 +0200 -@@ -254,7 +254,7 @@ SipTransport::createTlsListener(SIPAccou - - listeningAddress.setPort(account.getTlsListenerPort()); - -- RETURN_IF_FAIL(not listeningAddress, nullptr, "Could not determine IP address for this transport"); -+ RETURN_IF_FAIL(listeningAddress, nullptr, "Could not determine IP address for this transport"); - - DEBUG("Creating Listener on %s...", listeningAddress.toString(true).c_str()); - DEBUG("CRT file : %s", account.getTlsSetting()->ca_list_file.ptr); diff --git a/sflphone_unbundle.patch b/sflphone_unbundle.patch deleted file mode 100644 index e4d53cb..0000000 --- a/sflphone_unbundle.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -rupN sflphone-1.4.1/daemon/configure.ac sflphone-1.4.1-new/daemon/configure.ac ---- sflphone-1.4.1/daemon/configure.ac 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/configure.ac 2019-04-02 18:20:13.148723977 +0200 -@@ -431,8 +431,6 @@ AS_IF([test "x$enable_debug" = "xyes"], - dnl What Makefiles to generate - - AC_CONFIG_FILES([Makefile \ -- libs/Makefile \ -- libs/iax2/Makefile \ - src/Makefile \ - src/sip/Makefile \ - src/im/Makefile \ -@@ -460,5 +458,4 @@ AC_CONFIG_FILES([Makefile \ - # Go! - AC_OUTPUT - --AC_CONFIG_SUBDIRS([libs/pjproject-2.2.1]) --AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-2.2.1) has already been compiled. Run `make' to build the software.]]) -+AC_MSG_NOTICE([[Configuration done! Run `make' to build the software.]]) -diff -rupN sflphone-1.4.1/daemon/globals.mak sflphone-1.4.1-new/daemon/globals.mak ---- sflphone-1.4.1/daemon/globals.mak 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/globals.mak 2019-04-02 18:20:13.148723977 +0200 -@@ -7,18 +7,9 @@ sflplugindir=$(sfllibdir)/plugins - - ASTYLERC="$(top_srcdir)/../astylerc" - indent="/usr/bin/astyle" --PJPROJECT_DIR=pjproject-2.2.1 - - # for pjsip --include $(src)/libs/$(PJPROJECT_DIR)/build.mak --PJSIP_LIBS=$(APP_LDFLAGS) $(APP_LDLIBS) -- --SIP_CFLAGS=-I$(src)/libs/$(PJPROJECT_DIR)/pjsip/include \ -- -I$(src)/libs/$(PJPROJECT_DIR)/pjlib/include \ -- -I$(src)/libs/$(PJPROJECT_DIR)/pjlib-util/include \ -- -I$(src)/libs/$(PJPROJECT_DIR)/pjmedia/include \ -- -I$(src)/libs/$(PJPROJECT_DIR)/pjnath/include \ -- -DPJ_AUTOCONF=1 -+PJSIP_LIBS=-lpj -lpjsip -lpjlib-util -lpjmedia -lpjsip-ua -lpjnath -lpjsip-simple - - if BUILD_SPEEX - SPEEXCODEC=-DHAVE_SPEEX_CODEC -@@ -34,13 +25,9 @@ endif - - # Preprocessor flags - AM_CPPFLAGS = \ -- -I$(src)/libs \ -- -I$(src)/libs/iax2 \ -- -I$(src)/libs/$(PJPROJECT_DIR) \ - -I$(src)/src \ - -I$(src)/src/config \ - -I$(src)/test \ -- $(SIP_CFLAGS) \ - @DBUSCPP_CFLAGS@ \ - -DPREFIX=\"$(prefix)\" \ - -DPROGSHAREDIR=\"${datadir}/sflphone\" \ -diff -rupN sflphone-1.4.1/daemon/Makefile.am sflphone-1.4.1-new/daemon/Makefile.am ---- sflphone-1.4.1/daemon/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/Makefile.am 2019-04-02 18:20:13.148723977 +0200 -@@ -19,7 +19,7 @@ unittest: - endif - - ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = libs src ringtones man $(TESTS_DIR) doc -+SUBDIRS = src ringtones man $(TESTS_DIR) doc - - EXTRA_DIST = m4/libtool.m4 \ - m4/lt~obsolete.m4 \ -diff -rupN sflphone-1.4.1/daemon/src/iax/iaxcall.cpp sflphone-1.4.1-new/daemon/src/iax/iaxcall.cpp ---- sflphone-1.4.1/daemon/src/iax/iaxcall.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/iax/iaxcall.cpp 2019-04-02 18:20:13.148723977 +0200 -@@ -31,8 +31,8 @@ - - #include - #include --#include --#include -+#include -+#include - - #include "iaxcall.h" - #include "logger.h" -diff -rupN sflphone-1.4.1/daemon/src/iax/iaxvoiplink.h sflphone-1.4.1-new/daemon/src/iax/iaxvoiplink.h ---- sflphone-1.4.1/daemon/src/iax/iaxvoiplink.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/iax/iaxvoiplink.h 2019-04-02 18:20:13.148723977 +0200 -@@ -45,7 +45,7 @@ - #include "noncopyable.h" - #include "audio/resampler.h" - --#include -+#include - - #include - -diff -rupN sflphone-1.4.1/daemon/src/im/instant_messaging.h sflphone-1.4.1-new/daemon/src/im/instant_messaging.h ---- sflphone-1.4.1/daemon/src/im/instant_messaging.h 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/im/instant_messaging.h 2019-04-02 18:20:13.149723975 +0200 -@@ -48,7 +48,7 @@ - #include "config.h" - - #if HAVE_IAX --#include -+#include - #endif - - #define EMPTY_MESSAGE pj_str((char*)"") -diff -rupN sflphone-1.4.1/daemon/src/Makefile.am sflphone-1.4.1-new/daemon/src/Makefile.am ---- sflphone-1.4.1/daemon/src/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/Makefile.am 2019-04-02 18:20:13.149723975 +0200 -@@ -18,7 +18,7 @@ endif - if USE_IAX - IAX_SUBDIR=iax - IAX_CXXFLAG=-DUSE_IAX --IAX_LIB=./iax/libiaxlink.la $(top_builddir)/libs/iax2/libiax2.la -+IAX_LIB=./iax/libiaxlink.la -liax - endif - - if USE_NETWORKMANAGER diff --git a/sflphone_zrtp-includes.patch b/sflphone_zrtp-includes.patch deleted file mode 100644 index f7c10e6..0000000 --- a/sflphone_zrtp-includes.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -rupN sflphone-1.4.1/daemon/src/audio/audiortp/Makefile.am sflphone-1.4.1-new/daemon/src/audio/audiortp/Makefile.am ---- sflphone-1.4.1/daemon/src/audio/audiortp/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/audio/audiortp/Makefile.am 2019-04-02 18:20:13.466723450 +0200 -@@ -6,6 +6,8 @@ if BUILD_ZRTP - SFL_ZRTP_SRC=audio_zrtp_session.h audio_zrtp_session.cpp zrtp_session_callback.cpp zrtp_session_callback.h - endif - -+libaudiortp_la_CXXFLAGS = -I/usr/include/libzrtpcpp -+ - libaudiortp_la_SOURCES = \ - $(SFL_ZRTP_SRC) \ - audio_rtp_session.cpp \ -diff -rupN sflphone-1.4.1/daemon/src/client/Makefile.am sflphone-1.4.1-new/daemon/src/client/Makefile.am ---- sflphone-1.4.1/daemon/src/client/Makefile.am 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/client/Makefile.am 2019-04-02 18:20:13.466723450 +0200 -@@ -37,5 +37,6 @@ libclient_la_SOURCES = callmanager.cpp - $(STUB_SRC) - - libclient_la_CXXFLAGS = -I./ \ -+ -I/usr/include/libzrtpcpp \ - -DPREFIX=\"$(prefix)\" \ - -DPROGSHAREDIR=\"${datadir}/sflphone\" diff --git a/sflphone_zrtp.patch b/sflphone_zrtp.patch deleted file mode 100644 index e8b5c60..0000000 --- a/sflphone_zrtp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN sflphone-1.4.1/daemon/src/audio/audiortp/audio_rtp_factory.cpp sflphone-1.4.1-new/daemon/src/audio/audiortp/audio_rtp_factory.cpp ---- sflphone-1.4.1/daemon/src/audio/audiortp/audio_rtp_factory.cpp 2014-09-19 18:09:33.000000000 +0200 -+++ sflphone-1.4.1-new/daemon/src/audio/audiortp/audio_rtp_factory.cpp 2019-04-02 18:20:13.314723701 +0200 -@@ -109,7 +109,7 @@ void AudioRtpFactory::initSession() - // TODO: be careful with that. The hello hash is computed asynchronously. Maybe it's - // not even available at that point. - if (helloHashEnabled_) -- call_->getLocalSDP()->setZrtpHash(static_cast(rtpSession_.get())->getHelloHash()); -+ call_->getLocalSDP()->setZrtpHash(static_cast(rtpSession_.get())->getHelloHash(0)); - break; - } - #endif diff --git a/sources b/sources deleted file mode 100644 index 8cc6781..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -2092fb6ebcdfdf4f0f45da4738b1be8d sflphone-1.4.1.tar.gz