diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-27 06:06:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-27 06:06:27 +0000 |
| commit | 8d5dbd847cbc704a6a06405856e94b461011afe3 (patch) | |
| tree | 4d26462d027b14926335894749d2e01d982234d0 /net-analyzer/wireshark/files | |
| parent | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff) | |
gentoo resync : 27.03.2021
Diffstat (limited to 'net-analyzer/wireshark/files')
| -rw-r--r-- | net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch b/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch new file mode 100644 index 000000000000..63d62e8e254a --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch @@ -0,0 +1,30 @@ +https://gitlab.com/wireshark/wireshark/-/merge_requests/2532?commit_id=6ef6e8f607456e239e5f1a326803846930d34fa8.diff +https://bugs.gentoo.org/775029 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1115,6 +1115,10 @@ ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD) + + # 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) +diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt +index ff0efeae1614511fbe12ed00d5b82f2714fa55f5..cd36913f10d949a8a701060833b0878086798bf4 100644 +--- a/ui/qt/CMakeLists.txt ++++ b/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 |