jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

linphone-desktop: update to 4.2.1.

Browse source
This commit is contained in:
John 2020-07-10 13:44:14 +02:00
parent 3180fdd71b
commit 65c23728b5
5 changed files with 29 additions and 416 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

365
srcpkgs/linphone-desktop/patches/fix-qt5_1x.patch
View file

@ -1,365 +0,0 @@
diff --git src/app/App.cpp b/src/app/App.cpp
index aa02932..f659418 100644
--- src/app/App.cpp
+++ b/src/app/App.cpp
@@ -147,9 +147,6 @@ void App::initContentApp () {
qInfo() << QStringLiteral("Restarting app...");
delete mEngine;
- mCallsWindow = nullptr;
- mSettingsWindow = nullptr;
-
CoreManager::uninit();
initLocale(config);
diff --git ui/modules/Common/Form/ComboBox.qml b/ui/modules/Common/Form/ComboBox.qml
index f1c45bc..a9d0d02 100644
--- ui/modules/Common/Form/ComboBox.qml
+++ b/ui/modules/Common/Form/ComboBox.qml
@@ -1,5 +1,5 @@
import QtQuick 2.7
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.2 as Controls
import QtQuick.Layouts 1.3
import Common 1.0
@@ -11,7 +11,7 @@ import 'ComboBox.js' as Logic
// =============================================================================
-ComboBox {
+Controls.ComboBox {
id: comboBox
// ---------------------------------------------------------------------------
@@ -83,7 +83,7 @@ ComboBox {
// ---------------------------------------------------------------------------
- delegate: ItemDelegate {
+ delegate: Controls.ItemDelegate {
id: item
readonly property var flattenedModel: comboBox.textRole.length &&
diff --git ui/modules/Common/Form/Tab/TabButton.qml b/ui/modules/Common/Form/Tab/TabButton.qml
index 753c670..c863321 100644
--- ui/modules/Common/Form/Tab/TabButton.qml
+++ b/ui/modules/Common/Form/Tab/TabButton.qml
@@ -1,5 +1,5 @@
import QtQuick 2.7
-import QtQuick.Controls 2.1 as Controls
+import QtQuick.Controls 2.2 as Controls
import QtQuick.Layouts 1.3
import Common 1.0
@@ -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 +65,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 ui/modules/Common/Form/Tab/TabContainer.qml b/ui/modules/Common/Form/Tab/TabContainer.qml
index 7d036d1..69bc5c9 100644
--- ui/modules/Common/Form/Tab/TabContainer.qml
+++ b/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 {
diff --git ui/modules/Linphone/Calls/Calls.qml b/ui/modules/Linphone/Calls/Calls.qml
index 8930912..b6f95ba 100644
--- ui/modules/Linphone/Calls/Calls.qml
+++ b/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
diff --git ui/modules/Linphone/Timeline/Timeline.qml b/ui/modules/Linphone/Timeline/Timeline.qml
index 1dec35c..9520545 100644
--- ui/modules/Linphone/Timeline/Timeline.qml
+++ b/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: SettingsModel.chatEnabled && 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)
+ }
}
}
diff --git ui/views/App/Settings/SettingsWindow.qml b/ui/views/App/Settings/SettingsWindow.qml
index ce7a1fd..cc27638 100644
--- ui/views/App/Settings/SettingsWindow.qml
+++ b/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
}

11
srcpkgs/linphone-desktop/patches/gitVersion.patch
View file

@ -1,11 +0,0 @@
--- AppController.cpp 2017-12-09 12:49:04.635798497 +0100
+++ src/app/AppController.cpp 2017-12-09 12:49:34.228799625 +0100
@@ -30,7 +30,7 @@
// Must be unique. Used by `SingleApplication` and `Paths`.
#define APPLICATION_NAME "linphone"
-#define APPLICATION_VERSION LINPHONE_QT_GIT_VERSION
+#define APPLICATION_VERSION "4.1.1"
#define APPLICATION_MINIMAL_QT_VERSION "5.9.0"
#define DEFAULT_FONT "Noto Sans"

33
srcpkgs/linphone-desktop/patches/removeWerror.patch
View file

@ -1,33 +0,0 @@
--- CMakeLists.txt.bak 2017-12-09 12:42:39.858783833 +0100
+++ CMakeLists.txt 2017-12-09 12:43:11.262785030 +0100
@@ -45,30 +45,6 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
-if (NOT WIN32)
- check_cxx_compiler_flag("-Wsuggest-override" SUGGEST_OVERRIDE)
- set(CUSTOM_FLAGS "\
--Wall \
--Wcast-align \
--Wconversion \
--Werror=return-type \
--Werror=old-style-cast \
--Wextra \
--Wfloat-equal \
--Winit-self \
--Woverloaded-virtual \
--Wpointer-arith \
--Wuninitialized \
--Wunused \
-")
- if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- set(CUSTOM_FLAGS "${CUSTOM_FLAGS} -Wlogical-op")
- endif ()
- if (SUGGEST_OVERRIDE)
- set(CUSTOM_FLAGS "${CUSTOM_FLAGS} -Wsuggest-override -Werror=suggest-override")
- endif ()
-endif ()
-
set(CUSTOM_FLAGS "${CUSTOM_FLAGS} -DQT_NO_EXCEPTIONS")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CUSTOM_FLAGS}")

34
srcpkgs/linphone-desktop/template
View file

@ -1,8 +1,8 @@
# Template file for 'linphone-desktop' # Template file for 'linphone-desktop'
pkgname=linphone-desktop pkgname=linphone-desktop
version=4.1.1 version=4.2.1
revision=3 revision=1
wrksrc="linphoneqt-${version}" build_wrksrc="linphone-app" # The root cmake is glue code for their vendored libs
build_style=cmake build_style=cmake
configure_args="-DCMAKE_INSTALL_RPATH=OFF" configure_args="-DCMAKE_INSTALL_RPATH=OFF"
hostmakedepends="qt5-qmake qt5-host-tools qt5-declarative" hostmakedepends="qt5-qmake qt5-host-tools qt5-declarative"
@ -12,8 +12,30 @@ makedepends="bctoolbox-devel belcard-devel belle-sip-devel linphone-devel
depends="qt5>=5.9_1 qt5-quickcontrols qt5-quickcontrols2 qt5-graphicaleffects" depends="qt5>=5.9_1 qt5-quickcontrols qt5-quickcontrols2 qt5-graphicaleffects"
short_desc="Linphone qt desktop" short_desc="Linphone qt desktop"
maintainer="John <me@johnnynator.dev>" maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later" license="GPL-3.0-or-later"
homepage="https://www.linphone.org/" homepage="https://www.linphone.org/"
distfiles="https://www.linphone.org/releases/sources/linphoneqt/linphoneqt-${version}.tar.gz" distfiles="https://gitlab.linphone.org/BC/public/linphone-desktop/-/archive/${version}/linphone-desktop-${version}.tar.gz"
checksum=4a00c0cc2861089f8d3a1d0af1cde8ad4094f23640fb6df483e1814853ce5fbc checksum=a9c520851ec40ebd6bc28b5ebc0e4d2b5f62ef3b53e5d60bb241c0b2bd56ad62
replaces="linphone-gui>=0" replaces="linphone-gui>=0"
CFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\""
CXXFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\""
linphone-gui_package() {
short_desc+=" - (transitional dummy package)"
depends="linphone-desktop"
build_style=meta
}
# XXX: The cmake install does all kinds of stuff we don't want
do_install() {
vbin build/linphone
vinstall build/linphone.desktop 644 usr/share/applications/
vinstall assets/images/linphone_logo.svg 644 usr/share/icons/hicolor/scalable/apps/ linphone.svg
vinstall assets/linphonerc-factory 644 usr/share/linphone/
vinstall assets/assistant/create-app-sip-account.rc 644 usr/share/linphone/assistant
vinstall assets/assistant/use-app-sip-account.rc 644 usr/share/linphone/assistant
vinstall assets/assistant/use-other-sip-account.rc 644 usr/share/linphone/assistant
for s in 16x16 22x22 24x24 32x32 64x64 128x128 256x256; do
vinstall assets/icons/hicolor/${s}/apps/icon.png 644 usr/share/icons/hicolor/${s}/apps/
done
}

2
srcpkgs/linphone-gui
View file

@ -1 +1 @@
linphone linphone-desktop