commit: 4daaba9661d58b50c31e2305840dbb6d3020ea52 Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Mon Feb 9 13:41:19 2026 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Mon Feb 9 13:41:19 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4daaba96
net-analyzer/wireshark: remove unused patches Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> ...fix-skipping-rawshark-tests-on-big-endian.patch | 40 --------------- .../wireshark/files/4.4.6-return-from-main.patch | 59 ---------------------- 2 files changed, 99 deletions(-) diff --git a/net-analyzer/wireshark/files/4.4.4-fix-skipping-rawshark-tests-on-big-endian.patch b/net-analyzer/wireshark/files/4.4.4-fix-skipping-rawshark-tests-on-big-endian.patch deleted file mode 100644 index e1350e5ec7ca..000000000000 --- a/net-analyzer/wireshark/files/4.4.4-fix-skipping-rawshark-tests-on-big-endian.patch +++ /dev/null @@ -1,40 +0,0 @@ - -Patch from: -https://gitlab.com/wireshark/wireshark/-/commit/91cfd6d16d6f57c765d6708808673a2ac16eaa9d - -From 91cfd6d16d6f57c765d6708808673a2ac16eaa9d Mon Sep 17 00:00:00 2001 -From: John Thacker <[email protected]> -Date: Fri, 24 Jan 2025 18:38:23 -0500 -Subject: [PATCH] test: Fix skipping Rawshark tests on Big Endian - -pytest.skip can't be used at the class scope, only inside a test. -At the class level the decorator should be used instead. -See the warning in the Debian s390x builds: -https://buildd.debian.org/status/fetch.php?pkg=wireshark&arch=s390x&ver=4.4.3-1&stamp=1736436117&raw=0 - -None of Rawshark is going to work on Big Endian, so change it to -a decorator for the class instead of moving it inside the test. - -Ping #19965 ---- - test/suite_io.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/test/suite_io.py b/test/suite_io.py -index 4376d1b1fb9..e7b8cec4858 100644 ---- a/test/suite_io.py -+++ b/test/suite_io.py -@@ -68,9 +68,8 @@ class TestTsharkIO: - check_io_4_packets(capture_file, result_file, cmd_tshark, cmd_capinfos, env=test_env) - - [email protected](sys.byteorder != 'little', reason='Requires a little endian system') - class TestRawsharkIO: -- if sys.byteorder != 'little': -- pytest.skip('Requires a little endian system') - def test_rawshark_io_stdin(self, cmd_rawshark, capture_file, result_file, io_baseline_str, test_env): - '''Read from stdin using Rawshark''' - # tail -c +25 "${CAPTURE_DIR}dhcp.pcap" | $RAWSHARK -dencap:1 -R "udp.port==68" -nr - > $IO_RAWSHARK_DHCP_PCAP_TESTOUT 2> /dev/null --- -GitLab - diff --git a/net-analyzer/wireshark/files/4.4.6-return-from-main.patch b/net-analyzer/wireshark/files/4.4.6-return-from-main.patch deleted file mode 100644 index 8e523a98c12b..000000000000 --- a/net-analyzer/wireshark/files/4.4.6-return-from-main.patch +++ /dev/null @@ -1,59 +0,0 @@ -Patch from: https://gitlab.com/wireshark/wireshark/-/commit/b4d6d76c6eba2da7f8df55c328607fe651037c03 -Removed hunk #2 which was for Stratoshark. - -From b4d6d76c6eba2da7f8df55c328607fe651037c03 Mon Sep 17 00:00:00 2001 -From: John Thacker <[email protected]> -Date: Sat, 22 Feb 2025 10:19:36 -0500 -Subject: [PATCH] Qt: Return from main instead of calling exit_application - -If the main event loop isn't running (and it can't be if we reach the -clean_exit label in main()), then exit_application just calls stdlib -exit. Returning from main does the same thing, execept the QApplication -(function scoped) will be destroyed first. That's better for dealing -with KDE Breeze mixing thread_local and QThreadStorage and having -deleteLater. It ensures that objects get deleted before all the -thread_local storage is destroyed. - -I can't replicate #14395 after this change, including by putting in -the extra goto clean_exit mentioned in that issue's comments, on -Qt 5.15, Qt 6, and different OSes. - -Fix #20370 ---- - ui/qt/main.cpp | 14 +++++++++++++- - ui/stratoshark/stratoshark_main.cpp | 2 +- - 2 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp -index e73496d4017..6d22ca43cc9 100644 ---- a/ui/qt/main.cpp -+++ b/ui/qt/main.cpp -@@ -117,9 +117,21 @@ void main_window_update(void) - } - - void exit_application(int status) { -+ // It's generally better to return from main. If the event loop is -+ // running (or has already stopped), wsApp->quit will cause the app -+ // to do so. (So we wouldn't need to call stdlib exit.) If it's not -+ // yet running, e.g., failure parsing options in ui/commandline.c, -+ // it's would be cleaner to return back to main and exit from there, -+ // especially if wsApp has been created. - if (wsApp) { -+ // wsApp->quit() is a no-op if the event loop isn't running -+ // (That was not true in some earlier versions of Qt.) -+ // wsApp->exit(status) is not thread safe, though it may be possible to call -+ //QMetaObject::invokeMethod(wsApp, "exit", Qt::QueuedConnection, status); -+ // or similar, e.g. with a QTimer - wsApp->quit(); - } -+ // Calling stdlib exit here does not call the wsApp destructor. - exit(status); - } - -@@ -1128,5 +1140,5 @@ clean_exit: - wtap_cleanup(); - free_progdirs(); - commandline_options_free(); -- exit_application(ret_val); -+ return ret_val; - }
