commit: d457c61eaff3a06ce2a2c6903f4f389330d7b8a4 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Fri Jan 17 12:28:22 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Fri Jan 17 12:29:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d457c61e
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 <AT> gentoo.org> ...99999999-about_dialog-plugins_add_description.patch | 18 ++++++++++++++++++ net-analyzer/wireshark/wireshark-3.2.1.ebuild | 1 + net-analyzer/wireshark/wireshark-99999999.ebuild | 1 + 3 files changed, 20 insertions(+) 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 index 00000000000..5506c6ec2ad --- /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 d55d1f311ef..521ee2a97f0 100644 --- 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 a228b3f00e2..eb3257e5fc4 100644 --- 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
