diff options
author | linsui <linsui555@gmail.com> | 2023-07-20 20:57:20 +0800 |
---|---|---|
committer | linsui <linsui555@gmail.com> | 2023-07-20 20:57:20 +0800 |
commit | 771c6008a99696eb64438b4ff3645df3c2098f0e (patch) | |
tree | 2583193b2a83de21b79008af6f93cd58226d4d40 /pkgs/applications/networking/instant-messengers/jami | |
parent | 22bcc32f638a4b1e655548c63c33d05424191539 (diff) |
jami: 20230323.0 -> 20230619.1
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/jami')
2 files changed, 14 insertions, 70 deletions
diff --git a/pkgs/applications/networking/instant-messengers/jami/0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch b/pkgs/applications/networking/instant-messengers/jami/0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch deleted file mode 100644 index 5420b77c89568..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch +++ /dev/null @@ -1,52 +0,0 @@ -From f60e38b394c55e709cba2c0839c1fbba2fd8a1d2 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Sun, 16 Apr 2023 21:56:06 +0800 -Subject: [PATCH] fix annotations in bin/dbus/cx.ring.Ring.CallManager.xml - ---- - bin/dbus/cx.ring.Ring.CallManager.xml | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/bin/dbus/cx.ring.Ring.CallManager.xml b/bin/dbus/cx.ring.Ring.CallManager.xml -index 8c5732f30..4228fcad2 100644 ---- a/bin/dbus/cx.ring.Ring.CallManager.xml -+++ b/bin/dbus/cx.ring.Ring.CallManager.xml -@@ -87,7 +87,7 @@ - <tp:docstring> - Once enabled using the startSmartInfo method, this signal is emitted every refreshTimeMS - </tp:docstring> -- <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MapStringString"/> -+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/> - <arg type="a{ss}" name="info" direction="out" /> - </signal> - -@@ -761,7 +761,7 @@ - The caller phone number. - </tp:docstring> - </arg> -- <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="VectorMapStringString"/> -+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out3" value="VectorMapStringString"/> - <arg type="aa{ss}" name="mediaList"> - <tp:docstring> - The list of media offered in the incoming call. -@@ -791,7 +791,7 @@ - Call ID of the incoming call. - </tp:docstring> - </arg> -- <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="VectorMapStringString"/> -+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out2" value="VectorMapStringString"/> - <arg type="aa{ss}" name="mediaList"> - <tp:docstring> - The list of media offered in the incoming call. -@@ -807,7 +807,7 @@ - <arg type="s" name="accountId" /> - <arg type="s" name="callId" /> - <arg type="s" name="from" /> -- <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="MapStringString"/> -+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out3" value="MapStringString"/> - <arg type="a{ss}" name="messages" /> - </signal> - --- -2.39.2 - diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index ee14657bed1c4..5a002b6be9f38 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -2,9 +2,8 @@ , lib , pkg-config , fetchFromGitLab -, fetchpatch , gitUpdater -, ffmpeg_5 +, ffmpeg_6 # for daemon , autoreconfHook @@ -12,7 +11,7 @@ , alsa-lib , asio , dbus -, dbus_cplusplus +, sdbus-cpp , fmt , gmp , gnutls @@ -66,14 +65,14 @@ let in stdenv.mkDerivation rec { pname = "jami"; - version = "20230323.0"; + version = "20230619.1"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-X8iIT8UtI2Vq0Ne5e2ahSPN4g7QLZGnq3SZV/NY+1pY="; + hash = "sha256-gOl4GtGmEvhM8xtlyFvTwXrUsbocUKULnVy9cnCNAM0="; fetchSubmodules = true; }; @@ -82,13 +81,13 @@ stdenv.mkDerivation rec { patch-src = src + "/daemon/contrib/src/pjproject/"; in rec { - version = "3b78ef1c48732d238ba284cdccb04dc6de79c54f"; + version = "e4b83585a0bdf1523e808a4fc1946ec82ac733d0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "pjproject"; rev = version; - hash = "sha256-hrm5tDM2jknU/gWMeO6/FhqOvay8bajFid39OiEtAAQ="; + hash = "sha256-QeD2o6uz9r5vc3Scs1oRKYZ+aNH+01TSxLBj71ssfj4="; }; patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); @@ -107,14 +106,6 @@ stdenv.mkDerivation rec { inherit src version meta; sourceRoot = "source/daemon"; - patches = [ - ./0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch - (fetchpatch { - url = "https://git.jami.net/savoirfairelinux/jami-daemon/-/commit/315b5fbf546712f22a7b03ca750257bc92263a91.patch"; - hash = "sha256-GNUhFWvYpihAVe1gkVkZARpQmN+Cgv97hRQ4VFiEoKI="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -125,9 +116,9 @@ stdenv.mkDerivation rec { alsa-lib asio dbus - dbus_cplusplus + sdbus-cpp fmt - ffmpeg_5 + ffmpeg_6 gmp gnutls http-parser @@ -154,6 +145,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; }; + postPatch = '' + substituteInPlace src/app/commoncomponents/ModalTextEdit.qml \ + --replace 'required property string placeholderText' 'property string placeholderText: ""' + ''; + preConfigure = '' echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h ''; @@ -168,7 +164,7 @@ stdenv.mkDerivation rec { buildInputs = [ daemon - ffmpeg_5 + ffmpeg_6 libnotify networkmanager qtbase |