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 62B3E1382C5 for ; Thu, 3 Jun 2021 22:22:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6EACE083B; Thu, 3 Jun 2021 22:22:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 8680AE083B for ; Thu, 3 Jun 2021 22:22:27 +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 219DB340EA5 for ; Thu, 3 Jun 2021 22:22:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9CD52733 for ; Thu, 3 Jun 2021 22:22:24 +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: <1622758904.64cd84f0e34ba29bb319fb9b30fc7519a7676492.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch X-VCS-Directories: net-analyzer/wireshark/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 64cd84f0e34ba29bb319fb9b30fc7519a7676492 X-VCS-Branch: master Date: Thu, 3 Jun 2021 22:22:24 +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: f8cb9418-3ed9-4e87-be88-478fb875d9a2 X-Archives-Hash: 5165472b0e282875826b09e02a062618 commit: 64cd84f0e34ba29bb319fb9b30fc7519a7676492 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Thu Jun 3 16:52:00 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 3 22:21:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64cd84f0 net-analyzer/wireshark: remove unused patch Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/21109 Signed-off-by: Sam James gentoo.org> .../files/wireshark-3.4.4-cmake-3.20.patch | 30 ---------------------- 1 file changed, 30 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 deleted file mode 100644 index 63d62e8e254..00000000000 --- a/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch +++ /dev/null @@ -1,30 +0,0 @@ -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