From 1250a67e2d29ff7bb2113636777c49ea9096c00cf73ce2b09cd4beb9901e7e0c Mon Sep 17 00:00:00 2001 From: Robert Frohl Date: Mon, 10 Jan 2022 12:30:26 +0000 Subject: [PATCH] Accepting request 945304 from home:rfrohl:branches:network:utilities fix SLE build issue OBS-URL: https://build.opensuse.org/request/show/945304 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=358 --- ...k-0000-wsutil-implicit_declaration_memcpy.patch | 14 ++++++++++++++ wireshark.changes | 6 ++++++ wireshark.spec | 1 + 3 files changed, 21 insertions(+) create mode 100644 wireshark-0000-wsutil-implicit_declaration_memcpy.patch diff --git a/wireshark-0000-wsutil-implicit_declaration_memcpy.patch b/wireshark-0000-wsutil-implicit_declaration_memcpy.patch new file mode 100644 index 0000000..08af8f3 --- /dev/null +++ b/wireshark-0000-wsutil-implicit_declaration_memcpy.patch @@ -0,0 +1,14 @@ +Index: wireshark-3.6.1/wsutil/glib-compat.h +=================================================================== +--- wireshark-3.6.1.orig/wsutil/glib-compat.h ++++ wireshark-3.6.1/wsutil/glib-compat.h +@@ -21,6 +21,9 @@ extern "C" { + #endif /* __cplusplus */ + + #if !GLIB_CHECK_VERSION(2, 68, 0) ++ ++#include ++ + static inline gpointer + g_memdup2(gconstpointer mem, gsize byte_size) + { diff --git a/wireshark.changes b/wireshark.changes index 97dd892..e330f7a 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 10 10:30:10 UTC 2022 - Robert Frohl + +- Fix SLE15 build issue + added wireshark-0000-wsutil-implicit_declaration_memcpy.patch + ------------------------------------------------------------------- Thu Dec 30 09:41:01 UTC 2021 - Robert Frohl diff --git a/wireshark.spec b/wireshark.spec index 571dfda..5b0d633 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -37,6 +37,7 @@ URL: https://www.wireshark.org/ Source: https://www.wireshark.org/download/src/%{name}-%{version}.tar.xz Source2: https://www.wireshark.org/download/SIGNATURES-%{version}.txt#/%{name}-%{version}.tar.xz.asc Source3: https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wireshark.keyring +Patch1: wireshark-0000-wsutil-implicit_declaration_memcpy.patch Patch10: wireshark-0001-dumpcap-permission-denied.patch BuildRequires: %{rb_default_ruby_suffix}-rubygem-asciidoctor BuildRequires: bison