From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8B4DA13835A for ; Sat, 27 Mar 2021 02:58:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2256E07B3; Sat, 27 Mar 2021 02:58:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9826E07B3 for ; Sat, 27 Mar 2021 02:58:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C31D0340D8B for ; Sat, 27 Mar 2021 02:58:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 60D0B5AC for ; Sat, 27 Mar 2021 02:58:01 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1616813853.ac297875f7971b8421b02e39e550d7662dfd15cd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch net-analyzer/wireshark/wireshark-3.4.4.ebuild X-VCS-Directories: net-analyzer/wireshark/ net-analyzer/wireshark/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ac297875f7971b8421b02e39e550d7662dfd15cd X-VCS-Branch: master Date: Sat, 27 Mar 2021 02:58:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 58556b92-5ff1-4a76-809f-4eeb1b9c99e5 X-Archives-Hash: ece537b7e398e1ceb55050251a635675 commit: ac297875f7971b8421b02e39e550d7662dfd15cd Author: Sam James gentoo org> AuthorDate: Sat Mar 27 01:14:33 2021 +0000 Commit: Sam James gentoo 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 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() {