From a6397cc6db96b5492f43d343935bf19d1325c59e Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 6 Oct 2022 12:52:38 +0200 Subject: [PATCH] wireshark: update to 4.0.0. Close: #39761 --- common/shlibs | 6 +++--- srcpkgs/wireshark/patches/rcc-zstd.patch | 17 ----------------- srcpkgs/wireshark/template | 15 ++++++--------- 3 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/wireshark/patches/rcc-zstd.patch diff --git a/common/shlibs b/common/shlibs index 26410ed4f6fb..c43b8a5e9fd6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1577,9 +1577,9 @@ libdovecot-compression.so.0 dovecot-2.3.13_3 libdovecot-sql.so.0 dovecot-2.3.13_3 libdovecot-storage.so.0 dovecot-2.3.13_3 libdovecot-lda.so.0 dovecot-2.3.13_3 -libwiretap.so.12 libwireshark-3.6.3_1 -libwireshark.so.15 libwireshark-3.6.3_1 -libwsutil.so.13 libwireshark-3.6.3_1 +libwiretap.so.13 libwireshark-4.0.0_1 +libwireshark.so.16 libwireshark-4.0.0_1 +libwsutil.so.14 libwireshark-4.0.0_1 libKF5ContactEditor.so.5 akonadi-contacts-17.12.1_1 libKF5AkonadiContact.so.5 akonadi-contacts-17.12.1_1 libKF5Prison.so.5 prison-5.43.0_1 diff --git a/srcpkgs/wireshark/patches/rcc-zstd.patch b/srcpkgs/wireshark/patches/rcc-zstd.patch deleted file mode 100644 index 4a94e890a826..000000000000 --- a/srcpkgs/wireshark/patches/rcc-zstd.patch +++ /dev/null @@ -1,17 +0,0 @@ -# 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 - ---- a/ui/qt/CMakeLists.txt -+++ b/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 28adc9aadaae..7338d88ecbd3 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,6 +1,6 @@ # Template file for 'wireshark' pkgname=wireshark -version=3.6.6 +version=4.0.0 revision=1 build_style=cmake hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel @@ -9,18 +9,19 @@ makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel libmaxminddb-devel libgcrypt-devel libcap-devel sbc-devel c-ares-devel libxml2-devel libssh-devel libnl3-devel spandsp-devel tiff-devel libcap-progs liblz4-devel nghttp2-devel qt5-devel qt5-tools-devel qt5-multimedia-devel qt5-svg-devel - minizip-devel libzstd-devel brotli-devel speexdsp-devel" + minizip-devel libzstd-devel brotli-devel speexdsp-devel pcre2-devel" depends="libcap-progs" short_desc="Network protocol analyzer" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.wireshark.org" +changelog="https://www.wireshark.org/news/" distfiles="https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz" -checksum=beba27aeb4d3bb78df6202e88dda69e1dba9b0561044957bcac47e68b6ac28ba +checksum=3dc125ef85e85c2a756a74cc739b3eb11ce38e30a08e085e77d378ee7fdcaded system_groups="wireshark" -CFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2" -CXXFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2" +CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" +CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" post_patch() { # systemd-journal integration @@ -58,10 +59,6 @@ post_install() { local _includeDir=usr/include/wireshark - # Headers - vmkdir $_includeDir - vcopy ws_symbol_export.h $_includeDir - for i in wiretap wsutil; do vmkdir $_includeDir/$i vcopy "$i/*.h" $_includeDir/$i