wireshark: replace incomplete fix for Glib2 fallout with upstream patch

15 files changed, 288 insertions, 19 deletions

diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 19471abe628..bcde29d6d63 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,13 +1,21 @@
-$NetBSD: distinfo,v 1.140 2021/03/23 10:48:41 adam Exp $
+$NetBSD: distinfo,v 1.141 2021/04/06 10:13:32 tnn Exp $
 
 SHA1 (wireshark-3.4.4.tar.xz) = fa5c553596dcc6a59735f96a9a0845e3c40abab2
 RMD160 (wireshark-3.4.4.tar.xz) = 677c151b94af472ae3ae390e51781ec0cc371ddd
 SHA512 (wireshark-3.4.4.tar.xz) = 388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172
 Size (wireshark-3.4.4.tar.xz) = 32290424 bytes
 SHA1 (patch-CMakeLists.txt) = 8faf8f63d75d5733a69b52ce9fbf291bd90a5575
-SHA1 (patch-caputils_capture__ifinfo.h) = 8eef1414274fae7a374776c2533343bf02ca114e
-SHA1 (patch-epan_conversation.h) = b3cdd98602570cbcb33b35e9362ff8802753edd8
-SHA1 (patch-epan_epan.h) = 869211117930b4a246f9bd1f199e3a201fdc39e3
-SHA1 (patch-epan_epan__dissect.h) = 9fe4d59c38786c1981ada2dc356f0d01a0703bf0
-SHA1 (patch-epan_prefs.h) = 4678aaaee9ea9e481b3d38f5bc491a86f7c0a75b
-SHA1 (patch-ui_recent.h) = 3358ba7d6a292741d34274db9fb86c02541c861f
+SHA1 (patch-caputils_capture__ifinfo.h) = adb4c22accb41b3ac402b458be4efaa258abd4b8
+SHA1 (patch-epan_dissectors_dissectors.h) = 9a31c52fbbb97bf44444583a2b787243fbbf74b6
+SHA1 (patch-epan_epan.h) = 6bcd31b572a763092454be57a49c522cbba6824b
+SHA1 (patch-epan_prefs.h) = bdb744b3f96ed6965576316bcde121694f0de947
+SHA1 (patch-epan_value__string.h) = b3ffb1931a1e47c664fc50bcd121ec2880ce05ea
+SHA1 (patch-epan_wmem_wmem__user__cb__int.h) = d7a1f31771244521de3291b3a360e34bf47f6fe5
+SHA1 (patch-ui_packet__range.h) = c2dafea7fdebc15e46782e02dce32a00e3f32c98
+SHA1 (patch-ui_recent.h) = ce8769e82c8a90feed044ca31e363349b02bafcb
+SHA1 (patch-ui_rtp__media.h) = 355f9009107bde38537303cf18c03e2c7017587f
+SHA1 (patch-ui_rtp__stream.h) = ad756a7dff9fcfc637401f4bde0cff05bad87d62
+SHA1 (patch-ui_taps.h) = d8ad1f7568b06bfd55bb8c43303ed6782fba319e
+SHA1 (patch-ui_voip__calls.h) = 516ced815808d25574553de807b12ba08501b328
+SHA1 (patch-wsutil_file__util.h) = 06b284f1626dd1f1eca751f0e2113dacb1123b29
+SHA1 (patch-wsutil_plugins.h) = b663efdc7f78cd6b268321d7b7445585f7119b13
diff --git a/net/wireshark/patches/patch-caputils_capture__ifinfo.h b/net/wireshark/patches/patch-caputils_capture__ifinfo.h
index fa7a8d7dc58..1ec9b756744 100644
--- a/net/wireshark/patches/patch-caputils_capture__ifinfo.h
+++ b/net/wireshark/patches/patch-caputils_capture__ifinfo.h
@@ -1,8 +1,11 @@
-$NetBSD: patch-caputils_capture__ifinfo.h,v 1.1 2021/03/23 10:48:42 adam Exp $
+$NetBSD: patch-caputils_capture__ifinfo.h,v 1.2 2021/04/06 10:13:32 tnn Exp $
 
