net-analyzer/wireshark: Fix USE='-lua -plugins'

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Closes: https://bugs.gentoo.org/705656
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

diff --git a/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch b/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch
new file mode 100644 (file)
index 0000000..5506c6e
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch
@@ -0,0 +1,18 @@
+--- a/ui/qt/about_dialog.cpp
++++ b/ui/qt/about_dialog.cpp
+@@ -112,7 +112,6 @@ QStringList AuthorListModel::headerColumns() const
+     return QStringList() << tr("Name") << tr("Email");
+ }
+ 
+-#if defined(HAVE_PLUGINS) || defined(HAVE_LUA)
+ static void plugins_add_description(const char *name, const char *version,
+                                     const char *types, const char *filename,
+                                     void *user_data)
+@@ -121,7 +120,6 @@ static void plugins_add_description(const char *name, const char *version,
+     QStringList plugin_row = QStringList() << name << version << types << filename;
+     *plugin_data << plugin_row;
+ }
+-#endif
+ 
+ PluginListModel::PluginListModel(QObject * parent) : AStringListListModel(parent)
+ {

diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
index d55d1f311ef97ca7671b4fb7bd8633304f079ae6..521ee2a97f0853f41f2a11f6735f8b943c1cfbcd 100644 (file)
--- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
@@ -86,6 +86,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-2.4-androiddump.patch
        "${FILESDIR}"/${PN}-2.6.0-redhat.patch
        "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+       "${FILESDIR}"/${PN}-99999999-about_dialog-plugins_add_description.patch
        "${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
        "${FILESDIR}"/${PN}-99999999-qtsvg.patch
        "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index a228b3f00e246d74778c0497e828f542393d491a..eb3257e5fc4cf1bfadc52bc36a741bbbaf4933ca 100644 (file)
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -86,6 +86,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-2.4-androiddump.patch
        "${FILESDIR}"/${PN}-2.6.0-redhat.patch
        "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+       "${FILESDIR}"/${PN}-99999999-about_dialog-plugins_add_description.patch
        "${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
        "${FILESDIR}"/${PN}-99999999-qtsvg.patch
        "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch