Attachment #234815 for bug #264734

Lines 1-25 Link Here

(-)b/net/linphone/Makefile (-7 / +31 lines)
1	PORTNAME= linphone	1	PORTNAME= linphone
2	PORTVERSION= 4.1.1	2	PORTVERSION= 4.3.2
3	PORTREVISION= 6
4	PORTEPOCH= 1	3	PORTEPOCH= 1
5	CATEGORIES= net	4	CATEGORIES= net
6	MASTER_SITES= https://www.linphone.org/releases/sources/linphoneqt/
7	DISTNAME= linphoneqt-${PORTVERSION}
8		5
9	MAINTAINER= ports@FreeBSD.org	6	MAINTAINER= ports@FreeBSD.org
10	COMMENT= SIP client supporting voice/video calls and text messaging	7	COMMENT= SIP client supporting voice/video calls and text messaging
11		8
		9	LICENSE= GPLv3
		10
12	LIB_DEPENDS= libbctoolbox.so:net/bctoolbox \	11	LIB_DEPENDS= libbctoolbox.so:net/bctoolbox \
13	libbelcard.so:deskutils/belcard \	12	libbelcard.so:deskutils/belcard \
14	liblinphone++.so:net/liblinphone	13	liblinphone++.so:net/liblinphone \
		14	libmediastreamer.so:net/mediastreamer \
		15	libortp.so:net/ortp
15		16
16	USES= cmake compiler:c++11-lib pkgconfig qt:5	17	USES= cmake compiler:c++11-lib pkgconfig qt:5
17	USE_QT= buildtools_build concurrent core declarative \	18	USE_QT= buildtools_build concurrent core declarative dbus \
18	graphicaleffects_run gui linguisttools network qmake_build \	19	graphicaleffects_run gui linguisttools network qmake_build \
19	quickcontrols_run quickcontrols2 speech svg testlib widgets	20	quickcontrols_run quickcontrols2 speech svg testlib widgets
20		21
		22	CMAKE_ARGS+= -DLINPHONE_QT_ONLY:BOOL=YES
		23
		24	USE_GITLAB= yes
		25	GL_SITE= https://gitlab.linphone.org/BC
		26	GL_ACCOUNT= public
		27	GL_PROJECT= linphone-desktop
		28	GL_COMMIT= 782eb34cc81a23e4e7b714d782c0a1751efcc99f
		29
		30	ICONDIR= ${LOCALBASE}/share/icons/hicolor/scalable/apps
		31
21	post-patch:	32	post-patch:
		33	@${REINPLACE_CMD} -e 's/bc_compute_full_version([^)]*)//' \
		34	-e 's/set(FULL_VERSION /&${PORTVERSION}/' \
		35	${WRKSRC}/linphone-app/CMakeLists.txt
22	@${REINPLACE_CMD} 's/LINPHONE_QT_GIT_VERSION/"${PORTVERSION}"/' \	36	@${REINPLACE_CMD} 's/LINPHONE_QT_GIT_VERSION/"${PORTVERSION}"/' \
23	${WRKSRC}/src/app/AppController.cpp	37	${WRKSRC}/linphone-app/src/app/AppController.cpp
		38
		39	post-install:
		40	${MKDIR} ${STAGEDIR}${LOCALBASE}/lib/linphone
		41	${MKDIR} ${STAGEDIR}${ICONDIR}
		42	${INSTALL_LIB} ${WRKDIR}/.build/linphone-app/libapp-plugin.so \
		43	${STAGEDIR}${LOCALBASE}/lib/linphone
		44	${INSTALL_DATA} ${WRKSRC}/linphone-app/assets/images/linphone_logo.svg \
		45	${STAGEDIR}${ICONDIR}/linphone.svg
		46	${INSTALL_DATA} ${FILESDIR}/linphone.desktop \
		47	${STAGEDIR}${LOCALBASE}/share/applications/linphone.desktop
24		48
25	.include <bsd.port.mk>	49	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/net/linphone/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1538765035	1	TIMESTAMP = 1655731157
2	SHA256 (linphoneqt-4.1.1.tar.gz) = 4a00c0cc2861089f8d3a1d0af1cde8ad4094f23640fb6df483e1814853ce5fbc	2	SHA256 (public-linphone-desktop-782eb34cc81a23e4e7b714d782c0a1751efcc99f_GL0.tar.gz) = 397ec09ef06fc88353be067b6cee6bc3afecb1968d5d93594d0c912c782e85e9
3	SIZE (linphoneqt-4.1.1.tar.gz) = 1820252	3	SIZE (public-linphone-desktop-782eb34cc81a23e4e7b714d782c0a1751efcc99f_GL0.tar.gz) = 2675636




[Desktop Entry]
Name=Linphone
GenericName=SIP Phone
Comment=Linphone is a libre SIP client
Type=Application
Exec=linphone %u
Icon=linphone
Terminal=false
Categories=Network;Telephony;


# Translations
Name[de]=Linphone
Name[he]=Linphone
Name[ar]=لِنْفُونْ
Name[hu]=Linphone
Name[ru]=Linphone
Name[nb_NO]=Linphone
Name[it]=Linphone
Name[ja]=Linphone
Name[cs]=Linphone
Name[sr]=Линфон
Name[sv]=Linphone
Name[zh_CN]=Linphone
Name[fr]=Linphone
Name[zh_TW]=Linphone




From ecaab0f73d0b74bbfbf150286305fa6e12970037 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Fri, 19 Jan 2018 14:42:01 +0100
Subject: [PATCH] fix(SettingsWindow): rename icon property of TabButton to
 iconName (issue with Qt 5.10 and new icon property)

---
 ui/modules/Common/Form/Tab/TabButton.qml |  8 ++++----
 ui/views/App/Settings/SettingsWindow.qml | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ui/modules/Common/Form/Tab/TabButton.qml b/ui/modules/Common/Form/Tab/TabButton.qml
index ad220ab2..a47bb20b 100644
--- ui/modules/Common/Form/Tab/TabButton.qml
+++ ui/modules/Common/Form/Tab/TabButton.qml
@@ -12,8 +12,8 @@ Controls.TabButton {
 
   // ---------------------------------------------------------------------------
 
-  property string icon
   property int iconSize: TabButtonStyle.icon.size
+  property string iconName
 
   readonly property bool _isSelected: parent.parent.currentItem === button
 
@@ -66,9 +66,9 @@ Controls.TabButton {
       Layout.leftMargin: TabButtonStyle.text.leftPadding
 
       icon: {
-        var icon = button.icon
-        return icon.length
-          ? (icon + '_' + (button._isSelected ? 'selected' : 'normal'))
+        var iconName = button.iconName
+        return iconName.length
+          ? (iconName + '_' + (button._isSelected ? 'selected' : 'normal'))
           : ''
       }
       iconSize: button.iconSize
diff --git a/ui/views/App/Settings/SettingsWindow.qml b/ui/views/App/Settings/SettingsWindow.qml
index b8f5a80f..58909544 100644
--- ui/views/App/Settings/SettingsWindow.qml
+++ ui/views/App/Settings/SettingsWindow.qml
@@ -48,43 +48,43 @@ ApplicationWindow {
         id: tabBar
 
         TabButton {
-          icon: 'settings_sip_accounts'
+          iconName: 'settings_sip_accounts'
           text: qsTr('sipAccountsTab')
           width: implicitWidth
         }
 
         TabButton {
-          icon: 'settings_audio'
+          iconName: 'settings_audio'
           text: qsTr('audioTab')
           width: implicitWidth
         }
 
         TabButton {
-          icon: 'settings_video'
+          iconName: 'settings_video'
           text: qsTr('videoTab')
           width: implicitWidth
         }
 
         TabButton {
-          icon: 'settings_call'
+          iconName: 'settings_call'
           text: qsTr('callsAndChatTab')
           width: implicitWidth
         }
 
         TabButton {
-          icon: 'settings_network'
+          iconName: 'settings_network'
           text: qsTr('networkTab')
           width: implicitWidth
         }
 
         TabButton {
-          icon: 'settings_advanced'
+          iconName: 'settings_advanced'
           text: qsTr('uiTab')
           width: implicitWidth
         }
 
         TabButton {
-          icon: 'settings_advanced'
+          iconName: 'settings_advanced'
           text: qsTr('uiAdvanced')
           width: implicitWidth
         }




From 5dd0161a68db97dd1bb1c367630821e61eae3584 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Mon, 22 Jan 2018 11:04:26 +0100
Subject: [PATCH] feat(app): try to support menu bar between qt 5.9 and qt 5.10

---
 resources.qrc                                |  2 +
 src/app/App.cpp                              | 12 ++-
 ui/views/App/Main/+5.9/MainWindowMenuBar.qml | 79 ++++++++++++++++++++
 ui/views/App/Main/+mac/MainWindowMenuBar.qml | 79 ++++++++++++++++++++
 ui/views/App/Main/MainWindowMenuBar.qml      | 37 ++++-----
 5 files changed, 184 insertions(+), 25 deletions(-)
 create mode 100644 ui/views/App/Main/+5.9/MainWindowMenuBar.qml
 create mode 100644 ui/views/App/Main/+mac/MainWindowMenuBar.qml

diff --git a/ui/views/App/Main/MainWindowMenuBar.qml b/ui/views/App/Main/MainWindowMenuBar.qml
index 48a0dde3..e32b8fe3 100644
--- ui/views/App/Main/MainWindowMenuBar.qml
+++ ui/views/App/Main/MainWindowMenuBar.qml
@@ -1,7 +1,5 @@
 import QtQuick 2.7
-
-// Experimental.
-import Qt.labs.platform 1.0
+import QtQuick.Controls 2.3
 
 import Linphone 1.0
 
@@ -48,32 +46,25 @@ Item {
   // Menu.
   // ---------------------------------------------------------------------------
 
-  MenuBar {
-    Menu {
-      id: menu
+  Menu {
+    id: menu
 
-      MenuItem {
-        role: MenuItem.PreferencesRole
-        shortcut: settingsShortcut.sequence
-        text: qsTr('settings')
+    MenuItem {
+      text: qsTr('settings')
 
-        onTriggered: settingsShortcut.onActivated()
-      }
+      onTriggered: settingsShortcut.onActivated()
+    }
 
-      MenuItem {
-        role: MenuItem.AboutRole
-        text: qsTr('about')
+    MenuItem {
+      text: qsTr('about')
 
-        onTriggered: aboutShortcut.onActivated()
-      }
+      onTriggered: aboutShortcut.onActivated()
+    }
 
-      MenuItem {
-        role: MenuItem.QuitRole
-        shortcut: quitShortcut.sequence
-        text: qsTr('quit')
+    MenuItem {
+      text: qsTr('quit')
 
-        onTriggered: quitShortcut.onActivated()
-      }
+      onTriggered: quitShortcut.onActivated()
     }
   }
 }




From c840bbab8ca823f4cca0b70f6e692a38933449d8 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Fri, 15 Jun 2018 11:55:59 +0200
Subject: [PATCH] fix(Timeline.qml): do not anchors rectangle in ColumnLayout
 (Qt5.11)

---
 ui/modules/Linphone/Timeline/Timeline.qml | 168 +++++++++++-----------
 1 file changed, 83 insertions(+), 85 deletions(-)

diff --git a/ui/modules/Linphone/Timeline/Timeline.qml b/ui/modules/Linphone/Timeline/Timeline.qml
index d260bd7b..95205458 100644
--- ui/modules/Linphone/Timeline/Timeline.qml
+++ ui/modules/Linphone/Timeline/Timeline.qml
@@ -9,7 +9,7 @@ import 'Timeline.js' as Logic
 
 // =============================================================================
 
-ColumnLayout {
+Rectangle {
   id: timeline
 
   // ---------------------------------------------------------------------------
@@ -35,110 +35,108 @@ ColumnLayout {
 
   // ---------------------------------------------------------------------------
 
-  spacing: 0
+  color: TimelineStyle.color
 
-  // ---------------------------------------------------------------------------
+  ColumnLayout {
+    anchors.fill: parent
+    spacing: 0
 
-  Connections {
-    target: model
+    // -------------------------------------------------------------------------
 
-    onDataChanged: Logic.handleDataChanged(topLeft, bottomRight, roles)
-    onRowsAboutToBeRemoved: Logic.handleRowsAboutToBeRemoved (parent, first, last)
-  }
+    Connections {
+      target: model
 
-  // ---------------------------------------------------------------------------
-
-  Rectangle {
-    anchors.fill: parent
-    color: TimelineStyle.color
-  }
+      onDataChanged: Logic.handleDataChanged(topLeft, bottomRight, roles)
+      onRowsAboutToBeRemoved: Logic.handleRowsAboutToBeRemoved(parent, first, last)
+    }
 
-  // ---------------------------------------------------------------------------
-  // Legend.
-  // ---------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
+    // Legend.
+    // -------------------------------------------------------------------------
 
-  Rectangle {
-    Layout.fillWidth: true
-    Layout.preferredHeight: TimelineStyle.legend.height
-    color: TimelineStyle.legend.backgroundColor
+    Rectangle {
+      Layout.fillWidth: true
+      Layout.preferredHeight: TimelineStyle.legend.height
+      color: TimelineStyle.legend.backgroundColor
 
-    Row {
-      anchors {
-        fill: parent
-        leftMargin: TimelineStyle.legend.leftMargin
-        rightMargin: TimelineStyle.legend.rightMargin
-      }
-      spacing: TimelineStyle.legend.spacing
+      Row {
+        anchors {
+          fill: parent
+          leftMargin: TimelineStyle.legend.leftMargin
+          rightMargin: TimelineStyle.legend.rightMargin
+        }
+        spacing: TimelineStyle.legend.spacing
 
-      Icon {
-        anchors.verticalCenter: parent.verticalCenter
-        icon: 'history'
-        iconSize: TimelineStyle.legend.iconSize
-      }
+        Icon {
+          anchors.verticalCenter: parent.verticalCenter
+          icon: 'history'
+          iconSize: TimelineStyle.legend.iconSize
+        }
 
-      Text {
-        color: TimelineStyle.legend.color
-        font.pointSize: TimelineStyle.legend.pointSize
-        height: parent.height
-        text: qsTr('timelineTitle')
-        verticalAlignment: Text.AlignVCenter
+        Text {
+          color: TimelineStyle.legend.color
+          font.pointSize: TimelineStyle.legend.pointSize
+          height: parent.height
+          text: qsTr('timelineTitle')
+          verticalAlignment: Text.AlignVCenter
+        }
       }
     }
-  }
 
-  // ---------------------------------------------------------------------------
-  // History.
-  // ---------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
+    // History.
+    // -------------------------------------------------------------------------
+
+    ScrollableListView {
+      id: view
+
+      Layout.fillHeight: true
+      Layout.fillWidth: true
+      currentIndex: -1
 
-  ScrollableListView {
-    id: view
-
-    Layout.fillHeight: true
-    Layout.fillWidth: true
-    currentIndex: -1
-
-    delegate: Item {
-      height: TimelineStyle.contact.height
-      width: parent ? parent.width : 0
-
-      Contact {
-        anchors.fill: parent
-        color: view.currentIndex === index
-          ? TimelineStyle.contact.backgroundColor.selected
-          : (
-            index % 2 == 0
-              ? TimelineStyle.contact.backgroundColor.a
-              : TimelineStyle.contact.backgroundColor.b
-          )
-        displayUnreadMessagesCount: view.currentIndex !== index
-        entry: $timelineEntry
-        sipAddressColor: view.currentIndex === index
-          ? TimelineStyle.contact.sipAddress.color.selected
-          : TimelineStyle.contact.sipAddress.color.normal
-        usernameColor: view.currentIndex === index
-          ? TimelineStyle.contact.username.color.selected
-          : TimelineStyle.contact.username.color.normal
-
-        Loader {
+      delegate: Item {
+        height: TimelineStyle.contact.height
+        width: parent ? parent.width : 0
+
+        Contact {
           anchors.fill: parent
-          sourceComponent: TooltipArea {
-            text: $timelineEntry.timestamp.toLocaleString(
-              Qt.locale(App.locale),
-              Locale.ShortFormat
+          color: view.currentIndex === index
+            ? TimelineStyle.contact.backgroundColor.selected
+            : (
+              index % 2 == 0
+                ? TimelineStyle.contact.backgroundColor.a
+                : TimelineStyle.contact.backgroundColor.b
             )
+            displayUnreadMessagesCount: view.currentIndex !== index
+            entry: $timelineEntry
+            sipAddressColor: view.currentIndex === index
+              ? TimelineStyle.contact.sipAddress.color.selected
+              : TimelineStyle.contact.sipAddress.color.normal
+            usernameColor: view.currentIndex === index
+              ? TimelineStyle.contact.username.color.selected
+              : TimelineStyle.contact.username.color.normal
+
+          Loader {
+            anchors.fill: parent
+            sourceComponent: TooltipArea {
+              text: $timelineEntry.timestamp.toLocaleString(
+                Qt.locale(App.locale),
+                Locale.ShortFormat
+              )
+            }
           }
         }
-      }
 
-      MouseArea {
-        anchors.fill: parent
-        onClicked: {
-          view.currentIndex = index
-          timeline.entrySelected($timelineEntry.sipAddress)
+        MouseArea {
+          anchors.fill: parent
+          onClicked: {
+            view.currentIndex = index
+            timeline.entrySelected($timelineEntry.sipAddress)
+          }
         }
       }
-    }
 
-    onCountChanged: Logic.handleCountChanged(count)
+      onCountChanged: Logic.handleCountChanged(count)
+    }
   }
 }




From 85c2165dd2cfaa051f2b5079406cccf363cdc0c8 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Fri, 15 Jun 2018 14:26:54 +0200
Subject: [PATCH] fix(TabContainer.qml): do not anchors rectangle in
 StackLayout (Qt5.11)

---
 ui/modules/Common/Form/Tab/TabContainer.qml               | 1 -
 ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/modules/Common/Form/Tab/TabContainer.qml b/ui/modules/Common/Form/Tab/TabContainer.qml
index 1ddbcc18..1706849a 100644
--- ui/modules/Common/Form/Tab/TabContainer.qml
+++ ui/modules/Common/Form/Tab/TabContainer.qml
@@ -11,7 +11,6 @@ import Utils 1.0
 Rectangle {
   default property alias _content: content.data
 
-  anchors.fill: parent
   color: TabContainerStyle.color
 
   ColumnLayout {




From 872093116f2b8cee869f38cdccf527b22d1f1ea1 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Fri, 15 Jun 2018 15:20:35 +0200
Subject: [PATCH] fix(ExclusiveButtons.spec.qml): do not use SignalSpy in Qt
 5.11, click is emitted twice instead of one

---
 .../Form/Buttons/ExclusiveButtons.spec.qml    | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml b/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml
index be92a1c4..0154fa95 100644
--- ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml
+++ ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml
@@ -27,13 +27,6 @@ Item {
 
         texts: ['A', 'B', 'C', 'D', 'E']
       }
-
-      SignalSpy {
-        id: spy
-
-        signalName: 'clicked'
-        target: exclusiveButtons
-      }
     }
   }
 
@@ -54,24 +47,33 @@ Item {
 
     function test_signals (data) {
       var container = buildExclusiveButtons(data.defaultSelectedButton)
-      var spy = container.data[1]
       var exclusiveButtons = container.data[0]
-
       var buttonToClick = data.buttonToClick
 
       // Test default selected button.
       compare(exclusiveButtons.selectedButton, data.defaultSelectedButton)
 
+      var button = -1
+      var count = 0
+
+      exclusiveButtons.clicked.connect(function (_button) {
+        button = _button;
+        count += 1
+      })
+
       // Test a click to change the selected button.
       mouseClick(exclusiveButtons.data[buttonToClick])
-      spy.wait(100)
-      compare(spy.signalArguments[0][0], buttonToClick)
+
+      compare(button, buttonToClick)
       compare(exclusiveButtons.selectedButton, buttonToClick)
+      compare(count, 1)
 
       // No signal must be emitted.
       mouseClick(exclusiveButtons.data[buttonToClick])
-      wait(100)
-      compare(spy.count, 1)
+
+      compare(button, buttonToClick)
+      compare(exclusiveButtons.selectedButton, buttonToClick)
+      compare(count, 1)
 
       container.destroy()
     }




From 4f908efd12647d9e603c9c6247170e127129c71a Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Wed, 20 Jun 2018 14:32:53 +0200
Subject: [PATCH] fix(Calls): avoid a crash with a bad binding (Qt 5.11) on
 ConferenceControls

---
 ui/modules/Linphone/Calls/Calls.qml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ui/modules/Linphone/Calls/Calls.qml b/ui/modules/Linphone/Calls/Calls.qml
index 89309129..b6f95bae 100644
--- ui/modules/Linphone/Calls/Calls.qml
+++ ui/modules/Linphone/Calls/Calls.qml
@@ -93,9 +93,7 @@ ListView {
   // ---------------------------------------------------------------------------
 
   header: ConferenceControls {
-    readonly property bool isSelected: calls.currentIndex === -1 &&
-      calls._selectedCall == null &&
-      visible
+    readonly property bool isSelected: calls.currentIndex === -1 && calls._selectedCall == null
 
     height: visible ? ConferenceControlsStyle.height : 0
     width: parent.width




From 70f47b01d375ab1d3687b2d448c601fdc15fab20 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Wed, 20 Jun 2018 14:56:53 +0200
Subject: [PATCH] fix(App): do not create windows later to avoid warning and
 abort (QQmlComponent: Cannot create new component instance before completing
 the previous)

---
 src/app/App.cpp | 40 +++++++++++++++++++---------------------
 src/app/App.hpp |  4 ++--
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/app/App.cpp b/src/app/App.cpp
index 36b68590..12661dd4 100644
--- src/app/App.cpp.orig
+++ src/app/App.cpp
@@ -147,8 +147,6 @@
     qInfo() << QStringLiteral("Restarting app...");
     delete mEngine;
 
-    mCallsWindow = nullptr;
-    mSettingsWindow = nullptr;
 
     CoreManager::uninit();
 
@@ -232,10 +230,7 @@
 
 // -----------------------------------------------------------------------------
 
-QQuickWindow *App::getCallsWindow () {
-  if (!mCallsWindow)
-    mCallsWindow = ::createSubWindow(mEngine, QML_VIEW_CALLS_WINDOW);
-
+QQuickWindow *App::getCallsWindow () const {
   return mCallsWindow;
 }
 
@@ -245,18 +240,7 @@
   );
 }
 
-QQuickWindow *App::getSettingsWindow () {
-  if (!mSettingsWindow) {
-    mSettingsWindow = ::createSubWindow(mEngine, QML_VIEW_SETTINGS_WINDOW);
-    QObject::connect(mSettingsWindow, &QWindow::visibilityChanged, this, [](QWindow::Visibility visibility) {
-        if (visibility == QWindow::Hidden) {
-          qInfo() << QStringLiteral("Update nat policy.");
-          shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
-          core->setNatPolicy(core->getNatPolicy());
-        }
-      });
-  }
-
+QQuickWindow *App::getSettingsWindow () const {
   return mSettingsWindow;
 }
 
@@ -504,6 +488,17 @@
 
 void App::openAppAfterInit () {
   qInfo() << QStringLiteral("Open linphone app.");
+
+  // Create other windows.
+  mCallsWindow = createSubWindow(mEngine, QML_VIEW_CALLS_WINDOW);
+  mSettingsWindow = createSubWindow(mEngine, QML_VIEW_SETTINGS_WINDOW);
+  QObject::connect(mSettingsWindow, &QWindow::visibilityChanged, this, [](QWindow::Visibility visibility) {
+    if (visibility == QWindow::Hidden) {
+      qInfo() << QStringLiteral("Update nat policy.");
+      shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
+      core->setNatPolicy(core->getNatPolicy());
+    }
+  });
 
   QQuickWindow *mainWindow = getMainWindow();
 
diff --git a/src/app/App.hpp b/src/app/App.hpp
index cdae4a06..21ad9617 100644
--- src/app/App.hpp.orig
+++ src/app/App.hpp
@@ -79,8 +79,8 @@
     exit(APP_CODE_RESTART);
   }
 
-  Q_INVOKABLE QQuickWindow *getCallsWindow ();
-  Q_INVOKABLE QQuickWindow *getSettingsWindow ();
+  Q_INVOKABLE QQuickWindow *getCallsWindow () const;
+  Q_INVOKABLE QQuickWindow *getSettingsWindow () const;
 
   Q_INVOKABLE static void smartShowWindow (QQuickWindow *window);
 




From 7f62ae905a92507c078ca6e43a2e5474b60baec8 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Thu, 21 Jun 2018 11:31:33 +0200
Subject: [PATCH] fix(ComboBox): import named QtQuick.Controls, avoid
 `QQmlComponent: Component is not Ready` with Qt 5.11.1

---
 ui/modules/Common/Form/ComboBox.qml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/modules/Common/Form/ComboBox.qml b/ui/modules/Common/Form/ComboBox.qml
index 9d6a93bd..2e25d01b 100644
--- ui/modules/Common/Form/ComboBox.qml
+++ ui/modules/Common/Form/ComboBox.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.1 as Controls
 import QtQuick.Layouts 1.3
 
 import Common 1.0
@@ -10,7 +10,7 @@ import 'ComboBox.js' as Logic
 
 // =============================================================================
 
-ComboBox {
+Controls.ComboBox {
   id: comboBox
 
   // ---------------------------------------------------------------------------
@@ -82,7 +82,7 @@ ComboBox {
 
   // ---------------------------------------------------------------------------
 
-  delegate: ItemDelegate {
+  delegate: Controls.ItemDelegate {
     id: item
 
     readonly property var flattenedModel: comboBox.textRole.length &&




From 313aa682738fc877ee8ba78b1d4060e08739cc24 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Fri, 19 Jan 2018 15:16:03 +0100
Subject: [PATCH] feat(AppController): force default theme style

---
 src/app/AppController.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/AppController.cpp b/src/app/AppController.cpp
index 2d353884..711e1a9b 100644
--- src/app/AppController.cpp
+++ src/app/AppController.cpp
@@ -23,6 +23,7 @@
 #include <QDirIterator>
 #include <QFontDatabase>
 #include <QMessageBox>
+#include <QQuickStyle>
 
 #include "gitversion.h"
 
@@ -85,6 +86,7 @@ AppController::AppController (int &argc, char *argv[]) {
   QCoreApplication::setApplicationVersion(APPLICATION_VERSION);
 
   mApp = new App(argc, argv);
+  QQuickStyle::setStyle("Default");
   if (mApp->isSecondary()) {
     #ifdef Q_OS_MACOS
       mApp->processEvents();




--- CMakeLists.txt.orig	2021-11-09 23:52:03 UTC
+++ CMakeLists.txt
@@ -167,7 +167,7 @@ if(CMAKE_VERBOSE_MAKEFILE)
 	endif()
 endif()
 if(UNIX AND NOT APPLE)
-	set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}")
+	set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/linphone")
 	list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}")
 endif()
 if(CMAKE_OSX_DEPLOYMENT_TARGET)
@@ -266,7 +266,7 @@ if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR 
 	endif()
 else()
 	message("Adding Linphone Desktop in an IDE-friendly state")
-	set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
+	#set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
 	add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
 	if(NOT LINPHONE_QT_ONLY)
 		add_dependencies(app-library ${APP_DEPENDS})




--- linphone-app/CMakeLists.txt.orig	2021-11-09 23:52:03 UTC
+++ linphone-app/CMakeLists.txt
@@ -591,17 +591,17 @@ add_dependencies(${TARGET_NAME} ${APP_LIBRARY} ${APP_P
 set(TOOLS_DIR "${CMAKE_BINARY_DIR}/programs")
 set(LINPHONE_BUILDER_SIGNING_IDENTITY ${LINPHONE_BUILDER_SIGNING_IDENTITY})
 
-add_custom_command(TARGET ${TARGET_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/include/" "${CMAKE_INSTALL_PREFIX}/include/")
-add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_INSTALL_PREFIX}/lib/")
-add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${APP_PLUGIN}> "${CMAKE_INSTALL_PREFIX}/lib/")
-add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_LINKER_FILE:${APP_PLUGIN}> "${CMAKE_INSTALL_PREFIX}/lib/")
+#add_custom_command(TARGET ${TARGET_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/include/" "${CMAKE_INSTALL_PREFIX}/include/")
+#add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_INSTALL_PREFIX}/lib/")
+#add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${APP_PLUGIN}> "${CMAKE_INSTALL_PREFIX}/lib/")
+#add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_LINKER_FILE:${APP_PLUGIN}> "${CMAKE_INSTALL_PREFIX}/lib/")
 #add_custom_command(TARGET ${TARGET_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/include/LinphoneApp/*" "${CMAKE_INSTALL_PREFIX}/include/LinphoneApp/")
 #configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/*" "${CMAKE_INSTALL_PREFIX}/include/LinphoneApp/" COPYONLY)
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include" DESTINATION ".")
 
 
 add_subdirectory(build)
-add_subdirectory(cmake_builder/linphone_package)
+#add_subdirectory(cmake_builder/linphone_package)
 
 
 # ------------------------------------------------------------------------------

Added Link Here

(-)b/net/linphone/files/patch-linphone-app_src_components_other_desktop-tools_DesktopTools.hpp (+11 lines)
1	--- linphone-app/src/components/other/desktop-tools/DesktopTools.hpp.orig 2022-06-20 13:27:49 UTC
2	+++ linphone-app/src/components/other/desktop-tools/DesktopTools.hpp
3	@@ -23,7 +23,7 @@
4
5	#include <QtGlobal>
6
7	-#ifdef Q_OS_LINUX
8	+#if defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)
9	#include "DesktopToolsLinux.hpp"
10	#elif defined(Q_OS_WIN)
11	#include "DesktopToolsWindows.hpp"




--- resources.qrc.orig	2017-06-29 09:20:37 UTC
+++ resources.qrc
@@ -1,13 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
   <qresource prefix="/">
-    <file>assets/fonts/NotoSans-hinted/NotoSans-BoldItalic.ttf</file>
-    <file>assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf</file>
-    <file>assets/fonts/NotoSans-hinted/NotoSans-Italic.ttf</file>
-    <file>assets/fonts/NotoSans-hinted/NotoSans-Regular.ttf</file>
-    <file>assets/fonts/NotoSans-hinted/NotoSansUI-BoldItalic.ttf</file>
-    <file>assets/fonts/NotoSans-hinted/NotoSansUI-Bold.ttf</file>
-    <file>assets/fonts/NotoSans-hinted/NotoSansUI-Italic.ttf</file>
-    <file>assets/fonts/NotoSans-hinted/NotoSansUI-Regular.ttf</file>
     <file>assets/images/add_disabled.svg</file>
     <file>assets/images/add_hovered.svg</file>
     <file>assets/images/add_normal.svg</file>

Removed Link Here

(-)a/net/linphone/files/patch-src-app-AppController.cpp (-11 lines)
1	--- src/app/AppController.cpp.orig 2018-11-11 20:28:45 UTC
2	+++ src/app/AppController.cpp
3	@@ -34,7 +34,7 @@
4	#define APPLICATION_VERSION "4.1.1"
5	#define APPLICATION_MINIMAL_QT_VERSION "5.9.0"
6
7	-#define DEFAULT_FONT "Noto Sans"
8	+#define DEFAULT_FONT "sans-serif"
9
10	using namespace std;
11

Lines 1-8 Link Here

(-)b/net/linphone/pkg-plist (-6 / +5 lines)
1	bin/linphone	1	bin/linphone
2	bin/linphone-tester	2	include/LinphoneApp/LinphonePlugin.hpp
		3	include/LinphoneApp/PluginDataAPI.hpp
		4	include/LinphoneApp/PluginExample.json
		5	include/LinphoneApp/PluginNetworkHelper.hpp
		6	lib/linphone/libapp-plugin.so
3	share/applications/linphone.desktop	7	share/applications/linphone.desktop
4	share/icons/hicolor/scalable/apps/linphone.svg	8	share/icons/hicolor/scalable/apps/linphone.svg
5	%%DATADIR%%/assistant/create-linphone-sip-account.rc
6	%%DATADIR%%/assistant/use-linphone-sip-account.rc
7	%%DATADIR%%/assistant/use-other-sip-account.rc
8	%%DATADIR%%/linphonerc-factory
9	-

Return to bug 264734

Added Link Here

(-)b/net/linphone/files/linphone.desktop (+26 lines)
1	[Desktop Entry]
2	Name=Linphone
3	GenericName=SIP Phone
4	Comment=Linphone is a libre SIP client
5	Type=Application
6	Exec=linphone %u
7	Icon=linphone
8	Terminal=false
9	Categories=Network;Telephony;
10
11
12	# Translations
13	Name[de]=Linphone
14	Name[he]=Linphone
15	Name[ar]=لِنْفُونْ
16	Name[hu]=Linphone
17	Name[ru]=Linphone
18	Name[nb_NO]=Linphone
19	Name[it]=Linphone
20	Name[ja]=Linphone
21	Name[cs]=Linphone
22	Name[sr]=Линфон
23	Name[sv]=Linphone
24	Name[zh_CN]=Linphone
25	Name[fr]=Linphone
26	Name[zh_TW]=Linphone

Removed Link Here

(-)a/net/linphone/files/patch-00-ecaab0f (-93 lines)
1	From ecaab0f73d0b74bbfbf150286305fa6e12970037 Mon Sep 17 00:00:00 2001
2	From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
3	Date: Fri, 19 Jan 2018 14:42:01 +0100
4	Subject: [PATCH] fix(SettingsWindow): rename icon property of TabButton to
5	iconName (issue with Qt 5.10 and new icon property)
6
7	---
8	ui/modules/Common/Form/Tab/TabButton.qml \| 8 ++++----
9	ui/views/App/Settings/SettingsWindow.qml \| 14 +++++++-------
10	2 files changed, 11 insertions(+), 11 deletions(-)
11
12	diff --git a/ui/modules/Common/Form/Tab/TabButton.qml b/ui/modules/Common/Form/Tab/TabButton.qml
13	index ad220ab2..a47bb20b 100644
14	--- ui/modules/Common/Form/Tab/TabButton.qml
15	+++ ui/modules/Common/Form/Tab/TabButton.qml
16	@@ -12,8 +12,8 @@ Controls.TabButton {
17
18	// ---------------------------------------------------------------------------
19
20	- property string icon
21	property int iconSize: TabButtonStyle.icon.size
22	+ property string iconName
23
24	readonly property bool _isSelected: parent.parent.currentItem === button
25
26	@@ -66,9 +66,9 @@ Controls.TabButton {
27	Layout.leftMargin: TabButtonStyle.text.leftPadding
28
29	icon: {
30	- var icon = button.icon
31	- return icon.length
32	- ? (icon + '_' + (button._isSelected ? 'selected' : 'normal'))
33	+ var iconName = button.iconName
34	+ return iconName.length
35	+ ? (iconName + '_' + (button._isSelected ? 'selected' : 'normal'))
36	: ''
37	}
38	iconSize: button.iconSize
39	diff --git a/ui/views/App/Settings/SettingsWindow.qml b/ui/views/App/Settings/SettingsWindow.qml
40	index b8f5a80f..58909544 100644
41	--- ui/views/App/Settings/SettingsWindow.qml
42	+++ ui/views/App/Settings/SettingsWindow.qml
43	@@ -48,43 +48,43 @@ ApplicationWindow {
44	id: tabBar
45
46	TabButton {
47	- icon: 'settings_sip_accounts'
48	+ iconName: 'settings_sip_accounts'
49	text: qsTr('sipAccountsTab')
50	width: implicitWidth
51	}
52
53	TabButton {
54	- icon: 'settings_audio'
55	+ iconName: 'settings_audio'
56	text: qsTr('audioTab')
57	width: implicitWidth
58	}
59
60	TabButton {
61	- icon: 'settings_video'
62	+ iconName: 'settings_video'
63	text: qsTr('videoTab')
64	width: implicitWidth
65	}
66
67	TabButton {
68	- icon: 'settings_call'
69	+ iconName: 'settings_call'
70	text: qsTr('callsAndChatTab')
71	width: implicitWidth
72	}
73
74	TabButton {
75	- icon: 'settings_network'
76	+ iconName: 'settings_network'
77	text: qsTr('networkTab')
78	width: implicitWidth
79	}
80
81	TabButton {
82	- icon: 'settings_advanced'
83	+ iconName: 'settings_advanced'
84	text: qsTr('uiTab')
85	width: implicitWidth
86	}
87
88	TabButton {
89	- icon: 'settings_advanced'
90	+ iconName: 'settings_advanced'
91	text: qsTr('uiAdvanced')
92	width: implicitWidth
93	}

Removed Link Here

(-)a/net/linphone/files/patch-01-5dd0161 (-74 lines)
1	From 5dd0161a68db97dd1bb1c367630821e61eae3584 Mon Sep 17 00:00:00 2001
2	From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
3	Date: Mon, 22 Jan 2018 11:04:26 +0100
4	Subject: [PATCH] feat(app): try to support menu bar between qt 5.9 and qt 5.10
5
6	---
7	resources.qrc \| 2 +
8	src/app/App.cpp \| 12 ++-
9	ui/views/App/Main/+5.9/MainWindowMenuBar.qml \| 79 ++++++++++++++++++++
10	ui/views/App/Main/+mac/MainWindowMenuBar.qml \| 79 ++++++++++++++++++++
11	ui/views/App/Main/MainWindowMenuBar.qml \| 37 ++++-----
12	5 files changed, 184 insertions(+), 25 deletions(-)
13	create mode 100644 ui/views/App/Main/+5.9/MainWindowMenuBar.qml
14	create mode 100644 ui/views/App/Main/+mac/MainWindowMenuBar.qml
15
16	diff --git a/ui/views/App/Main/MainWindowMenuBar.qml b/ui/views/App/Main/MainWindowMenuBar.qml
17	index 48a0dde3..e32b8fe3 100644
18	--- ui/views/App/Main/MainWindowMenuBar.qml
19	+++ ui/views/App/Main/MainWindowMenuBar.qml
20	@@ -1,7 +1,5 @@
21	import QtQuick 2.7
22	-
23	-// Experimental.
24	-import Qt.labs.platform 1.0
25	+import QtQuick.Controls 2.3
26
27	import Linphone 1.0
28
29	@@ -48,32 +46,25 @@ Item {
30	// Menu.
31	// ---------------------------------------------------------------------------
32
33	- MenuBar {
34	- Menu {
35	- id: menu
36	+ Menu {
37	+ id: menu
38
39	- MenuItem {
40	- role: MenuItem.PreferencesRole
41	- shortcut: settingsShortcut.sequence
42	- text: qsTr('settings')
43	+ MenuItem {
44	+ text: qsTr('settings')
45
46	- onTriggered: settingsShortcut.onActivated()
47	- }
48	+ onTriggered: settingsShortcut.onActivated()
49	+ }
50
51	- MenuItem {
52	- role: MenuItem.AboutRole
53	- text: qsTr('about')
54	+ MenuItem {
55	+ text: qsTr('about')
56
57	- onTriggered: aboutShortcut.onActivated()
58	- }
59	+ onTriggered: aboutShortcut.onActivated()
60	+ }
61
62	- MenuItem {
63	- role: MenuItem.QuitRole
64	- shortcut: quitShortcut.sequence
65	- text: qsTr('quit')
66	+ MenuItem {
67	+ text: qsTr('quit')
68
69	- onTriggered: quitShortcut.onActivated()
70	- }
71	+ onTriggered: quitShortcut.onActivated()
72	}
73	}
74	}

Removed Link Here

(-)a/net/linphone/files/patch-02-c840bba (-216 lines)
1	From c840bbab8ca823f4cca0b70f6e692a38933449d8 Mon Sep 17 00:00:00 2001
2	From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
3	Date: Fri, 15 Jun 2018 11:55:59 +0200
4	Subject: [PATCH] fix(Timeline.qml): do not anchors rectangle in ColumnLayout
5	(Qt5.11)
6
7	---
8	ui/modules/Linphone/Timeline/Timeline.qml \| 168 +++++++++++-----------
9	1 file changed, 83 insertions(+), 85 deletions(-)
10
11	diff --git a/ui/modules/Linphone/Timeline/Timeline.qml b/ui/modules/Linphone/Timeline/Timeline.qml
12	index d260bd7b..95205458 100644
13	--- ui/modules/Linphone/Timeline/Timeline.qml
14	+++ ui/modules/Linphone/Timeline/Timeline.qml
15	@@ -9,7 +9,7 @@ import 'Timeline.js' as Logic
16
17	// =============================================================================
18
19	-ColumnLayout {
20	+Rectangle {
21	id: timeline
22
23	// ---------------------------------------------------------------------------
24	@@ -35,110 +35,108 @@ ColumnLayout {
25
26	// ---------------------------------------------------------------------------
27
28	- spacing: 0
29	+ color: TimelineStyle.color
30
31	- // ---------------------------------------------------------------------------
32	+ ColumnLayout {
33	+ anchors.fill: parent
34	+ spacing: 0
35
36	- Connections {
37	- target: model
38	+ // -------------------------------------------------------------------------
39
40	- onDataChanged: Logic.handleDataChanged(topLeft, bottomRight, roles)
41	- onRowsAboutToBeRemoved: Logic.handleRowsAboutToBeRemoved (parent, first, last)
42	- }
43	+ Connections {
44	+ target: model
45
46	- // ---------------------------------------------------------------------------
47	-
48	- Rectangle {
49	- anchors.fill: parent
50	- color: TimelineStyle.color
51	- }
52	+ onDataChanged: Logic.handleDataChanged(topLeft, bottomRight, roles)
53	+ onRowsAboutToBeRemoved: Logic.handleRowsAboutToBeRemoved(parent, first, last)
54	+ }
55
56	- // ---------------------------------------------------------------------------
57	- // Legend.
58	- // ---------------------------------------------------------------------------
59	+ // -------------------------------------------------------------------------
60	+ // Legend.
61	+ // -------------------------------------------------------------------------
62
63	- Rectangle {
64	- Layout.fillWidth: true
65	- Layout.preferredHeight: TimelineStyle.legend.height
66	- color: TimelineStyle.legend.backgroundColor
67	+ Rectangle {
68	+ Layout.fillWidth: true
69	+ Layout.preferredHeight: TimelineStyle.legend.height
70	+ color: TimelineStyle.legend.backgroundColor
71
72	- Row {
73	- anchors {
74	- fill: parent
75	- leftMargin: TimelineStyle.legend.leftMargin
76	- rightMargin: TimelineStyle.legend.rightMargin
77	- }
78	- spacing: TimelineStyle.legend.spacing
79	+ Row {
80	+ anchors {
81	+ fill: parent
82	+ leftMargin: TimelineStyle.legend.leftMargin
83	+ rightMargin: TimelineStyle.legend.rightMargin
84	+ }
85	+ spacing: TimelineStyle.legend.spacing
86
87	- Icon {
88	- anchors.verticalCenter: parent.verticalCenter
89	- icon: 'history'
90	- iconSize: TimelineStyle.legend.iconSize
91	- }
92	+ Icon {
93	+ anchors.verticalCenter: parent.verticalCenter
94	+ icon: 'history'
95	+ iconSize: TimelineStyle.legend.iconSize
96	+ }
97
98	- Text {
99	- color: TimelineStyle.legend.color
100	- font.pointSize: TimelineStyle.legend.pointSize
101	- height: parent.height
102	- text: qsTr('timelineTitle')
103	- verticalAlignment: Text.AlignVCenter
104	+ Text {
105	+ color: TimelineStyle.legend.color
106	+ font.pointSize: TimelineStyle.legend.pointSize
107	+ height: parent.height
108	+ text: qsTr('timelineTitle')
109	+ verticalAlignment: Text.AlignVCenter
110	+ }
111	}
112	}
113	- }
114
115	- // ---------------------------------------------------------------------------
116	- // History.
117	- // ---------------------------------------------------------------------------
118	+ // -------------------------------------------------------------------------
119	+ // History.
120	+ // -------------------------------------------------------------------------
121	+
122	+ ScrollableListView {
123	+ id: view
124	+
125	+ Layout.fillHeight: true
126	+ Layout.fillWidth: true
127	+ currentIndex: -1
128
129	- ScrollableListView {
130	- id: view
131	-
132	- Layout.fillHeight: true
133	- Layout.fillWidth: true
134	- currentIndex: -1
135	-
136	- delegate: Item {
137	- height: TimelineStyle.contact.height
138	- width: parent ? parent.width : 0
139	-
140	- Contact {
141	- anchors.fill: parent
142	- color: view.currentIndex === index
143	- ? TimelineStyle.contact.backgroundColor.selected
144	- : (
145	- index % 2 == 0
146	- ? TimelineStyle.contact.backgroundColor.a
147	- : TimelineStyle.contact.backgroundColor.b
148	- )
149	- displayUnreadMessagesCount: view.currentIndex !== index
150	- entry: $timelineEntry
151	- sipAddressColor: view.currentIndex === index
152	- ? TimelineStyle.contact.sipAddress.color.selected
153	- : TimelineStyle.contact.sipAddress.color.normal
154	- usernameColor: view.currentIndex === index
155	- ? TimelineStyle.contact.username.color.selected
156	- : TimelineStyle.contact.username.color.normal
157	-
158	- Loader {
159	+ delegate: Item {
160	+ height: TimelineStyle.contact.height
161	+ width: parent ? parent.width : 0
162	+
163	+ Contact {
164	anchors.fill: parent
165	- sourceComponent: TooltipArea {
166	- text: $timelineEntry.timestamp.toLocaleString(
167	- Qt.locale(App.locale),
168	- Locale.ShortFormat
169	+ color: view.currentIndex === index
170	+ ? TimelineStyle.contact.backgroundColor.selected
171	+ : (
172	+ index % 2 == 0
173	+ ? TimelineStyle.contact.backgroundColor.a
174	+ : TimelineStyle.contact.backgroundColor.b
175	)
176	+ displayUnreadMessagesCount: view.currentIndex !== index
177	+ entry: $timelineEntry
178	+ sipAddressColor: view.currentIndex === index
179	+ ? TimelineStyle.contact.sipAddress.color.selected
180	+ : TimelineStyle.contact.sipAddress.color.normal
181	+ usernameColor: view.currentIndex === index
182	+ ? TimelineStyle.contact.username.color.selected
183	+ : TimelineStyle.contact.username.color.normal
184	+
185	+ Loader {
186	+ anchors.fill: parent
187	+ sourceComponent: TooltipArea {
188	+ text: $timelineEntry.timestamp.toLocaleString(
189	+ Qt.locale(App.locale),
190	+ Locale.ShortFormat
191	+ )
192	+ }
193	}
194	}
195	- }
196
197	- MouseArea {
198	- anchors.fill: parent
199	- onClicked: {
200	- view.currentIndex = index
201	- timeline.entrySelected($timelineEntry.sipAddress)
202	+ MouseArea {
203	+ anchors.fill: parent
204	+ onClicked: {
205	+ view.currentIndex = index
206	+ timeline.entrySelected($timelineEntry.sipAddress)
207	+ }
208	}
209	}
210	- }
211
212	- onCountChanged: Logic.handleCountChanged(count)
213	+ onCountChanged: Logic.handleCountChanged(count)
214	+ }
215	}
216	}

Removed Link Here

(-)a/net/linphone/files/patch-03-85c2165 (-23 lines)
1	From 85c2165dd2cfaa051f2b5079406cccf363cdc0c8 Mon Sep 17 00:00:00 2001
2	From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
3	Date: Fri, 15 Jun 2018 14:26:54 +0200
4	Subject: [PATCH] fix(TabContainer.qml): do not anchors rectangle in
5	StackLayout (Qt5.11)
6
7	---
8	ui/modules/Common/Form/Tab/TabContainer.qml \| 1 -
9	ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml \| 2 ++
10	2 files changed, 2 insertions(+), 1 deletion(-)
11
12	diff --git a/ui/modules/Common/Form/Tab/TabContainer.qml b/ui/modules/Common/Form/Tab/TabContainer.qml
13	index 1ddbcc18..1706849a 100644
14	--- ui/modules/Common/Form/Tab/TabContainer.qml
15	+++ ui/modules/Common/Form/Tab/TabContainer.qml
16	@@ -11,7 +11,6 @@ import Utils 1.0
17	Rectangle {
18	default property alias _content: content.data
19
20	- anchors.fill: parent
21	color: TabContainerStyle.color
22
23	ColumnLayout {

Removed Link Here

(-)a/net/linphone/files/patch-04-8720931 (-68 lines)
1	From 872093116f2b8cee869f38cdccf527b22d1f1ea1 Mon Sep 17 00:00:00 2001
2	From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
3	Date: Fri, 15 Jun 2018 15:20:35 +0200
4	Subject: [PATCH] fix(ExclusiveButtons.spec.qml): do not use SignalSpy in Qt
5	5.11, click is emitted twice instead of one
6
7	---
8	.../Form/Buttons/ExclusiveButtons.spec.qml \| 28 ++++++++++---------
9	1 file changed, 15 insertions(+), 13 deletions(-)
10
11	diff --git a/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml b/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml
12	index be92a1c4..0154fa95 100644
13	--- ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml
14	+++ ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml
15	@@ -27,13 +27,6 @@ Item {
16
17	texts: ['A', 'B', 'C', 'D', 'E']
18	}
19	-
20	- SignalSpy {
21	- id: spy
22	-
23	- signalName: 'clicked'
24	- target: exclusiveButtons
25	- }
26	}
27	}
28
29	@@ -54,24 +47,33 @@ Item {
30
31	function test_signals (data) {
32	var container = buildExclusiveButtons(data.defaultSelectedButton)
33	- var spy = container.data[1]
34	var exclusiveButtons = container.data[0]
35	-
36	var buttonToClick = data.buttonToClick
37
38	// Test default selected button.
39	compare(exclusiveButtons.selectedButton, data.defaultSelectedButton)
40
41	+ var button = -1
42	+ var count = 0
43	+
44	+ exclusiveButtons.clicked.connect(function (_button) {
45	+ button = _button;
46	+ count += 1
47	+ })
48	+
49	// Test a click to change the selected button.
50	mouseClick(exclusiveButtons.data[buttonToClick])
51	- spy.wait(100)
52	- compare(spy.signalArguments[0][0], buttonToClick)
53	+
54	+ compare(button, buttonToClick)
55	compare(exclusiveButtons.selectedButton, buttonToClick)
56	+ compare(count, 1)
57
58	// No signal must be emitted.
59	mouseClick(exclusiveButtons.data[buttonToClick])
60	- wait(100)
61	- compare(spy.count, 1)
62	+
63	+ compare(button, buttonToClick)
64	+ compare(exclusiveButtons.selectedButton, buttonToClick)
65	+ compare(count, 1)
66
67	container.destroy()
68	}

Removed Link Here

(-)a/net/linphone/files/patch-05-4f908ef (-25 lines)
1	From 4f908efd12647d9e603c9c6247170e127129c71a Mon Sep 17 00:00:00 2001
2	From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
3	Date: Wed, 20 Jun 2018 14:32:53 +0200
4	Subject: [PATCH] fix(Calls): avoid a crash with a bad binding (Qt 5.11) on
5	ConferenceControls
6
7	---
8	ui/modules/Linphone/Calls/Calls.qml \| 4 +---
9	1 file changed, 1 insertion(+), 3 deletions(-)
10
11	diff --git a/ui/modules/Linphone/Calls/Calls.qml b/ui/modules/Linphone/Calls/Calls.qml
12	index 89309129..b6f95bae 100644
13	--- ui/modules/Linphone/Calls/Calls.qml
14	+++ ui/modules/Linphone/Calls/Calls.qml
15	@@ -93,9 +93,7 @@ ListView {
16	// ---------------------------------------------------------------------------
17
18	header: ConferenceControls {
19	- readonly property bool isSelected: calls.currentIndex === -1 &&
20	- calls._selectedCall == null &&
21	- visible
22	+ readonly property bool isSelected: calls.currentIndex === -1 && calls._selectedCall == null
23
24	height: visible ? ConferenceControlsStyle.height : 0
25	width: parent.width

Removed Link Here

(-)a/net/linphone/files/patch-06-70f47b0 (-90 lines)
1	From 70f47b01d375ab1d3687b2d448c601fdc15fab20 Mon Sep 17 00:00:00 2001
2	From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
3	Date: Wed, 20 Jun 2018 14:56:53 +0200
4	Subject: [PATCH] fix(App): do not create windows later to avoid warning and
5	abort (QQmlComponent: Cannot create new component instance before completing
6	the previous)
7
8	---
9	src/app/App.cpp \| 40 +++++++++++++++++++---------------------
10	src/app/App.hpp \| 4 ++--
11	2 files changed, 21 insertions(+), 23 deletions(-)
12
13	diff --git a/src/app/App.cpp b/src/app/App.cpp
14	index 36b68590..12661dd4 100644
15	--- src/app/App.cpp.orig
16	+++ src/app/App.cpp
17	@@ -147,8 +147,6 @@
18	qInfo() << QStringLiteral("Restarting app...");
19	delete mEngine;
20
21	- mCallsWindow = nullptr;
22	- mSettingsWindow = nullptr;
23
24	CoreManager::uninit();
25
26	@@ -232,10 +230,7 @@
27
28	// -----------------------------------------------------------------------------
29
30	-QQuickWindow *App::getCallsWindow () {
31	- if (!mCallsWindow)
32	- mCallsWindow = ::createSubWindow(mEngine, QML_VIEW_CALLS_WINDOW);
33	-
34	+QQuickWindow *App::getCallsWindow () const {
35	return mCallsWindow;
36	}
37
38	@@ -245,18 +240,7 @@
39	);
40	}
41
42	-QQuickWindow *App::getSettingsWindow () {
43	- if (!mSettingsWindow) {
44	- mSettingsWindow = ::createSubWindow(mEngine, QML_VIEW_SETTINGS_WINDOW);
45	- QObject::connect(mSettingsWindow, &QWindow::visibilityChanged, this, [](QWindow::Visibility visibility) {
46	- if (visibility == QWindow::Hidden) {
47	- qInfo() << QStringLiteral("Update nat policy.");
48	- shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
49	- core->setNatPolicy(core->getNatPolicy());
50	- }
51	- });
52	- }
53	-
54	+QQuickWindow *App::getSettingsWindow () const {
55	return mSettingsWindow;
56	}
57
58	@@ -504,6 +488,17 @@
59
60	void App::openAppAfterInit () {
61	qInfo() << QStringLiteral("Open linphone app.");
62	+
63	+ // Create other windows.
64	+ mCallsWindow = createSubWindow(mEngine, QML_VIEW_CALLS_WINDOW);
65	+ mSettingsWindow = createSubWindow(mEngine, QML_VIEW_SETTINGS_WINDOW);
66	+ QObject::connect(mSettingsWindow, &QWindow::visibilityChanged, this, [](QWindow::Visibility visibility) {
67	+ if (visibility == QWindow::Hidden) {
68	+ qInfo() << QStringLiteral("Update nat policy.");
69	+ shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
70	+ core->setNatPolicy(core->getNatPolicy());
71	+ }
72	+ });
73
74	QQuickWindow *mainWindow = getMainWindow();
75
76	diff --git a/src/app/App.hpp b/src/app/App.hpp
77	index cdae4a06..21ad9617 100644
78	--- src/app/App.hpp.orig
79	+++ src/app/App.hpp
80	@@ -79,8 +79,8 @@
81	exit(APP_CODE_RESTART);
82	}
83
84	- Q_INVOKABLE QQuickWindow *getCallsWindow ();
85	- Q_INVOKABLE QQuickWindow *getSettingsWindow ();
86	+ Q_INVOKABLE QQuickWindow *getCallsWindow () const;
87	+ Q_INVOKABLE QQuickWindow *getSettingsWindow () const;
88
89	Q_INVOKABLE static void smartShowWindow (QQuickWindow *window);
90

Removed Link Here

(-)a/net/linphone/files/patch-07-7f62ae9 (-39 lines)
1	From 7f62ae905a92507c078ca6e43a2e5474b60baec8 Mon Sep 17 00:00:00 2001
2	From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
3	Date: Thu, 21 Jun 2018 11:31:33 +0200
4	Subject: [PATCH] fix(ComboBox): import named QtQuick.Controls, avoid
5	`QQmlComponent: Component is not Ready` with Qt 5.11.1
6
7	---
8	ui/modules/Common/Form/ComboBox.qml \| 6 +++---
9	1 file changed, 3 insertions(+), 3 deletions(-)
10
11	diff --git a/ui/modules/Common/Form/ComboBox.qml b/ui/modules/Common/Form/ComboBox.qml
12	index 9d6a93bd..2e25d01b 100644
13	--- ui/modules/Common/Form/ComboBox.qml
14	+++ ui/modules/Common/Form/ComboBox.qml
15	@@ -1,5 +1,5 @@
16	import QtQuick 2.7
17	-import QtQuick.Controls 2.1
18	+import QtQuick.Controls 2.1 as Controls
19	import QtQuick.Layouts 1.3
20
21	import Common 1.0
22	@@ -10,7 +10,7 @@ import 'ComboBox.js' as Logic
23
24	// =============================================================================
25
26	-ComboBox {
27	+Controls.ComboBox {
28	id: comboBox
29
30	// ---------------------------------------------------------------------------
31	@@ -82,7 +82,7 @@ ComboBox {
32
33	// ---------------------------------------------------------------------------
34
35	- delegate: ItemDelegate {
36	+ delegate: Controls.ItemDelegate {
37	id: item
38
39	readonly property var flattenedModel: comboBox.textRole.length &&

Removed Link Here

(-)a/net/linphone/files/patch-08-313aa68 (-29 lines)
1	From 313aa682738fc877ee8ba78b1d4060e08739cc24 Mon Sep 17 00:00:00 2001
2	From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
3	Date: Fri, 19 Jan 2018 15:16:03 +0100
4	Subject: [PATCH] feat(AppController): force default theme style
5
6	---
7	src/app/AppController.cpp \| 2 ++
8	1 file changed, 2 insertions(+)
9
10	diff --git a/src/app/AppController.cpp b/src/app/AppController.cpp
11	index 2d353884..711e1a9b 100644
12	--- src/app/AppController.cpp
13	+++ src/app/AppController.cpp
14	@@ -23,6 +23,7 @@
15	#include <QDirIterator>
16	#include <QFontDatabase>
17	#include <QMessageBox>
18	+#include <QQuickStyle>
19
20	#include "gitversion.h"
21
22	@@ -85,6 +86,7 @@ AppController::AppController (int &argc, char *argv[]) {
23	QCoreApplication::setApplicationVersion(APPLICATION_VERSION);
24
25	mApp = new App(argc, argv);
26	+ QQuickStyle::setStyle("Default");
27	if (mApp->isSecondary()) {
28	#ifdef Q_OS_MACOS
29	mApp->processEvents();

Lines 1-10 Link Here

(-)b/net/linphone/files/patch-CMakeLists.txt (-9 / +19 lines)
1	--- CMakeLists.txt.orig 2017-07-21 13:14:18 UTC	1	--- CMakeLists.txt.orig 2021-11-09 23:52:03 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -342,7 +342,6 @@ else ()	3	@@ -167,7 +167,7 @@ if(CMAKE_VERBOSE_MAKEFILE)
4	endif ()	4	endif()
5		5	endif()
6	if (NOT WIN32)	6	if(UNIX AND NOT APPLE)
7	- add_dependencies(update_translations check_qml)	7	- set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}")
8	endif ()	8	+ set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/linphone")
9	set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "${EXECUTABLE_NAME}")	9	list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}")
10	set_target_properties(${TESTER_TARGET_NAME} PROPERTIES OUTPUT_NAME "${TESTER_EXECUTABLE_NAME}")	10	endif()
		11	if(CMAKE_OSX_DEPLOYMENT_TARGET)
		12	@@ -266,7 +266,7 @@ if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR
		13	endif()
		14	else()
		15	message("Adding Linphone Desktop in an IDE-friendly state")
		16	- set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
		17	+ #set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
		18	add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
		19	if(NOT LINPHONE_QT_ONLY)
		20	add_dependencies(app-library ${APP_DEPENDS})

Added Link Here

(-)b/net/linphone/files/patch-linphone-app_CMakeLists.txt (+25 lines)
1	--- linphone-app/CMakeLists.txt.orig 2021-11-09 23:52:03 UTC
2	+++ linphone-app/CMakeLists.txt
3	@@ -591,17 +591,17 @@ add_dependencies(${TARGET_NAME} ${APP_LIBRARY} ${APP_P
4	set(TOOLS_DIR "${CMAKE_BINARY_DIR}/programs")
5	set(LINPHONE_BUILDER_SIGNING_IDENTITY ${LINPHONE_BUILDER_SIGNING_IDENTITY})
6
7	-add_custom_command(TARGET ${TARGET_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/include/" "${CMAKE_INSTALL_PREFIX}/include/")
8	-add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_INSTALL_PREFIX}/lib/")
9	-add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${APP_PLUGIN}> "${CMAKE_INSTALL_PREFIX}/lib/")
10	-add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_LINKER_FILE:${APP_PLUGIN}> "${CMAKE_INSTALL_PREFIX}/lib/")
11	+#add_custom_command(TARGET ${TARGET_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/include/" "${CMAKE_INSTALL_PREFIX}/include/")
12	+#add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_INSTALL_PREFIX}/lib/")
13	+#add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${APP_PLUGIN}> "${CMAKE_INSTALL_PREFIX}/lib/")
14	+#add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_LINKER_FILE:${APP_PLUGIN}> "${CMAKE_INSTALL_PREFIX}/lib/")
15	#add_custom_command(TARGET ${TARGET_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/include/LinphoneApp/*" "${CMAKE_INSTALL_PREFIX}/include/LinphoneApp/")
16	#configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/*" "${CMAKE_INSTALL_PREFIX}/include/LinphoneApp/" COPYONLY)
17	install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include" DESTINATION ".")
18
19
20	add_subdirectory(build)
21	-add_subdirectory(cmake_builder/linphone_package)
22	+#add_subdirectory(cmake_builder/linphone_package)
23
24
25	# ------------------------------------------------------------------------------

Removed Link Here

(-)a/net/linphone/files/patch-resources.qrc (-16 lines)
1	--- resources.qrc.orig 2017-06-29 09:20:37 UTC
2	+++ resources.qrc
3	@@ -1,13 +1,5 @@
4	<!DOCTYPE RCC><RCC version="1.0">
5	<qresource prefix="/">
6	- <file>assets/fonts/NotoSans-hinted/NotoSans-BoldItalic.ttf</file>
7	- <file>assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf</file>
8	- <file>assets/fonts/NotoSans-hinted/NotoSans-Italic.ttf</file>
9	- <file>assets/fonts/NotoSans-hinted/NotoSans-Regular.ttf</file>
10	- <file>assets/fonts/NotoSans-hinted/NotoSansUI-BoldItalic.ttf</file>
11	- <file>assets/fonts/NotoSans-hinted/NotoSansUI-Bold.ttf</file>
12	- <file>assets/fonts/NotoSans-hinted/NotoSansUI-Italic.ttf</file>
13	- <file>assets/fonts/NotoSans-hinted/NotoSansUI-Regular.ttf</file>
14	<file>assets/images/add_disabled.svg</file>
15	<file>assets/images/add_hovered.svg</file>
16	<file>assets/images/add_normal.svg</file>