diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2020-01-17 13:28:22 +0100 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2020-01-17 13:29:13 +0100 |
| commit | d457c61eaff3a06ce2a2c6903f4f389330d7b8a4 (patch) | |
| tree | 9688a75d0a302cece0aa0d024cf97ece72b99ec9 /net-analyzer | |
| parent | media-libs/lv2: ia64 stable wrt bug #705616 (diff) | |
| download | gentoo-d457c61eaff3a06ce2a2c6903f4f389330d7b8a4.tar.gz gentoo-d457c61eaff3a06ce2a2c6903f4f389330d7b8a4.tar.bz2 gentoo-d457c61eaff3a06ce2a2c6903f4f389330d7b8a4.zip | |
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>
Diffstat (limited to 'net-analyzer')
3 files changed, 20 insertions, 0 deletions
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 000000000000..5506c6ec2ad4 --- /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 d55d1f311ef9..521ee2a97f08 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 a228b3f00e24..eb3257e5fc4c 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 |