CVS commit: pkgsrc/net/wireshark

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Dec 16 09:36:06 UTC 2021

Modified Files:
        pkgsrc/net/wireshark: distinfo
        pkgsrc/net/wireshark/patches: patch-CMakeLists.txt

Log Message:
wireshark: fix build


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 pkgsrc/net/wireshark/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/wireshark/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/wireshark/distinfo
diff -u pkgsrc/net/wireshark/distinfo:1.151 pkgsrc/net/wireshark/distinfo:1.152
--- pkgsrc/net/wireshark/distinfo:1.151 Fri Dec 10 08:37:17 2021
+++ pkgsrc/net/wireshark/distinfo       Thu Dec 16 09:36:06 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.151 2021/12/10 08:37:17 adam Exp $
+$NetBSD: distinfo,v 1.152 2021/12/16 09:36:06 tnn Exp $
 
 BLAKE2s (wireshark-3.6.0.tar.xz) = 97678817cc7e6ccbeb6766fd8ad1d6fa96e29ae55e0da54424980c002c0ebf25
 SHA512 (wireshark-3.6.0.tar.xz) = 7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
 Size (wireshark-3.6.0.tar.xz) = 39687684 bytes
-SHA1 (patch-CMakeLists.txt) = 371f16d57fd6d33c2c1c8cb4f54cf3c16ca2afce
+SHA1 (patch-CMakeLists.txt) = 6e2761f3798c9662603d2d40425255043434d1ea

Index: pkgsrc/net/wireshark/patches/patch-CMakeLists.txt
diff -u pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.6 pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.7
--- pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.6       Fri Apr 23 07:14:44 2021
+++ pkgsrc/net/wireshark/patches/patch-CMakeLists.txt   Thu Dec 16 09:36:06 2021
@@ -1,10 +1,13 @@
-$NetBSD: patch-CMakeLists.txt,v 1.6 2021/04/23 07:14:44 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.7 2021/12/16 09:36:06 tnn Exp $
 
 Do not make application bundle on Darwin.
 
---- CMakeLists.txt.orig        2021-04-21 17:14:36.000000000 +0000
+editcap needs -lm, like tfshark:
+editcap.c:(.text.startup+0x5b8): undefined reference to `modf'
+
+--- CMakeLists.txt.orig        2021-11-22 18:39:27.000000000 +0000
 +++ CMakeLists.txt
-@@ -1425,7 +1425,7 @@ else ()
+@@ -1521,7 +1521,7 @@ else ()
        set(EXTCAP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extcap" CACHE INTERNAL "The extcap dir")
  endif()
  
@@ -13,7 +16,7 @@ Do not make application bundle on Darwin
        #
        # As https://developer.apple.com/library/archive/technotes/tn2206/_index.html
        # says,
-@@ -2378,7 +2378,11 @@ if(BUILD_wireshark AND QT_FOUND)
+@@ -2498,7 +2498,11 @@ if(BUILD_wireshark AND QT_FOUND)
                ${MINIZIP_LIBRARIES}
        )
  
@@ -26,7 +29,15 @@ Do not make application bundle on Darwin
        if(WIN32)
                set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT wireshark)
        endif()
-@@ -3317,12 +3321,12 @@ endif()
+@@ -2883,6 +2887,7 @@ endif()
+ 
+ if(BUILD_editcap)
+       set(editcap_LIBS
++              m
+               ui
+               wiretap
+               version_info
+@@ -3501,12 +3506,12 @@ endif()
  
  install(
        FILES