-Fix building with Glib 2.68.
+From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalruprich@gmail.com>
+Date: Wed, 10 Feb 2021 15:32:18 +0100
+Subject: [PATCH] Moving glib.h out of extern C
 
---- caputils/capture_ifinfo.h.orig	2021-03-23 09:25:20.000000000 +0000
+--- caputils/capture_ifinfo.h.orig	2021-03-10 18:21:20.000000000 +0000
 +++ caputils/capture_ifinfo.h
 @@ -11,12 +11,12 @@
  #ifndef __CAPTURE_IFINFO_H__
diff --git a/net/wireshark/patches/patch-epan_dissectors_dissectors.h b/net/wireshark/patches/patch-epan_dissectors_dissectors.h
new file mode 100644
index 00000000000..c28977b6f9e
--- /dev/null
+++ b/net/wireshark/patches/patch-epan_dissectors_dissectors.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-epan_dissectors_dissectors.h,v 1.1 2021/04/06 10:13:32 tnn Exp $
+
+From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalruprich@gmail.com>
+Date: Wed, 10 Feb 2021 15:32:18 +0100
+Subject: [PATCH] Moving glib.h out of extern C
+
+--- epan/dissectors/dissectors.h.orig	2021-03-10 18:21:20.000000000 +0000
++++ epan/dissectors/dissectors.h
+@@ -11,12 +11,12 @@
+ #ifndef __DISSECTOR_REGISTER_H__
+ #define __DISSECTOR_REGISTER_H__
+ 
++#include <glib.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+ 
+-#include <glib.h>
+-
+ typedef struct _dissector_reg {
+     const char *cb_name;
+     void (*cb_func)(void);
diff --git a/net/wireshark/patches/patch-epan_epan.h b/net/wireshark/patches/patch-epan_epan.h
index bc2e467b463..656f944dbe9 100644
--- a/net/wireshark/patches/patch-epan_epan.h
+++ b/net/wireshark/patches/patch-epan_epan.h
@@ -1,8 +1,11 @@
-$NetBSD: patch-epan_epan.h,v 1.1 2021/03/23 10:48:42 adam Exp $
+$NetBSD: patch-epan_epan.h,v 1.2 2021/04/06 10:13:32 tnn Exp $
 
-Fix building with Glib 2.68.
+From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalruprich@gmail.com>
+Date: Wed, 10 Feb 2021 15:32:18 +0100
+Subject: [PATCH] Moving glib.h out of extern C
 
---- epan/epan.h.orig	2021-03-23 09:17:20.000000000 +0000
+--- epan/epan.h.orig	2021-03-10 18:21:20.000000000 +0000
 +++ epan/epan.h
 @@ -10,11 +10,12 @@
  #ifndef __EPAN_H__
diff --git a/net/wireshark/patches/patch-epan_prefs.h b/net/wireshark/patches/patch-epan_prefs.h
index 6d67ae8b5f0..4caaa8c3a2a 100644
--- a/net/wireshark/patches/patch-epan_prefs.h
+++ b/net/wireshark/patches/patch-epan_prefs.h
@@ -1,8 +1,11 @@
-$NetBSD: patch-epan_prefs.h,v 1.1 2021/03/23 10:48:42 adam Exp $
+$NetBSD: patch-epan_prefs.h,v 1.2 2021/04/06 10:13:32 tnn Exp $
 
-Fix building with Glib 2.68.
+From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalruprich@gmail.com>
+Date: Wed, 10 Feb 2021 15:32:18 +0100
+Subject: [PATCH] Moving glib.h out of extern C
 
---- epan/prefs.h.orig	2021-03-23 08:55:05.000000000 +0000
+--- epan/prefs.h.orig	2021-03-10 18:21:20.000000000 +0000
 +++ epan/prefs.h
 @@ -11,12 +11,12 @@
  #ifndef __PREFS_H__
diff --git a/net/wireshark/patches/patch-epan_value__string.h b/net/wireshark/patches/patch-epan_value__string.h
new file mode 100644
index 00000000000..53877c7a855
--- /dev/null
+++ b/net/wireshark/patches/patch-epan_value__string.h
@@ -0,0 +1,23 @@
+$NetBSD: patch-epan_value__string.h,v 1.1 2021/04/06 10:13:32 tnn Exp $
+
+From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalruprich@gmail.com>
+Date: Wed, 10 Feb 2021 15:32:18 +0100
+Subject: [PATCH] Moving glib.h out of extern C
+
+--- epan/value_string.h.orig	2021-03-10 18:21:20.000000000 +0000
++++ epan/value_string.h
+@@ -11,11 +11,12 @@
+ #ifndef __VALUE_STRING_H__
+ #define __VALUE_STRING_H__
+ 
++#include <glib.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+ 
+-#include <glib.h>
+ #include "ws_symbol_export.h"
+ #include "wmem/wmem.h"
+ 
diff --git a/net/wireshark/patches/patch-epan_wmem_wmem__user__cb__int.h b/net/wireshark/patches/patch-epan_wmem_wmem__user__cb__int.h
new file mode 100644
index 00000000000..94f9312eaac
--- /dev/null
+++ b/net/wireshark/patches/patch-epan_wmem_wmem__user__cb__int.h
@@ -0,0 +1,23 @@
+$NetBSD: patch-epan_wmem_wmem__user__cb__int.h,v 1.1 2021/04/06 10:13:32 tnn Exp $
+
+From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalruprich@gmail.com>
+Date: Wed, 10 Feb 2021 15:32:18 +0100
+Subject: [PATCH] Moving glib.h out of extern C
+
+--- epan/wmem/wmem_user_cb_int.h.orig	2021-03-10 18:21:20.000000000 +0000
++++ epan/wmem/wmem_user_cb_int.h
+@@ -12,11 +12,12 @@
+ #ifndef __WMEM_USER_CB_INT_H__
+ #define __WMEM_USER_CB_INT_H__
+ 
++#include <glib.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+ 
+-#include <glib.h>
+ #include "wmem_user_cb.h"
+ 
+ WS_DLL_LOCAL
diff --git a/net/wireshark/patches/patch-ui_packet__range.h b/net/wireshark/patches/patch-ui_packet__range.h
new file mode 100644
index 00000000000..9bd073eda13
--- /dev/null
+++ b/net/wireshark/patches/patch-ui_packet__range.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-ui_packet__range.h,v 1.1 2021/04/06 10:13:32 tnn Exp $
+
+From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalruprich@gmail.com>
+Date: Wed, 10 Feb 2021 15:32:18 +0100
+Subject: [PATCH] Moving glib.h out of extern C
+
+--- ui/packet_range.h.orig	2021-03-10 18:21:20.000000000 +0000
++++ ui/packet_range.h
+@@ -14,12 +14,12 @@
+ #ifndef __PACKET_RANGE_H__
+ #define __PACKET_RANGE_H__
+ 
++#include <glib.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+ 
+-#include <glib.h>
+-
+ #include <epan/range.h>
+ #include <epan/frame_data.h>
+ 
diff --git a/net/wireshark/patches/patch-ui_recent.h b/net/wireshark/patches/patch-ui_recent.h
index 59c2a21c226..357589221d3 100644
--- a/net/wireshark/patches/patch-ui_recent.h
+++ b/net/wireshark/patches/patch-ui_recent.h
@@ -1,8 +1,11 @@
-$NetBSD: patch-ui_recent.h,v 1.1 2021/03/23 10:48:42 adam Exp $
+$NetBSD: patch-ui_recent.h,v 1.2 2021/04/06 10:13:32 tnn Exp $
 
-Fix building with Glib 2.68.
+From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalruprich@gmail.com>
+Date: Wed, 10 Feb 2021 15:32:18 +0100
+Subject: [PATCH] Moving glib.h out of extern C
 
---- ui/recent.h.orig	2021-03-23 09:22:16.000000000 +0000
+--- ui/recent.h.orig	2021-03-10 18:21:20.000000000 +0000
 +++ ui/recent.h
 @@ -12,11 +12,12 @@
  #ifndef __RECENT_H__
diff --git a/net/wireshark/patches/patch-ui_rtp__media.h b/net/wireshark/patches/patch-ui_rtp__media.h
new file mode 100644
index 00000000000..ac2b8cb397c
--- /dev/null
+++ b/net/wireshark/patches/patch-ui_rtp__media.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-ui_rtp__media.h,v 1.1 2021/04/06 10:13:32 tnn Exp $
+
+From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalruprich@gmail.com>
+Date: Wed, 10 Feb 2021 15:32:18 +0100
+Subject: [PATCH] Moving glib.h out of extern C
+
+--- ui/rtp_media.h.orig	2021-03-10 18:21:20.000000000 +0000
++++ ui/rtp_media.h
+@@ -15,6 +15,8 @@
+ #ifndef __RTP_MEDIA_H__
+ #define __RTP_MEDIA_H__
+ 
++#include <glib.h>
++
+ /** @file
+  *  "RTP Player" dialog box common routines.
+  *  @ingroup main_ui_group
+@@ -24,8 +26,6 @@
+ extern "C" {
+ #endif /* __cplusplus */
+ 
+-#include <glib.h>
+-
+ /****************************************************************************/
+ /* INTERFACE */
+ /****************************************************************************/
diff --git a/net/wireshark/patches/patch-ui_rtp__stream.h b/net/wireshark/patches/patch-ui_rtp__stream.h
new file mode 100644
index 00000000000..74fb6fb3bbe
--- /dev/null
+++ b/net/wireshark/patches/patch-ui_rtp__stream.h
@@ -0,0 +1,26 @@
+$NetBSD: patch-ui_rtp__stream.h,v 1.1 2021/04/06 10:13:32 tnn Exp $
+
+From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalruprich@gmail.com>
+Date: Wed, 10 Feb 2021 15:32:18 +0100
+Subject: [PATCH] Moving glib.h out of extern C
+
+--- ui/rtp_stream.h.orig	2021-03-10 18:21:20.000000000 +0000
++++ ui/rtp_stream.h
+@@ -14,6 +14,8 @@
+ #ifndef __RTP_STREAM_H__
+ #define __RTP_STREAM_H__
+ 
++#include <glib.h>
++
+ /** @file
+  *  "RTP Streams" dialog box common routines.
+  *  @ingroup main_ui_group
+@@ -24,7 +26,6 @@ extern "C" {
+ #endif /* __cplusplus */
+ 
+ #include "tap-rtp-analysis.h"
+-#include <glib.h>
+ #include <stdio.h>
+ 
+ #include "cfile.h"
diff --git a/net/wireshark/patches/patch-ui_taps.h b/net/wireshark/patches/patch-ui_taps.h
new file mode 100644
index 00000000000..7773f9b5a22
--- /dev/null
+++ b/net/wireshark/patches/patch-ui_taps.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-ui_taps.h,v 1.1 2021/04/06 10:13:32 tnn Exp $
+
+From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalruprich@gmail.com>
+Date: Wed, 10 Feb 2021 15:32:18 +0100
+Subject: [PATCH] Moving glib.h out of extern C
+
+--- ui/taps.h.orig	2021-03-10 18:21:20.000000000 +0000
++++ ui/taps.h
+@@ -11,12 +11,12 @@
+ #ifndef __TAP_REGISTER_H__
+ #define __TAP_REGISTER_H__
+ 
++#include <glib.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+ 
+-#include <glib.h>
+-
+ typedef struct _tap_reg {
+     const char *cb_name;
+     void (*cb_func)(void);
diff --git a/net/wireshark/patches/patch-ui_voip__calls.h b/net/wireshark/patches/patch-ui_voip__calls.h
new file mode 100644
index 00000000000..e0d4717c984
--- /dev/null
+++ b/net/wireshark/patches/patch-ui_voip__calls.h
@@ -0,0 +1,26 @@
+$NetBSD: patch-ui_voip__calls.h,v 1.1 2021/04/06 10:13:32 tnn Exp $
+
+From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalruprich@gmail.com>
+Date: Wed, 10 Feb 2021 15:32:18 +0100
+Subject: [PATCH] Moving glib.h out of extern C
+
+--- ui/voip_calls.h.orig	2021-03-10 18:21:20.000000000 +0000
++++ ui/voip_calls.h
+@@ -22,6 +22,8 @@
+ #ifndef __VOIP_CALLS_H__
+ #define __VOIP_CALLS_H__
+ 
++#include <glib.h>
++
+ /** @file
+  *  "VoIP Calls" dialog box common routines.
+  *  @ingroup main_ui_group
+@@ -31,7 +33,6 @@
+ extern "C" {
+ #endif /* __cplusplus */
+ 
+-#include <glib.h>
+ #include <stdio.h>
+ 
+ #include "epan/address.h"
diff --git a/net/wireshark/patches/patch-wsutil_file__util.h b/net/wireshark/patches/patch-wsutil_file__util.h
new file mode 100644
index 00000000000..7183de0ffa6
--- /dev/null
+++ b/net/wireshark/patches/patch-wsutil_file__util.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-wsutil_file__util.h,v 1.1 2021/04/06 10:13:32 tnn Exp $
+
+From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalruprich@gmail.com>
+Date: Wed, 10 Feb 2021 15:32:18 +0100
+Subject: [PATCH] Moving glib.h out of extern C
+
+--- wsutil/file_util.h.orig	2021-03-10 18:21:20.000000000 +0000
++++ wsutil/file_util.h
+@@ -11,6 +11,8 @@
+ #ifndef __FILE_UTIL_H__
+ #define __FILE_UTIL_H__
+ 
++#include <glib.h>
++
+ #include "config.h"
+ 
+ #include "ws_symbol_export.h"
+@@ -19,8 +21,6 @@
+ extern "C" {
+ #endif /* __cplusplus */
+ 
+-#include <glib.h>
+-
+ #ifdef _WIN32
+ #include <io.h>		/* for _read(), _write(), etc. */
+ #include <gmodule.h>
diff --git a/net/wireshark/patches/patch-wsutil_plugins.h b/net/wireshark/patches/patch-wsutil_plugins.h
new file mode 100644
index 00000000000..78dbb673217
--- /dev/null
+++ b/net/wireshark/patches/patch-wsutil_plugins.h
@@ -0,0 +1,25 @@
+$NetBSD: patch-wsutil_plugins.h,v 1.1 2021/04/06 10:13:32 tnn Exp $
+
+From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalruprich@gmail.com>
+Date: Wed, 10 Feb 2021 15:32:18 +0100
+Subject: [PATCH] Moving glib.h out of extern C
+
+--- wsutil/plugins.h.orig	2021-03-10 18:21:20.000000000 +0000
++++ wsutil/plugins.h
+@@ -11,13 +11,13 @@
+ #ifndef __PLUGINS_H__
+ #define __PLUGINS_H__
+ 
++#include <glib.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+ 
+-#include <glib.h>
+ #include <gmodule.h>
+-
+ #include "ws_symbol_export.h"
+ 
+ typedef void (*plugin_register_func)(void);