nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: wireshark: Fix build against Qt 5.11. 

* gnu/packages/networking.scm (wireshark)[arguments]: Add a 'patch-source'
phase that includes missing headers.
This commit is contained in:
Clément Lassieur 2018-05-28 23:03:19 +02:00
parent 77cc8778a3
commit a234ae38ba
No known key found for this signature in database
GPG Key ID: 89F96D4808F359C7
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/networking.scm
View File

@ -21,6 +21,7 @@
;;; Copyright © 2018 Adam Van Ymeren <adam@vany.ca> ;;; Copyright © 2018 Adam Van Ymeren <adam@vany.ca>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2018 Tonton <tonton@riseup.net> ;;; Copyright © 2018 Tonton <tonton@riseup.net>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -588,7 +589,21 @@ of the same name.")
(assoc-ref %build-inputs "portaudio")) (assoc-ref %build-inputs "portaudio"))
(string-append "--with-sbc=" (assoc-ref %build-inputs "sbc")) (string-append "--with-sbc=" (assoc-ref %build-inputs "sbc"))
(string-append "--with-snappy=" (assoc-ref %build-inputs "snappy")) (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 <QStyle>") "#include <QStyle>
#include <QStyleOption>"))
(substitute* "ui/qt/time_shift_dialog.cpp"
(("#include <ui/time_shift.h>") "#include <ui/time_shift.h>
#include <QStyleOption>"))
(substitute* "ui/qt/wireless_frame.cpp"
(("#include <QProcess>") "#include <QProcess>
#include <QAbstractItemView>")))))))
(synopsis "Network traffic analyzer") (synopsis "Network traffic analyzer")
(description "Wireshark is a network protocol analyzer, or @dfn{packet (description "Wireshark is a network protocol analyzer, or @dfn{packet
sniffer}, that lets you capture and interactively browse the contents of sniffer}, that lets you capture and interactively browse the contents of