[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/

["Sam James" <sam@gentoo.org>]

commit:     64cd84f0e34ba29bb319fb9b30fc7519a7676492
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Jun  3 16:52:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/21109
Signed-off-by: Sam James <sam <AT> 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