diff options
author | tnn <tnn@pkgsrc.org> | 2021-04-06 10:25:01 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2021-04-06 10:25:01 +0000 |
commit | a163763ea29fbf31b7390124610500a2c545bdca (patch) | |
tree | b6ae5929eb980c9022e36677f9c6b0832aee7bc3 | |
parent | 24309509c27d7dc4ab17f98be648360fa5bde1bd (diff) | |
download | pkgsrc-a163763ea29fbf31b7390124610500a2c545bdca.tar.gz |
wireshark: fix CMake 3.20 fallout
closes PR pkg/56094
-rw-r--r-- | net/wireshark/distinfo | 7 | ||||
-rw-r--r-- | net/wireshark/patches/patch-CMakeLists.txt | 32 | ||||
-rw-r--r-- | net/wireshark/patches/patch-ui_qt_CMakeLists.txt | 26 |
3 files changed, 58 insertions, 7 deletions
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index bcde29d6d63..feb529fdf54 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,17 +1,20 @@ -$NetBSD: distinfo,v 1.141 2021/04/06 10:13:32 tnn Exp $ +$NetBSD: distinfo,v 1.142 2021/04/06 10:25:01 tnn Exp $ SHA1 (wireshark-3.4.4.tar.xz) = fa5c553596dcc6a59735f96a9a0845e3c40abab2 RMD160 (wireshark-3.4.4.tar.xz) = 677c151b94af472ae3ae390e51781ec0cc371ddd SHA512 (wireshark-3.4.4.tar.xz) = 388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172 Size (wireshark-3.4.4.tar.xz) = 32290424 bytes -SHA1 (patch-CMakeLists.txt) = 8faf8f63d75d5733a69b52ce9fbf291bd90a5575 +SHA1 (patch-CMakeLists.txt) = f00912610e63fa50ccd85ff93382de85b005da98 SHA1 (patch-caputils_capture__ifinfo.h) = adb4c22accb41b3ac402b458be4efaa258abd4b8 +SHA1 (patch-epan_conversation.h) = b3cdd98602570cbcb33b35e9362ff8802753edd8 SHA1 (patch-epan_dissectors_dissectors.h) = 9a31c52fbbb97bf44444583a2b787243fbbf74b6 SHA1 (patch-epan_epan.h) = 6bcd31b572a763092454be57a49c522cbba6824b +SHA1 (patch-epan_epan__dissect.h) = 9fe4d59c38786c1981ada2dc356f0d01a0703bf0 SHA1 (patch-epan_prefs.h) = bdb744b3f96ed6965576316bcde121694f0de947 SHA1 (patch-epan_value__string.h) = b3ffb1931a1e47c664fc50bcd121ec2880ce05ea SHA1 (patch-epan_wmem_wmem__user__cb__int.h) = d7a1f31771244521de3291b3a360e34bf47f6fe5 SHA1 (patch-ui_packet__range.h) = c2dafea7fdebc15e46782e02dce32a00e3f32c98 +SHA1 (patch-ui_qt_CMakeLists.txt) = 7fd755c4c4c2aafbf986751e9ba0ff9d7f4d32dc SHA1 (patch-ui_recent.h) = ce8769e82c8a90feed044ca31e363349b02bafcb SHA1 (patch-ui_rtp__media.h) = 355f9009107bde38537303cf18c03e2c7017587f SHA1 (patch-ui_rtp__stream.h) = ad756a7dff9fcfc637401f4bde0cff05bad87d62 diff --git a/net/wireshark/patches/patch-CMakeLists.txt b/net/wireshark/patches/patch-CMakeLists.txt index 625a27eb5de..bdbbbfb4c32 100644 --- a/net/wireshark/patches/patch-CMakeLists.txt +++ b/net/wireshark/patches/patch-CMakeLists.txt @@ -1,4 +1,4 @@ -$NetBSD: patch-CMakeLists.txt,v 1.4 2020/09/15 10:19:20 wiz Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.5 2021/04/06 10:25:01 tnn Exp $ Do not make application bundle on Darwin. Avoid @@ -6,9 +6,31 @@ Avoid install FILES given directory "${WRKDIR}/.buildlink/cmake-Modules" to install. ---- CMakeLists.txt.orig 2020-08-12 17:53:19.000000000 +0000 +From 6ef6e8f607456e239e5f1a326803846930d34fa8 Mon Sep 17 00:00:00 2001 +From: Gerald Combs <gerald@wireshark.org> +Date: Fri, 26 Mar 2021 12:52:01 -0700 +Subject: [PATCH] CMake: Enable AUTO{MOC,UIC,RCC} earlier. + +Enable CMAKE_AUTOMOC, CMAKE_AUTOUIC, and CMAKE_AUTORCC before searching +for Qt packages. This is apparently required for CMake 3.20.0 and later. +Fixes #17314. + +(cherry picked from commit be2b0fc810fb2f2a80e471138dc29f0cbe87b209) + +--- CMakeLists.txt.orig 2021-03-10 18:21:20.000000000 +0000 +++ CMakeLists.txt -@@ -1359,7 +1359,7 @@ else () +@@ -1083,6 +1083,10 @@ ws_find_package(Systemd BUILD_sdjournal + + # Build the Qt GUI? + if(BUILD_wireshark) ++ set(CMAKE_AUTOMOC ON) ++ set(CMAKE_AUTOUIC ON) ++ set(CMAKE_AUTORCC ON) ++ + # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten + # somewhere. The if WIN32 in this place is annoying as well. + if(WIN32) +@@ -1388,7 +1392,7 @@ else () set(EXTCAP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extcap" CACHE INTERNAL "The extcap dir") endif() @@ -17,7 +39,7 @@ Avoid # # As https://developer.apple.com/library/archive/technotes/tn2206/_index.html # says, -@@ -2278,7 +2278,11 @@ if(BUILD_wireshark AND QT_FOUND) +@@ -2345,7 +2349,11 @@ if(BUILD_wireshark AND QT_FOUND) ${MINIZIP_LIBRARIES} ) @@ -30,7 +52,7 @@ Avoid if(WIN32) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT wireshark) endif() -@@ -3210,12 +3214,12 @@ endif() +@@ -3284,12 +3292,12 @@ endif() install( FILES diff --git a/net/wireshark/patches/patch-ui_qt_CMakeLists.txt b/net/wireshark/patches/patch-ui_qt_CMakeLists.txt new file mode 100644 index 00000000000..d0753060e8c --- /dev/null +++ b/net/wireshark/patches/patch-ui_qt_CMakeLists.txt @@ -0,0 +1,26 @@ +$NetBSD: patch-ui_qt_CMakeLists.txt,v 1.1 2021/04/06 10:25:01 tnn Exp $ + +From 6ef6e8f607456e239e5f1a326803846930d34fa8 Mon Sep 17 00:00:00 2001 +From: Gerald Combs <gerald@wireshark.org> +Date: Fri, 26 Mar 2021 12:52:01 -0700 +Subject: [PATCH] CMake: Enable AUTO{MOC,UIC,RCC} earlier. + +Enable CMAKE_AUTOMOC, CMAKE_AUTOUIC, and CMAKE_AUTORCC before searching +for Qt packages. This is apparently required for CMake 3.20.0 and later. +Fixes #17314. + +(cherry picked from commit be2b0fc810fb2f2a80e471138dc29f0cbe87b209) + +--- ui/qt/CMakeLists.txt.orig 2021-03-10 18:21:20.000000000 +0000 ++++ ui/qt/CMakeLists.txt +@@ -631,10 +631,6 @@ include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +-set(CMAKE_AUTOMOC TRUE) +-set(CMAKE_AUTOUIC TRUE) +-set(CMAKE_AUTORCC TRUE) +- + if(NOT Qt5Widgets_VERSION VERSION_LESS "5.9") + # Drop the file modification time of source files from generated files + # to help with reproducible builds. We do not use QFileInfo.lastModified |