update to wireshark-3.2.4

This commit is contained in:
sthen 2020-05-19 22:15:21 +00:00
parent 7a58af3adc
commit 2de0a5b996
3 changed files with 4 additions and 39 deletions

View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.104 2020/04/11 14:17:50 sthen Exp $
# $OpenBSD: Makefile,v 1.105 2020/05/19 22:15:21 sthen Exp $
BROKEN-alpha = .got subsegment exceeds 64K (size 101480)
COMMENT-main = graphical network protocol analyzer, Qt user-interface
COMMENT-text = network protocol analyzer
V = 3.2.3
V = 3.2.4
PORTROACH = limitw:1,even
DISTNAME = wireshark-$V
PKGNAME-main = wireshark-$V
PKGNAME-text = tshark-$V
REVISION-main = 0
SHARED_LIBS += wscodecs 1.0
SHARED_LIBS += wsutil 4.0

View File

@ -1,2 +1,2 @@
SHA256 (wireshark-3.2.3.tar.xz) = 8AfkuIyG2V4zrwPgV+zANjX1RGbQI3G8Jkieq7J0+ro=
SIZE (wireshark-3.2.3.tar.xz) = 31572052
SHA256 (wireshark-3.2.4.tar.xz) = 0X1GHoSeLQsDNDHEX3HY7o7DyPqiMqatYwaaR5J9uKo=
SIZE (wireshark-3.2.4.tar.xz) = 31580440

View File

@ -1,34 +0,0 @@
$OpenBSD: patch-ui_qt_capture_interfaces_dialog_cpp,v 1.3 2020/04/13 08:09:35 sthen Exp $
From 71f6d9411a38a3e98598b4c7b68f3f94917fcb86 Mon Sep 17 00:00:00 2001
From: Dario Lombardo <lomato@gmail.com>
Date: Sun, 12 Apr 2020 00:14:02 +0200
Subject: [PATCH] Qt: don't use a widget if not set.
Bug: 16489
Change-Id: I9585120fb07f3c41ac2ddc7fb9eeb9b17542f5e8
Reviewed-on: https://code.wireshark.org/review/36789
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
ui/qt/capture_options_dialog.cpp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Index: ui/qt/capture_interfaces_dialog.cpp
--- ui/qt/capture_interfaces_dialog.cpp.orig
+++ ui/qt/capture_interfaces_dialog.cpp
@@ -1287,11 +1287,9 @@ QWidget* InterfaceTreeDelegate::createEditor(QWidget *
default:
break;
}
-// if (w) {
-// ti->setSizeHint(index.column(), w->sizeHint());
-// }
}
- w->setAutoFillBackground(true);
+ if (w)
+ w->setAutoFillBackground(true);
return w;
}