From d3df61d8afa9c0200ab25ec2de91ced45c62f2fe Mon Sep 17 00:00:00 2001 From: Piraty Date: Tue, 23 Jul 2019 22:02:25 +0200 Subject: [PATCH] wireshark: update to 3.0.3. --- srcpkgs/wireshark/patches/rcc-zstd.patch | 17 +++++++++++++++++ srcpkgs/wireshark/template | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/wireshark/patches/rcc-zstd.patch diff --git a/srcpkgs/wireshark/patches/rcc-zstd.patch b/srcpkgs/wireshark/patches/rcc-zstd.patch new file mode 100644 index 0000000000..f7fbe4d8bd --- /dev/null +++ b/srcpkgs/wireshark/patches/rcc-zstd.patch @@ -0,0 +1,17 @@ +# reason: +# since bebf09a3b33b72027a0a0601f2b331d524630ad6 qt5-rcc defaults to +# zstd compression which is unsupprted for format-version<3 +# see: https://travis-ci.org/Piraty/void-packages/jobs/562765059#L5398-L5411 +# upstream: no + +--- ui/qt/CMakeLists.txt ++++ ui/qt/CMakeLists.txt +@@ -601,7 +601,7 @@ + # so this has no unwanted side effects. This mtime started appearing in + # Qt 5.8. The option to force the old file format without mtime was + # added in Qt 5.9. See https://bugreports.qt.io/browse/QTBUG-58769 +- set(CMAKE_AUTORCC_OPTIONS --format-version 1) ++ set(CMAKE_AUTORCC_OPTIONS --format-version 1 --compress-algo zlib) + endif() + + QT5_ADD_TRANSLATION(WIRESHARK_QT_QM ${WIRESHARK_QT_TS}) diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index cfd8c874e5..ce21774b8b 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,6 +1,6 @@ # Template file for 'wireshark' pkgname=wireshark -version=3.0.2 +version=3.0.3 revision=1 build_style=cmake hostmakedepends="pkg-config flex perl python3-devel mit-krb5-devel qt5-tools @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.wireshark.org" distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.xz" -checksum=7e1ec5664a0dba4493d8729f9922378bdd05040fb159c2b03b42111efda2e53b +checksum=af92729c781d870110885c31ebcbe4c4224ed51bb580d00c896fe9746994211c system_groups="wireshark" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"