From 4f8a13b9fbfd0efcb94ee8da46b09c6dbe84ac4b Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Wed, 22 Mar 2023 09:41:31 -0400
Subject: gnu: wireshark: Update dependencies, use Qt 6.

* gnu/packages/networking.scm (wireshark)
[arguments] <#:configure-flags>: Add -DUSE_qt6=ON.
[inputs]: Replace lua-5.2 with lua,
qtbase-5 with qtbase, qtmultimedia-5 with qtmultimedia, qtsvg-5 with qtsvg.
Add qt5compat.
[native-inputs]: replace qttools-5 with qttools.
---
 gnu/packages/networking.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/networking.scm')

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 26451c91a9..ecb1d16615 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1773,7 +1773,8 @@ (define-public wireshark
       ;; libraries, which would otherwise cause the validate-runpath phase to
       ;; fail.
       #:configure-flags #~(list (string-append "-DCMAKE_MODULE_LINKER_FLAGS="
-                                               "-Wl,-rpath=" #$output "/lib"))
+                                               "-Wl,-rpath=" #$output "/lib")
+                                "-DUSE_qt6=ON")
       #:phases
       #~(modify-phases %standard-phases
           (replace 'check
@@ -1799,14 +1800,15 @@ (define-public wireshark
            libssh
            libxml2
            lz4
-           lua-5.2                      ;Lua 5.3 unsupported
+           lua
            mit-krb5
            `(,nghttp2 "lib")
            minizip
            pcre2
-           qtbase-5
-           qtmultimedia-5
-           qtsvg-5
+           qt5compat
+           qtbase
+           qtmultimedia
+           qtsvg
            sbc
            snappy
            zlib
@@ -1819,7 +1821,7 @@ (define-public wireshark
            perl
            pkg-config
            python-wrapper
-           qttools-5))
+           qttools))
     (synopsis "Network traffic analyzer")
     (description "Wireshark is a network protocol analyzer, or @dfn{packet
 sniffer}, that lets you capture and interactively browse the contents of
-- 
cgit v1.2.3