diff --git a/x11-packages/wireshark-qt/build.sh b/x11-packages/wireshark-qt/build.sh index 0219876dc6c50a..26ef5729ed38f4 100644 --- a/x11-packages/wireshark-qt/build.sh +++ b/x11-packages/wireshark-qt/build.sh @@ -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" diff --git a/x11-packages/wireshark-qt/no-qt-accessibility.patch b/x11-packages/wireshark-qt/no-qt-accessibility.patch deleted file mode 100644 index d6a7e6d770048c..00000000000000 --- a/x11-packages/wireshark-qt/no-qt-accessibility.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- a/ui/qt/byte_view_tab.cpp -+++ b/ui/qt/byte_view_tab.cpp -@@ -36,7 +36,9 @@ - edt_(edt_fixed), - disable_hover_(false) - { -+#ifndef QT_NO_ACCESSIBILITY - setAccessibleName(tr("Packet bytes")); -+#endif - setTabPosition(QTabWidget::South); - setDocumentMode(true); - -@@ -104,7 +106,9 @@ - } - - ByteViewText * byte_view_text = new ByteViewText(data, encoding, this); -+#ifndef QT_NO_ACCESSIBILITY - byte_view_text->setAccessibleName(name); -+#endif - byte_view_text->setMonospaceFont(mainApp->monospaceFont(true)); - - if (tvb) ---- a/ui/qt/packet_diagram.cpp -+++ b/ui/qt/packet_diagram.cpp -@@ -352,7 +352,9 @@ - selected_field_(nullptr), - y_pos_(0) - { -+#ifndef QT_NO_ACCESSIBILITY - setAccessibleName(tr("Packet diagram")); -+#endif - - setRenderHint(QPainter::Antialiasing); - ---- a/ui/qt/packet_list.cpp -+++ b/ui/qt/packet_list.cpp -@@ -212,7 +212,9 @@ - setRootIsDecorated(false); - setSortingEnabled(prefs.gui_packet_list_sortable); - setUniformRowHeights(true); -+#ifndef QT_NO_ACCESSIBILITY - setAccessibleName("Packet list"); -+#endif - - proto_prefs_menus_.setTitle(tr("Protocol Preferences")); - ---- a/ui/qt/proto_tree.cpp -+++ b/ui/qt/proto_tree.cpp -@@ -54,7 +54,9 @@ - cap_file_(NULL), - edt_(edt_fixed) - { -+#ifndef QT_NO_ACCESSIBILITY - setAccessibleName(tr("Packet details")); -+#endif - // Leave the uniformRowHeights property as-is (false) since items might - // have multiple lines (e.g. packet comments). If this slows things down - // too much we should add a custom delegate which handles SizeHintRole ---- a/ui/qt/widgets/capture_filter_combo.cpp -+++ b/ui/qt/widgets/capture_filter_combo.cpp -@@ -35,7 +35,9 @@ - // Default is Preferred. - setSizePolicy(QSizePolicy::MinimumExpanding, sizePolicy().verticalPolicy()); - setInsertPolicy(QComboBox::NoInsert); -+#ifndef QT_NO_ACCESSIBILITY - setAccessibleName(tr("Capture filter selector")); -+#endif - updateStyleSheet(); - - connect(this, &CaptureFilterCombo::interfacesChanged, cf_edit_, ---- a/ui/qt/widgets/capture_filter_edit.cpp -+++ b/ui/qt/widgets/capture_filter_edit.cpp -@@ -124,7 +124,9 @@ - clear_button_(NULL), - apply_button_(NULL) - { -+#ifndef QT_NO_ACCESSIBILITY - setAccessibleName(tr("Capture filter entry")); -+#endif - - completion_model_ = new QStringListModel(this); - setCompleter(new QCompleter(completion_model_, this)); ---- a/ui/qt/widgets/display_filter_combo.cpp -+++ b/ui/qt/widgets/display_filter_combo.cpp -@@ -43,7 +43,9 @@ - setInsertPolicy(QComboBox::NoInsert); - // Default is Preferred. - setSizePolicy(QSizePolicy::MinimumExpanding, sizePolicy().verticalPolicy()); -+#ifndef QT_NO_ACCESSIBILITY - setAccessibleName(tr("Display filter selector")); -+#endif - cur_display_filter_combo = this; - updateStyleSheet(); - setToolTip(tr("Select from previously used filters.")); ---- a/ui/qt/widgets/display_filter_edit.cpp -+++ b/ui/qt/widgets/display_filter_edit.cpp -@@ -73,7 +73,9 @@ - leftAlignActions_(false), - last_applied_(QString()) - { -+#ifndef QT_NO_ACCESSIBILITY - setAccessibleName(tr("Display filter entry")); -+#endif - - completion_model_ = new QStringListModel(this); - setCompleter(new QCompleter(completion_model_, this)); ---- a/ui/qt/widgets/field_filter_edit.cpp -+++ b/ui/qt/widgets/field_filter_edit.cpp -@@ -48,7 +48,9 @@ - FieldFilterEdit::FieldFilterEdit(QWidget *parent) : - SyntaxLineEdit(parent) - { -+#ifndef QT_NO_ACCESSIBILITY - setAccessibleName(tr("Display filter entry")); -+#endif - - completion_model_ = new QStringListModel(this); - setCompleter(new QCompleter(completion_model_, this)); diff --git a/x11-packages/wireshark-qt/tools-lemon-CMakeLists.txt.patch b/x11-packages/wireshark-qt/tools-lemon-CMakeLists.txt.patch new file mode 100644 index 00000000000000..24e285cdb97702 --- /dev/null +++ b/x11-packages/wireshark-qt/tools-lemon-CMakeLists.txt.patch @@ -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()