<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c26fb3de46c768f0ded561acf02d0c0161877ad6">https://github.com/macports/macports-ports/commit/c26fb3de46c768f0ded561acf02d0c0161877ad6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c26fb3de46c768f0ded561acf02d0c0161877ad6
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sat Aug 19 10:40:53 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> wireshark2: update to 2.6.20, restore Qt4 support, fix powerpc
</span>---
net/wireshark2/Portfile | 46 ++++++++++++++++++++++-------
net/wireshark2/files/patch-unbreak-qt4.diff | 11 +++++++
2 files changed, 46 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark2/Portfile b/net/wireshark2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 67b5ec743a4..25ea3b18323 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/wireshark2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,14 +4,13 @@ PortSystem 1.0
</span> PortGroup cmake 1.0
name wireshark2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.6.19
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.6.20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net
license {GPL-2 GPL-3}
maintainers {darkart.com:opendarwin.org @ghosthound}
description Graphical network analyzer and capture tool
homepage https://www.wireshark.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
long_description A network analyzer that lets you capture and \
interactively browse Ethernet frames. \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,13 +26,17 @@ distfiles wireshark-${version}${extract.suffix}
</span>
worksrcdir wireshark-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 a1e4a673d2333462b9c5b6b8ce259424abb7c02563a32065aa2cdc88dd99f33e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f76ee5a279f7bbd1cd129ee2ba1b3a16b6048172 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 49d78e8dc82756ab08d227c0ae8f87a807723f57 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 28555092
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 c5703cf3357d73eaa537f146a60903c0cebf5bdc8d16b6b4ae9f0310da53cfaa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 28a27f4474fc8f5a1bb44130864e530e0153a369 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 28557592
</span>
conflicts wireshark22 wireshark3 wireshark30 wireshark4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver_nodot [string map {. {}} ${py_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +46,7 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:lz4
configure.args-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_wireshark=OFF \
</span> -DCMAKE_INSTALL_RPATH:STRING="${prefix}/lib" \
-DCMAKE_INSTALL_NAME_DIR:STRING="${prefix}/lib" \
-DENABLE_APPLICATION_BUNDLE=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +64,7 @@ configure.args-append \
</span> -DENABLE_SMI=OFF \
-DENABLE_SNAPPY=OFF \
-DENABLE_ZLIB=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_wireshark=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python${py_ver}
</span>
# fix include directory for lua -- stop putting zlib.h include directory first
# and then do put lua-52/lua.h directory first in list of include directories
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,8 +72,24 @@ configure.args-append \
</span> patchfiles-append patch-wireshark2-luafix-001.diff
patchfiles-append patch-wireshark2-luafix-002.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt5 conflicts no_gui description {Build wireshark with a qt5 GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt4 was removed for no good reason. 2.6.20 stills builds with it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-unbreak-qt4.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt4 conflicts no_gui qt5 description {Build wireshark with a qt4 GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_APPLICATION_BUNDLE=OFF -DENABLE_APPLICATION_BUNDLE=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DBUILD_wireshark=OFF -DBUILD_wireshark=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_QT5=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/bin/Wireshark.app ${destroot}${applications_dir}/Wireshark.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt5 conflicts no_gui qt4 description {Build wireshark with a qt5 GUI} {
</span> PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace -DENABLE_APPLICATION_BUNDLE=OFF -DENABLE_APPLICATION_BUNDLE=ON
configure.args-replace -DBUILD_wireshark=OFF -DBUILD_wireshark=ON
configure.args-append -DENABLE_QT5=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,8 +165,12 @@ variant chmodbpf description {Enable Wireshark to acces macOS capture devices} {
</span>
default_variants +portaudio +zlib +libsmi +gnutls +libgcrypt +geoip +kerberos5 +chmodbpf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset qt5] && ![variant_isset no_gui]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset qt4] && ![variant_isset qt5] && ![variant_isset no_gui]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {![variant_isset adns] && ![variant_isset cares]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark2/files/patch-unbreak-qt4.diff b/net/wireshark2/files/patch-unbreak-qt4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..628483a3063
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark2/files/patch-unbreak-qt4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2020-09-24 06:06:00.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-08-19 08:55:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1269,7 +1269,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(MOC_OPTIONS -nn)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(WIN32 OR APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(FATAL_ERROR "Windows and macOS builds should use Qt5.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span></pre><pre style='margin:0'>
</pre>