From d7a53eb6c443bcc9002fb19f581285e2be80b784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 4 Jan 2025 10:40:48 +0700 Subject: [PATCH] wireshark: update to 4.4.2. --- srcpkgs/wireshark/patches/install-pkgconfig.patch | 12 ++++++------ srcpkgs/wireshark/template | 13 +++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/srcpkgs/wireshark/patches/install-pkgconfig.patch b/srcpkgs/wireshark/patches/install-pkgconfig.patch index 8816155aa52..da49323be19 100644 --- a/srcpkgs/wireshark/patches/install-pkgconfig.patch +++ b/srcpkgs/wireshark/patches/install-pkgconfig.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -3981,7 +3981,6 @@ set(SHARK_PUBLIC_HEADERS +@@ -4126,7 +4126,6 @@ set(SHARK_PUBLIC_HEADERS install(FILES ${SHARK_PUBLIC_HEADERS} DESTINATION ${PROJECT_INSTALL_INCLUDEDIR} COMPONENT "Development" @@ -8,15 +8,15 @@ ) # Install icons and other desktop files for Freedesktop.org-compliant desktops. -@@ -4039,7 +4038,6 @@ install( - ${CMAKE_INSTALL_LIBDIR}/pkgconfig - COMPONENT - "Development" +@@ -4180,7 +4179,6 @@ endif() + install(FILES "${CMAKE_BINARY_DIR}/resources/wireshark.pc" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + COMPONENT "Development" - EXCLUDE_FROM_ALL ) install( -@@ -4093,13 +4091,11 @@ install( +@@ -4254,13 +4252,11 @@ install( ${WIRESHARK_INSTALL_CMAKEDIR} COMPONENT "Development" diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index 48f953b7e04..d31559ad7eb 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,15 +1,16 @@ # Template file for 'wireshark' pkgname=wireshark -version=4.2.6 +version=4.4.2 revision=1 build_style=cmake configure_args="-DHAVE_C99_VSNPRINTF=ON" hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel qt6-base qt6-tools ruby-asciidoctor libxslt sqlite-lemon" -makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel +makedepends="libpcap-devel zlib-devel lua54-devel mit-krb5-devel gnutls-devel libmaxminddb-devel libgcrypt-devel libcap-devel sbc-devel c-ares-devel libssh-devel libnl3-devel spandsp-devel tiff-devel libcap-progs liblz4-devel - libxml2-devel nghttp2-devel + libxml2-devel nghttp2-devel nghttp3-devel snappy-devel opus-devel + bcg729-devel libilbc-devel opencore-amr-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 qt6-svg" @@ -20,11 +21,11 @@ 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=5ec6028df29068d889c98489bf194a884b00831106fea1e921fea3c65f2003f5 +checksum=6053d97499c83feb87ce1d7f732d9c889c6c18bb334de67e65dca11483b0514e system_groups="wireshark" -CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" -CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" +CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.4" +CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.4" post_patch() { # systemd-journal integration