[oe-commits] [meta-openembedded] 08/13: wireshark: Enable plugins when enabling qt5

git at git.openembedded.org git at git.openembedded.org
Thu Jan 9 03:25:27 UTC 2020


This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 74a871142eb424079e377ef7195f379fb26ed491
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Wed Jan 8 14:26:41 2020 -0800

    wireshark: Enable plugins when enabling qt5
    
    plugins tab and about dialog have created dependency with commit[1]
    this fails to build when qt5 is in bblayers
    
    Fixes
    
    wireshark-3.2.0/ui/qt/about_dialog.cpp:137:29: error: 'plugins_add_description' was not declared in this scope; did you mean 'plugins_get_descriptions'?
      137 |     extcap_get_descriptions(plugins_add_description, &plugin_data);
          |                             ^~~~~~~~~~~~~~~~~~~~~~~
          |                             plugins_get_descriptions
    
    [1] https://github.com/wireshark/wireshark/commit/5dfde7ff83a35bb7186cd05ce61f4b139ab01203
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-networking/recipes-support/wireshark/wireshark_3.2.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.2.0.bb b/meta-networking/recipes-support/wireshark/wireshark_3.2.0.bb
index 412d6d7..df46b33 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_3.2.0.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_3.2.0.bb
@@ -19,7 +19,7 @@ PE = "1"
 
 inherit cmake pkgconfig python3native perlnative upstream-version-is-even
 
-PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}"
+PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5 plugins', '', d)}"
 
 PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list