From f41d7cc700b9b080d4fb791f4ac632fc79b9c377 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Sun, 26 Oct 2025 00:17:17 +0200
Subject: [PATCH] gnu: qtox: Update to 1.18.3 and switch to Qt6.

* gnu/packages/messaging.scm (qtox): Update to 1.18.3.
[arguments]<#:qtbase>: New entry.
<#:phases>{disable-network-tests}: Adapt.
[inputs]: Remove ffmpeg-6, qtsvg-5, and sonnet-5; add ffmpeg, qtsvg,
and sonnet.
[native-inputs]: Remove qttools-5; add qttools.

Change-Id: I25545976980f23cd3abda0849dfccfd581f2cb06
---
 gnu/packages/messaging.scm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index b11e4b002b7baa951913f27d1fc81a0c2349a298..9c123efd6f1f1cdc82d82d001db1a4255ed83fd4 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1767,7 +1767,7 @@ instant messenger with audio and video chat capabilities.")
 (define-public qtox
   (package
     (name "qtox")
-    (version "1.17.6")
+    (version "1.18.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1776,22 +1776,22 @@ instant messenger with audio and video chat capabilities.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0pb0ag9z9fz5m1f6lxzl86vksv0n290bw0nh2800scsjhyi9d8lx"))))
+                "0qxaq5nzsjmxa3w4nl04p7ydfzyjq15scnyrjlzdwxh9vgsgg4g6"))))
     (build-system qt-build-system)
     (arguments
-     (list #:phases
+     (list #:qtbase qtbase
+           #:phases
            #~(modify-phases %standard-phases
                (add-after 'unpack 'disable-network-tests
                  (lambda _
-                   ;; These tests require network access.
+                   ;; This test requires network access.
                    (substitute* "cmake/Testing.cmake"
-                     (("auto_test\\(core core\\)") "# auto_test(core core)")
-                     (("auto_test\\(net bsu\\)") "# auto_test(net bsu)")))))))
+                     (("auto_test\\(net bsu") "# auto_test(net bsu")))))))
     (native-inputs
-     (list pkg-config qttools-5))
+     (list pkg-config qttools))
     (inputs
      (list bash-minimal
-           ffmpeg-6
+           ffmpeg
            filteraudio
            libsodium
            c-toxcore
@@ -1802,8 +1802,8 @@ instant messenger with audio and video chat capabilities.")
            sqlite
            openal
            qrencode
-           qtsvg-5
-           sonnet-5
+           qtsvg
+           sonnet
            sqlcipher))
     (home-page "https://qtox.github.io/")
     (synopsis "Tox chat client using Qt")