commit: ac297875f7971b8421b02e39e550d7662dfd15cd Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Mar 27 01:14:33 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 27 02:57:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac297875
net-analyzer/wireshark: fix build with >=dev-util/cmake-3.20.0 Using a patch from upstream. Closes: https://bugs.gentoo.org/775029 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/wireshark-3.4.4-cmake-3.20.patch | 30 ++++++++++++++++++++++ net-analyzer/wireshark/wireshark-3.4.4.ebuild | 1 + 2 files changed, 31 insertions(+) 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 00000000000..63d62e8e254 --- /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 diff --git a/net-analyzer/wireshark/wireshark-3.4.4.ebuild b/net-analyzer/wireshark/wireshark-3.4.4.ebuild index cc5aaa6adc5..c37f3c484d2 100644 --- a/net-analyzer/wireshark/wireshark-3.4.4.ebuild +++ b/net-analyzer/wireshark/wireshark-3.4.4.ebuild @@ -101,6 +101,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.0-redhat.patch "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch "${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch + "${FILESDIR}"/${P}-cmake-3.20.patch ) pkg_setup() {
