* [bug#40660] gnu: Add linphoneqt.
@ 2020-04-16 14:24 Raghav Gururajan
2020-04-16 14:27 ` [bug#40660] gnu: Add linphoneqt. (v2) Raghav Gururajan
0 siblings, 1 reply; 4+ messages in thread
From: Raghav Gururajan @ 2020-04-16 14:24 UTC (permalink / raw)
To: 40660
[-- Attachment #1: Type: text/plain, Size: 87 bytes --]
Hello Guix!
Please find the attached patch to add 'linphoneqt' package.
Regards,
RG.
[-- Attachment #2: 0001-gnu-Add-linphoneqt.patch --]
[-- Type: text/x-patch, Size: 4786 bytes --]
From 445dc213ebbc4fea767fb3a27057a24796b89cbf Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 16 Apr 2020 10:22:10 -0400
Subject: [PATCH] gnu: Add linphoneqt.
* gnu/packages/linphone.scm (linphoneqt): New variable.
---
gnu/packages/linphone.scm | 80 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 79 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index c9959d7d01..1bfaeafd56 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -25,6 +25,7 @@
#:use-module (gnu packages base)
#:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
@@ -37,6 +38,7 @@
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages java)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages telephony)
@@ -49,7 +51,8 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system cmake)
- #:use-module (guix build-system gnu))
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system qt))
(define-public bcunit
(package
@@ -469,6 +472,81 @@ and video calls or instant messaging capabilities to an application.")
(home-page "https://gitlab.linphone.org/BC/public/liblinphone")
(license license:gpl2+)))
+(define-public linphoneqt
+ (package
+ (name "linphoneqt")
+ (version "4.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://www.linphone.org/releases/sources/" name
+ "/" name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a"))
+ (patches (search-patches "linphoneqt-tabbutton.patch"))))
+ (build-system qt-build-system)
+ (arguments
+ `(#:tests? #f ; No test target
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'set-paths 'set-qt-rcc-source-date-override
+ (lambda _
+ ;; This fixes a reproducibility problem where the Qt Resource
+ ;; Compiler (RCC) includes timestamp of its source files
+ ;; (see: https://reproducible-builds.org/docs/
+ ;; deterministic-build-systems/#cmake-notes).
+ (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")
+ #t))
+ (add-after 'unpack 'fix-cmake-error
+ (lambda _
+ ;; This is fixed in commit efed2fd8 of the master branch.
+ (substitute* "CMakeLists.txt"
+ (("js)\\$\"")
+ "js$\""))
+ #t))
+ (add-after 'unpack 'set-version-string
+ (lambda _
+ (substitute* "src/app/AppController.cpp"
+ (("LINPHONE_QT_GIT_VERSION")
+ (format #f "~s" ,version)))
+ #t)))))
+ (native-inputs
+ `(("gcc" ,gcc-5) ; Qt in master uses gcc-5
+ ("qttools" ,qttools)))
+ (inputs
+ `(("bctoolbox" ,bctoolbox)
+ ("belcard" ,belcard)
+ ("bellesip" ,belle-sip)
+ ("linphone" ,liblinphone)
+ ("mediastreamer2" ,mediastreamer2)
+ ("qtbase" ,qtbase)
+ ("qtdeclarative" ,qtdeclarative)
+ ("qtgraphicaleffects" ,qtgraphicaleffects)
+ ("qtquickcontrols" ,qtquickcontrols)
+ ("qtquickcontrols2" ,qtquickcontrols2)
+ ("qtsvg" ,qtsvg)))
+ (synopsis "Desktop client for the Linphone SIP softphone")
+ (description "Linphone is a SIP softphone for voice and video over IP calling
+(VoIP) and instant messaging. Amongst its features are:
+@itemize
+@item High Definition (HD) audio and video calls
+@item Multiple call management (pause and resume)
+@item Call transfer
+@item Audio conferencing (merge calls into a conference call)
+@item Call recording and replay (audio only)
+@item Instant Messaging with message delivery status (IMDN)
+@item Picture and file sharing
+@item Echo cancellation
+@item Secure user authentication using TLS client certificates
+@item SRTP, zRTP and SRTP-DTLS voice and video encryption
+@item Telephone tone (DTMF) support using SIP INFO or RFC 4733
+@item Audio codecs: opus, speex, g711, g729, gsm, iLBC, g722, SILK, etc.
+@item Video codecs: VP8, H.264 and H.265 with resolutions up to 1080P, MPEG4
+@end itemize")
+ (home-page "https://gitlab.linphone.org/BC/public/linphone-desktop")
+ (license license:gpl2+)))
+
(define-public msopenh264
(package
(name "msopenh264")
--
2.26.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#40660] gnu: Add linphoneqt. (v2)
2020-04-16 14:24 [bug#40660] gnu: Add linphoneqt Raghav Gururajan
@ 2020-04-16 14:27 ` Raghav Gururajan
2020-04-16 16:36 ` Raghav Gururajan
2020-04-18 5:32 ` bug#40660: " Maxim Cournoyer
0 siblings, 2 replies; 4+ messages in thread
From: Raghav Gururajan @ 2020-04-16 14:27 UTC (permalink / raw)
To: 40660
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 0001-gnu-Add-linphoneqt.patch --]
[-- Type: text/x-patch, Size: 3795 bytes --]
From 6e018522c30cb2a9732ccde98df32118c7699d7f Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 16 Apr 2020 10:26:11 -0400
Subject: [PATCH] gnu: Add linphoneqt.
* gnu/packages/linphone.scm (linphoneqt): New variable.
---
.../patches/linphoneqt-tabbutton.patch | 96 +++++++++++++++++++
1 file changed, 96 insertions(+)
create mode 100644 gnu/packages/patches/linphoneqt-tabbutton.patch
diff --git a/gnu/packages/patches/linphoneqt-tabbutton.patch b/gnu/packages/patches/linphoneqt-tabbutton.patch
new file mode 100644
index 0000000000..6b3214026e
--- /dev/null
+++ b/gnu/packages/patches/linphoneqt-tabbutton.patch
@@ -0,0 +1,96 @@
+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
+--- a/ui/modules/Common/Form/Tab/TabButton.qml
++++ b/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
+--- a/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
+ }
+--
+2.21.0
+
--
2.26.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#40660] gnu: Add linphoneqt. (v2)
2020-04-16 14:27 ` [bug#40660] gnu: Add linphoneqt. (v2) Raghav Gururajan
@ 2020-04-16 16:36 ` Raghav Gururajan
2020-04-18 5:32 ` bug#40660: " Maxim Cournoyer
1 sibling, 0 replies; 4+ messages in thread
From: Raghav Gururajan @ 2020-04-16 16:36 UTC (permalink / raw)
To: 40660
A
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#40660: gnu: Add linphoneqt. (v2)
2020-04-16 14:27 ` [bug#40660] gnu: Add linphoneqt. (v2) Raghav Gururajan
2020-04-16 16:36 ` Raghav Gururajan
@ 2020-04-18 5:32 ` Maxim Cournoyer
1 sibling, 0 replies; 4+ messages in thread
From: Maxim Cournoyer @ 2020-04-18 5:32 UTC (permalink / raw)
To: Raghav Gururajan; +Cc: 40660-done
Hello Raghav!
Raghav Gururajan <raghavgururajan@disroot.org> writes:
>>From 6e018522c30cb2a9732ccde98df32118c7699d7f Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Thu, 16 Apr 2020 10:26:11 -0400
> Subject: [PATCH] gnu: Add linphoneqt.
>
> * gnu/packages/linphone.scm (linphoneqt): New variable.
> ---
> .../patches/linphoneqt-tabbutton.patch | 96 +++++++++++++++++++
> 1 file changed, 96 insertions(+)
> create mode 100644 gnu/packages/patches/linphoneqt-tabbutton.patch
This with the previous patch resolved the crashes, but I could only make
linphoneqt run on core-updates, not on the latest master. On master, I
get the error:
linphone
MESA-LOADER: failed to open nouveau (search paths /gnu/store/qlzbx7a36brydrxbss71smwlrk539y9i-mesa-19.3.4/lib/dri)
libGL error: failed to load driver: nouveau
MESA-LOADER: failed to open swrast (search paths /gnu/store/qlzbx7a36brydrxbss71smwlrk539y9i-mesa-19.3.4/lib/dri)
libGL error: failed to load driver: swrast
[01:06:57:164][0x2220560][Info]/tmp/guix-build-linphoneqt-4.1.1.drv-0/linphoneqt-4.1.1/src/app/App.cpp:106: "Use locale: en_US"
[01:06:57:190][0x2220560][Info]:0: "Running app..."
[01:06:57:191][0x2220560][Info]/tmp/guix-build-linphoneqt-4.1.1.drv-0/linphoneqt-4.1.1/src/app/App.cpp:170: "Library paths:" ("/gnu/store/zb5xpy07rqs77679hyc2vy6p3cf2wlsr-qttools-5.12.7/lib/qt5/plugins", "/gnu/store/rl999vhbm259c5d5kzzlswsg748n9pwl-qtbase-5.12.7/lib/qt5/plugins", "/gnu/store/7hrwjw25ninmzjwrrhidda7bjvl8ia25-qtdeclarative-5.12.7/lib/qt5/plugins", "/gnu/store/wc6mf038d9rxh5n64ssd7r3475qls33r-qtsvg-5.12.7/lib/qt5/plugins", "/gnu/store/ayrpvjy44bwqsqz3sy5l69y54z6sh6pl-linphoneqt-4.1.1/bin")
[01:06:57:192][0x23116c0][Info]/tmp/guix-build-linphoneqt-4.1.1.drv-0/linphoneqt-4.1.1/src/components/core/CoreManager.cpp:200: "Launch async linphone core creation."
[01:06:57:197][0x2220560][Info]/tmp/guix-build-linphoneqt-4.1.1.drv-0/linphoneqt-4.1.1/src/app/App.cpp:181: "Activated selectors:" ("custom", "en_US", "unix", "linux")
[01:06:57:197][0x2220560][Info]/tmp/guix-build-linphoneqt-4.1.1.drv-0/linphoneqt-4.1.1/src/app/App.cpp:355: "Registering types..."
[01:06:57:198][0x2220560][Info]/tmp/guix-build-linphoneqt-4.1.1.drv-0/linphoneqt-4.1.1/src/app/App.cpp:389: "Registering shared types..."
[01:06:57:198][0x2220560][Info]/tmp/guix-build-linphoneqt-4.1.1.drv-0/linphoneqt-4.1.1/src/app/App.cpp:401: "Registering tool types..."
[01:06:57:198][0x2220560][Info]/tmp/guix-build-linphoneqt-4.1.1.drv-0/linphoneqt-4.1.1/src/app/App.cpp:409: "Registering shared tool types..."
[01:06:57:203][0x23116c0][Warning]:0: QSocketNotifier: Socket notifiers cannot be enabled or disabled from another thread
[01:06:57:204][0x23116c0][Warning]:0: QMutex: destroying locked mutex
So I've squashed your patches together and rebased them on core-updates,
and made the following modification to register the new patch file:
modified gnu/local.mk
@@ -1188,6 +1188,7 @@ dist_patch_DATA = \
%D%/packages/patches/lierolibre-remove-arch-warning.patch \
%D%/packages/patches/lierolibre-try-building-other-arch.patch \
%D%/packages/patches/linkchecker-tests-require-network.patch \
+ %D%/packages/patches/linphoneqt-tabbutton.patch \
%D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \
%D%/packages/patches/linux-pam-no-setfsuid.patch \
%D%/packages/patches/lirc-localstatedir.patch \
This is important to not break the Guix package itself.
It seems to work much better now! I need to test it more, but one small
thing I've noticed already: my webcam doesn't seem to be recognized, and
the default ring sound file is not installed:
[01:29:16:690][0x2647190][Warning]/tmp/guix-build-linphoneqt-4.1.1.drv-0/linphoneqt-4.1.1/src/components/sound-player/SoundPlayer.cpp:101:
"Unable to open:
`/gnu/store/9088xmz50p3hy9h5jfi10r1z4gsd59h3-linphoneqt-4.1.1/share/sounds/linphone/rings/notes_of_the_optimistic.mkv`").
Pushed as 45fd28f764 on core-updates.
Thank you for this nice improvement!
Maxim
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-18 5:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-16 14:24 [bug#40660] gnu: Add linphoneqt Raghav Gururajan
2020-04-16 14:27 ` [bug#40660] gnu: Add linphoneqt. (v2) Raghav Gururajan
2020-04-16 16:36 ` Raghav Gururajan
2020-04-18 5:32 ` bug#40660: " Maxim Cournoyer
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).