wireshark: update to 4.2.2.

common/shlibs

@@ -1550,9 +1550,6 @@ 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.13 libwireshark-4.0.0_1
-libwireshark.so.16 libwireshark-4.0.0_1
-libwsutil.so.14 libwireshark-4.0.0_1
 libKPim5ContactEditor.so.5 akonadi-contacts-23.04.0_1
 libKPim5AkonadiContact.so.5 akonadi-contacts-23.04.0_1
 libKF5Prison.so.5 prison-5.43.0_1

srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch

@@ -1,35 +0,0 @@
---- a/ConfigureChecks.cmake	2021-12-29 13:12:48.000000000 -0600
-+++ b/ConfigureChecks.cmake	2022-01-06 06:45:07.907628761 -0600
-@@ -104,32 +104,6 @@
- check_symbol_exists(tzname "time.h" HAVE_TZNAME)
- 
- #
--# Check if the libc vsnprintf() conforms to C99. If this fails we may
--# need to fall-back on GLib I/O.
--#
--check_c_source_runs("
--	#include <stdio.h>
--	int main(void)
--	{
--		/* Check that snprintf() and vsnprintf() don't return
--		 * -1 if the buffer is too small. C99 says this value
--		 * is the length that would be written not including
--		 * the nul byte. */
--		char buf[3];
--		return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1;
--	}"
--	HAVE_C99_VSNPRINTF
--)
--if (NOT HAVE_C99_VSNPRINTF)
--	message(FATAL_ERROR
--"Building Wireshark requires a C99 compliant vsnprintf() and this \
--target does not meet that requirement. Compiling for ${CMAKE_SYSTEM} \
--using ${CMAKE_C_COMPILER_ID}. Please report this issue to the Wireshark \
--developers at wireshark-dev@wireshark.org."
--	)
--endif()
--
--#
- # *If* we found libnl, check if we can use nl80211 stuff with it.
- #
- if (NL_FOUND)

srcpkgs/wireshark/patches/cross.patch

@@ -1,41 +0,0 @@
-Source: Johannes (@jnbr)
-Upstream: no
-
---- a/tools/lemon/CMakeLists.txt	2019-02-28 18:56:38.000000000 +0100
-+++ b/tools/lemon/CMakeLists.txt	2019-03-11 20:41:14.211616335 +0100
-@@ -7,6 +7,14 @@
- # SPDX-License-Identifier: GPL-2.0-or-later
- #
-
-+if(CMAKE_CROSSCOMPILING)
-+	add_custom_target(
-+		lemon
-+		COMMAND $ENV{CC_FOR_BUILD} -o ${EXECUTABLE_OUTPUT_PATH}/lemon ${CMAKE_CURRENT_SOURCE_DIR}/lemon.c
-+		COMMENT "generate lemon for host"
-+	)
-+else()
-+
- add_executable(lemon lemon.c)
-
- # To keep lemon.c as close to upstream as possible, deliberately ignore
-@@ -62,6 +70,7 @@
- endif()
- target_compile_options(lemon PRIVATE ${lemon_cflags})
-
-+endif() # CMAKE_CROSSCOMPILING
- #
- # Editor modelines  -  https://www.wireshark.org/tools/modelines.html
- #
-
---- a/cmake/modules/UseLemon.cmake	2019-02-28 18:56:38.000000000 +0100
-+++ b/cmake/modules/UseLemon.cmake	2019-03-11 21:19:28.352163076 +0100
-@@ -13,7 +13,7 @@
-           # These files are generated as side-effect
-           ${_out}.h
-           ${_out}.out
--         COMMAND $<TARGET_FILE:lemon>
-+         COMMAND ${EXECUTABLE_OUTPUT_PATH}/lemon
-            -T${_lemonpardir}/lempar.c
-            -d.
-            ${_in}
-

srcpkgs/wireshark/patches/install-pkgconfig.patch

@@ -0,0 +1,32 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3981,7 +3981,6 @@ set(SHARK_PUBLIC_HEADERS
+ install(FILES ${SHARK_PUBLIC_HEADERS}
+ 	DESTINATION ${PROJECT_INSTALL_INCLUDEDIR}
+ 	COMPONENT "Development"
+-	EXCLUDE_FROM_ALL
+ )
+ 
+ # Install icons and other desktop files for Freedesktop.org-compliant desktops.
+@@ -4039,7 +4038,6 @@ install(
+ 		${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ 	COMPONENT
+ 		"Development"
+-	EXCLUDE_FROM_ALL
+ )
+ 
+ install(
+@@ -4093,13 +4091,11 @@ install(
+ 		${WIRESHARK_INSTALL_CMAKEDIR}
+ 	COMPONENT
+ 		"Development"
+-	EXCLUDE_FROM_ALL
+ )
+ 
+ install(EXPORT WiresharkTargets
+ 	DESTINATION ${WIRESHARK_INSTALL_CMAKEDIR}
+ 	COMPONENT "Development"
+-	EXCLUDE_FROM_ALL
+ )
+ 
+ # This isn't strictly needed but it makes working around debhelper's

srcpkgs/wireshark/template

@@ -1,23 +1,26 @@
 # Template file for 'wireshark'
 pkgname=wireshark
-version=4.0.6
+version=4.2.2
 revision=1
 build_style=cmake
+configure_args="-DHAVE_C99_VSNPRINTF=ON"
 hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel
-qt5-tools qt5-host-tools qt5-qmake ruby-asciidoctor"
+ qt6-base qt6-tools ruby-asciidoctor libxslt sqlite-lemon"
 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
+ libmaxminddb-devel libgcrypt-devel libcap-devel sbc-devel c-ares-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
+ libxml2-devel nghttp2-devel
+ qt6-base-devel qt6-multimedia-devel qt6-svg-devel qt6-qt5compat-devel
  minizip-devel libzstd-devel brotli-devel speexdsp-devel pcre2-devel"
-depends="libcap-progs"
+depends="libcap-progs qt6-svg"
+checkdepends="python3-pytest-xdist"
 short_desc="Network protocol analyzer"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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=0079097a1b17ebc7250a73563f984c13327dac5016b7d53165810fbcca4bd884
+checksum=9e3672be8c6caf9279a5a13582d6711ab699ae2a79323e92a99409c1ead98521
 system_groups="wireshark"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
@@ -33,26 +36,6 @@ pre_check() {
 	ninja -C build test-programs
 }
 
-if [ "${XBPS_ALLOW_CHROOT_BREAKOUT}" = "yes" ]; then
-do_check() {
-	# Many tests fail when run as root (i.e. in CI)
-	test/test.py --disable-capture -p build/run \
-		suite_decryption \
-		suite_dissectors.group_asterix \
-		suite_extcaps \
-		suite_fileformats \
-		suite_follow \
-		suite_follow_dccp \
-		suite_follow_multistream \
-		suite_io \
-		suite_mergecap \
-		suite_netperfmeter \
-		suite_release \
-		suite_text2pcap \
-		suite_unittests
-}
-fi
-
 post_install() {
 	rm -f -- "${DESTDIR}/usr/bin/lemon"
 	rm -f -- "${DESTDIR}/usr/lib/wireshark/cmake/UseLemon.cmake"
@@ -84,7 +67,7 @@ libwireshark-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/lib/wireshark/cmake
+		vmove usr/lib/cmake/wireshark
 	}
 }