commit: 9690c43f7d2a2cf3e5145a3f3a8e9f1042fcdd0a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 01:45:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 01:45:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9690c43f
net-analyzer/wireshark: add preliminary Qt 6 support for >=4.0.0_rc2
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild | 60 +++++++++++++++--------
net-analyzer/wireshark/wireshark-9999.ebuild | 60 +++++++++++++++--------
2 files changed, 80 insertions(+), 40 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
b/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
index cffd36841184..9110abbac9e4 100644
--- a/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
@@ -27,7 +27,7 @@ LICENSE="GPL-2"
SLOT="0/${PV}"
IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
dpauxmon"
IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4
maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +randpkt"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap qt6
+randpkt"
IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp
sshdump ssl"
IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
@@ -38,7 +38,8 @@ RESTRICT="!test? ( test )"
# TODO: wifidump/libssh automagic?
# bug #753062 for speexdsp
-RDEPEND="acct-group/pcap
+RDEPEND="
+ acct-group/pcap
>=dev-libs/glib-2.50.0:2
dev-libs/libpcre2
>=net-dns/c-ares-1.14.0:=
@@ -49,7 +50,7 @@ RDEPEND="acct-group/pcap
ciscodump? ( >=net-libs/libssh-0.6 )
filecaps? ( sys-libs/libcap )
http2? ( >=net-libs/nghttp2-1.11.0:= )
- ilbc? ( media-libs/libilbc )
+ ilbc? ( media-libs/libilbc:= )
kerberos? ( virtual/krb5 )
libxml2? ( dev-libs/libxml2 )
lua? ( ${LUA_DEPS} )
@@ -60,26 +61,35 @@ RDEPEND="acct-group/pcap
opus? ( media-libs/opus )
pcap? ( net-libs/libpcap )
gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
x11-misc/xdg-utils
+ qt6? (
+ dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
+ dev-qt/qt5compat:6
+ dev-qt/qtmultimedia:6
+ )
+ !qt6? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ )
)
sbc? ( media-libs/sbc )
- sdjournal? ( sys-apps/systemd )
+ sdjournal? ( sys-apps/systemd:= )
smi? ( net-libs/libsmi )
snappy? ( app-arch/snappy )
- spandsp? ( media-libs/spandsp )
- sshdump? ( >=net-libs/libssh-0.6 )
+ spandsp? ( media-libs/spandsp:= )
+ sshdump? ( >=net-libs/libssh-0.6:= )
ssl? ( >=net-libs/gnutls-3.5.8:= )
zlib? ( sys-libs/zlib )
- zstd? ( app-arch/zstd:= )"
+ zstd? ( app-arch/zstd:= )
+"
DEPEND="${RDEPEND}"
# TODO: 4.0.0_rc1 release notes say:
# "Perl is no longer required to build Wireshark, but may be required to build
some source code files and run code analysis checks."
-BDEPEND="${PYTHON_DEPS}
+BDEPEND="
+ ${PYTHON_DEPS}
dev-lang/perl
sys-devel/flex
sys-devel/gettext
@@ -89,17 +99,25 @@ BDEPEND="${PYTHON_DEPS}
dev-ruby/asciidoctor
)
gui? (
- dev-qt/linguist-tools:5
+ qt6? (
+ dev-qt/qttools:6[linguist]
+ )
+ !qt6? (
+ dev-qt/linguist-tools:5
+ )
)
test? (
$(python_gen_any_dep '
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
')
- )"
-RDEPEND="${RDEPEND}
+ )
+"
+RDEPEND="
+ ${RDEPEND}
gui? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )"
+ selinux? ( sec-policy/selinux-wireshark )
+"
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
@@ -122,6 +140,8 @@ pkg_setup() {
src_configure() {
local mycmakeargs
+ python_setup
+
# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
# --with-ssl to ./configure. (Mimics code from acinclude.m4).
if use kerberos ; then
@@ -136,12 +156,9 @@ src_configure() {
fi
if use gui ; then
- #export QT_MIN_VERSION=5.3.0
append-cxxflags -fPIC -DPIC
fi
- python_setup
-
mycmakeargs+=(
-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
$(use androiddump && use pcap && echo
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
@@ -169,7 +186,10 @@ src_configure() {
-DBUILD_tfshark=$(usex tfshark)
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
+
-DBUILD_wireshark=$(usex gui)
+ -DUSE_qt6=$(usex qt6)
+
-DENABLE_WERROR=OFF
-DENABLE_BCG729=$(usex bcg729)
-DENABLE_BROTLI=$(usex brotli)
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild
b/net-analyzer/wireshark/wireshark-9999.ebuild
index cffd36841184..9110abbac9e4 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -27,7 +27,7 @@ LICENSE="GPL-2"
SLOT="0/${PV}"
IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
dpauxmon"
IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4
maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +randpkt"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap qt6
+randpkt"
IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp
sshdump ssl"
IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
@@ -38,7 +38,8 @@ RESTRICT="!test? ( test )"
# TODO: wifidump/libssh automagic?
# bug #753062 for speexdsp
-RDEPEND="acct-group/pcap
+RDEPEND="
+ acct-group/pcap
>=dev-libs/glib-2.50.0:2
dev-libs/libpcre2
>=net-dns/c-ares-1.14.0:=
@@ -49,7 +50,7 @@ RDEPEND="acct-group/pcap
ciscodump? ( >=net-libs/libssh-0.6 )
filecaps? ( sys-libs/libcap )
http2? ( >=net-libs/nghttp2-1.11.0:= )
- ilbc? ( media-libs/libilbc )
+ ilbc? ( media-libs/libilbc:= )
kerberos? ( virtual/krb5 )
libxml2? ( dev-libs/libxml2 )
lua? ( ${LUA_DEPS} )
@@ -60,26 +61,35 @@ RDEPEND="acct-group/pcap
opus? ( media-libs/opus )
pcap? ( net-libs/libpcap )
gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
x11-misc/xdg-utils
+ qt6? (
+ dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
+ dev-qt/qt5compat:6
+ dev-qt/qtmultimedia:6
+ )
+ !qt6? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ )
)
sbc? ( media-libs/sbc )
- sdjournal? ( sys-apps/systemd )
+ sdjournal? ( sys-apps/systemd:= )
smi? ( net-libs/libsmi )
snappy? ( app-arch/snappy )
- spandsp? ( media-libs/spandsp )
- sshdump? ( >=net-libs/libssh-0.6 )
+ spandsp? ( media-libs/spandsp:= )
+ sshdump? ( >=net-libs/libssh-0.6:= )
ssl? ( >=net-libs/gnutls-3.5.8:= )
zlib? ( sys-libs/zlib )
- zstd? ( app-arch/zstd:= )"
+ zstd? ( app-arch/zstd:= )
+"
DEPEND="${RDEPEND}"
# TODO: 4.0.0_rc1 release notes say:
# "Perl is no longer required to build Wireshark, but may be required to build
some source code files and run code analysis checks."
-BDEPEND="${PYTHON_DEPS}
+BDEPEND="
+ ${PYTHON_DEPS}
dev-lang/perl
sys-devel/flex
sys-devel/gettext
@@ -89,17 +99,25 @@ BDEPEND="${PYTHON_DEPS}
dev-ruby/asciidoctor
)
gui? (
- dev-qt/linguist-tools:5
+ qt6? (
+ dev-qt/qttools:6[linguist]
+ )
+ !qt6? (
+ dev-qt/linguist-tools:5
+ )
)
test? (
$(python_gen_any_dep '
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
')
- )"
-RDEPEND="${RDEPEND}
+ )
+"
+RDEPEND="
+ ${RDEPEND}
gui? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )"
+ selinux? ( sec-policy/selinux-wireshark )
+"
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
@@ -122,6 +140,8 @@ pkg_setup() {
src_configure() {
local mycmakeargs
+ python_setup
+
# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
# --with-ssl to ./configure. (Mimics code from acinclude.m4).
if use kerberos ; then
@@ -136,12 +156,9 @@ src_configure() {
fi
if use gui ; then
- #export QT_MIN_VERSION=5.3.0
append-cxxflags -fPIC -DPIC
fi
- python_setup
-
mycmakeargs+=(
-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
$(use androiddump && use pcap && echo
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
@@ -169,7 +186,10 @@ src_configure() {
-DBUILD_tfshark=$(usex tfshark)
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
+
-DBUILD_wireshark=$(usex gui)
+ -DUSE_qt6=$(usex qt6)
+
-DENABLE_WERROR=OFF
-DENABLE_BCG729=$(usex bcg729)
-DENABLE_BROTLI=$(usex brotli)
