From a234ae38ba21578403b6ed9df2edb4104a343826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Mon, 28 May 2018 23:03:19 +0200 Subject: [PATCH] gnu: wireshark: Fix build against Qt 5.11. * gnu/packages/networking.scm (wireshark)[arguments]: Add a 'patch-source' phase that includes missing headers. --- gnu/packages/networking.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index a95f5d10e0..a662842739 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2018 Adam Van Ymeren ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Tonton +;;; Copyright © 2018 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -588,7 +589,21 @@ of the same name.") (assoc-ref %build-inputs "portaudio")) (string-append "--with-sbc=" (assoc-ref %build-inputs "sbc")) (string-append "--with-snappy=" (assoc-ref %build-inputs "snappy")) - (string-append "--with-zlib=" (assoc-ref %build-inputs "zlib"))))) + (string-append "--with-zlib=" (assoc-ref %build-inputs "zlib"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; Fix build against Qt 5.11. + (substitute* "ui/qt/packet_format_group_box.cpp" + (("#include ") "#include +#include ")) + (substitute* "ui/qt/time_shift_dialog.cpp" + (("#include ") "#include +#include ")) + (substitute* "ui/qt/wireless_frame.cpp" + (("#include ") "#include +#include "))))))) (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