Skip to content

Commit

Permalink
bump(x11/wireshark-qt): 4.4.1
Browse files Browse the repository at this point in the history
This transitions from Qt5 to Qt6.
  • Loading branch information
fornwall committed Oct 23, 2024
1 parent 0481f38 commit 0c3f58b
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 123 deletions.
9 changes: 4 additions & 5 deletions x11-packages/wireshark-qt/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://www.wireshark.org/
TERMUX_PKG_DESCRIPTION="Network protocol analyzer"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=4.0.6
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=4.4.1
TERMUX_PKG_SRCURL=https://www.wireshark.org/download/src/all-versions/wireshark-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=0079097a1b17ebc7250a73563f984c13327dac5016b7d53165810fbcca4bd884
TERMUX_PKG_DEPENDS="brotli, c-ares, glib, krb5, libandroid-support, libc++, libgcrypt, libgnutls, liblua52, liblz4, libmaxminddb, libminizip, libnghttp2, libnl, libopus, libpcap, libsnappy, libssh, libxml2, pcre2, qt5-qtbase, qt5-qtmultimedia, speexdsp, zlib, zstd"
TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools, qt5-qttools-cross-tools"
TERMUX_PKG_SHA256=2b9e96572a7002c3e53b79683cf92f8172217e64c17ecaaf612eb68c2a7556ec
TERMUX_PKG_DEPENDS="brotli, c-ares, glib, krb5, libandroid-support, libc++, libgcrypt, libgnutls, liblua52, liblz4, libmaxminddb, libminizip, libnghttp2, libnl, libopus, libpcap, libsnappy, libssh, libxml2, pcre2, qt6-qtbase, qt6-qtmultimedia, qt6-qt5compat, speexdsp, zlib, zstd"
TERMUX_PKG_BUILD_DEPENDS="qt6-qtbase-cross-tools, qt6-qttools-cross-tools"
TERMUX_PKG_CONFLICTS="tshark, wireshark, wireshark-cli, wireshark-gtk"
TERMUX_PKG_PROVIDES="tshark, wireshark, wireshark-cli, wireshark-gtk"
TERMUX_PKG_REPLACES="tshark, wireshark, wireshark-cli, wireshark-gtk"
Expand Down
118 changes: 0 additions & 118 deletions x11-packages/wireshark-qt/no-qt-accessibility.patch

This file was deleted.

15 changes: 15 additions & 0 deletions x11-packages/wireshark-qt/tools-lemon-CMakeLists.txt.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff -u -r ../wireshark-4.4.1/tools/lemon/CMakeLists.txt ./tools/lemon/CMakeLists.txt
--- ../wireshark-4.4.1/tools/lemon/CMakeLists.txt 2024-10-09 18:08:09.000000000 +0000
+++ ./tools/lemon/CMakeLists.txt 2024-10-22 21:01:45.426873365 +0000
@@ -22,11 +22,6 @@
else()
target_compile_options(lemon PRIVATE -w)
endif()
-if(CMAKE_C_COMPILER_ID MATCHES "Clang")
- # Disable static analysis for lemon source code. These issues don't
- # affect Wireshark at runtime.
- target_compile_options(lemon PRIVATE -Xclang -analyzer-disable-all-checks)
-endif()
if(DEFINED NO_SANITIZE_CFLAGS)
target_compile_options(lemon PRIVATE ${NO_SANITIZE_CFLAGS})
endif()

0 comments on commit 0c3f58b

Please sign in to comment.