Mon Feb 27 11:14:11 2023 UTC ()
wireshark: when compiling with qt6, use GCC 9

qt6 also requires gcc 9 and using 8 here doesn't work


(wiz)
diff -r1.31 -r1.32 pkgsrc/net/wireshark/options.mk
cvs diff -r1.31 -r1.32 pkgsrc/net/wireshark/options.mk (expand / switch to unified diff)

--- pkgsrc/net/wireshark/options.mk 2023/02/21 09:10:03 1.31
+++ pkgsrc/net/wireshark/options.mk 2023/02/27 11:14:11 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.31 2023/02/21 09:10:03 wiz Exp $ 1# $NetBSD: options.mk,v 1.32 2023/02/27 11:14:11 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark 3PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark
4PKG_SUPPORTED_OPTIONS= http2 lua spandsp 4PKG_SUPPORTED_OPTIONS= http2 lua spandsp
5PKG_OPTIONS_OPTIONAL_GROUPS= gui 5PKG_OPTIONS_OPTIONAL_GROUPS= gui
6PKG_OPTIONS_GROUP.gui= qt5 qt6 6PKG_OPTIONS_GROUP.gui= qt5 qt6
7PKG_SUGGESTED_OPTIONS= http2 lua 7PKG_SUGGESTED_OPTIONS= http2 lua
8 8
9.if ${OPSYS} == "Darwin" 9.if ${OPSYS} == "Darwin"
10# problems building qt6 on Darwin as of 2023/01/30 10# problems building qt6 on Darwin as of 2023/01/30
11PKG_SUGGESTED_OPTIONS+= qt5 11PKG_SUGGESTED_OPTIONS+= qt5
12.else 12.else
13PKG_SUGGESTED_OPTIONS+= qt6 13PKG_SUGGESTED_OPTIONS+= qt6
14.endif 14.endif
@@ -31,27 +31,27 @@ PLIST.lua= yes @@ -31,27 +31,27 @@ PLIST.lua= yes
31CMAKE_ARGS+= -DENABLE_LUA=OFF 31CMAKE_ARGS+= -DENABLE_LUA=OFF
32.endif 32.endif
33 33
34.if !empty(PKG_OPTIONS:Mqt5) || !empty(PKG_OPTIONS:Mqt6) 34.if !empty(PKG_OPTIONS:Mqt5) || !empty(PKG_OPTIONS:Mqt6)
35. if !empty(PKG_OPTIONS:Mqt5) 35. if !empty(PKG_OPTIONS:Mqt5)
36. include "../../x11/qt5-qtsvg/buildlink3.mk" 36. include "../../x11/qt5-qtsvg/buildlink3.mk"
37. include "../../x11/qt5-qttools/buildlink3.mk" 37. include "../../x11/qt5-qttools/buildlink3.mk"
38. if ${OPSYS} == "Darwin" 38. if ${OPSYS} == "Darwin"
39. include "../../x11/qt5-qtmacextras/buildlink3.mk" 39. include "../../x11/qt5-qtmacextras/buildlink3.mk"
40. else 40. else
41. include "../../x11/qt5-qtx11extras/buildlink3.mk" 41. include "../../x11/qt5-qtx11extras/buildlink3.mk"
42. endif 42. endif
43. elif !empty(PKG_OPTIONS:Mqt6) 43. elif !empty(PKG_OPTIONS:Mqt6)
44GCC_REQD+= 8 # std::filesystem 44GCC_REQD+= 9 # std::filesystem & version used by qt6
45CMAKE_ARGS+= -DUSE_qt6=ON 45CMAKE_ARGS+= -DUSE_qt6=ON
46. include "../../graphics/qt6-qtsvg/buildlink3.mk" 46. include "../../graphics/qt6-qtsvg/buildlink3.mk"
47. include "../../multimedia/qt6-qtmultimedia/buildlink3.mk" 47. include "../../multimedia/qt6-qtmultimedia/buildlink3.mk"
48. include "../../devel/qt6-qttools/buildlink3.mk" 48. include "../../devel/qt6-qttools/buildlink3.mk"
49. include "../../devel/qt6-qt5compat/buildlink3.mk" 49. include "../../devel/qt6-qt5compat/buildlink3.mk"
50. endif 50. endif
51PLIST.qt= yes 51PLIST.qt= yes
52. if ${OPSYS} != "Darwin" 52. if ${OPSYS} != "Darwin"
53PLIST.icons= yes 53PLIST.icons= yes
54POST_INSTALL_TARGETS+= install-icons 54POST_INSTALL_TARGETS+= install-icons
55INSTALLATION_DIRS+= share/applications 55INSTALLATION_DIRS+= share/applications
56INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps 56INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps
57ICON_SIZES= 16 32 48 57ICON_SIZES= 16 32 48