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 EEEAA1382C5 for ; Fri, 4 May 2018 18:01:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 207E9E0814; Fri, 4 May 2018 18:01:32 +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 DDC88E0814 for ; Fri, 4 May 2018 18:01:31 +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 B9D35335C06 for ; Fri, 4 May 2018 18:01:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3ADF632 for ; Fri, 4 May 2018 18:01:29 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1525456887.3614f5d49b3123f7a627e27bcb085d1d58c890b0.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild net-analyzer/wireshark/wireshark-99999999.ebuild X-VCS-Directories: net-analyzer/wireshark/ net-analyzer/wireshark/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 3614f5d49b3123f7a627e27bcb085d1d58c890b0 X-VCS-Branch: master Date: Fri, 4 May 2018 18:01:29 +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-Archives-Salt: 00226da6-7b2f-45a0-adb5-a6878e859b55 X-Archives-Hash: 4cd21a89e587987f23dded08eeed0ae5 commit: 3614f5d49b3123f7a627e27bcb085d1d58c890b0 Author: Jeroen Roovers gentoo org> AuthorDate: Fri May 4 17:53:50 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Fri May 4 18:01:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3614f5d4 net-analyzer/wireshark: #654714, #654690. Package-Manager: Portage-2.3.33, Repoman-2.3.9 .../wireshark/files/wireshark-2.6.0-qtsvg.patch | 29 ++++++++++++++++++++++ .../wireshark/files/wireshark-2.6.0-redhat.patch | 11 ++++++++ net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild | 2 ++ net-analyzer/wireshark/wireshark-99999999.ebuild | 2 ++ 4 files changed, 44 insertions(+) diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch new file mode 100644 index 00000000000..63327727590 --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch @@ -0,0 +1,29 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -926,14 +926,12 @@ + Qt5LinguistTools + Qt5Multimedia + Qt5PrintSupport +- Qt5Svg + Qt5Widgets + ) + set(Qt5Core_OPTIONS REQUIRED) + set(Qt5LinguistTools_OPTIONS REQUIRED) + set(Qt5Multimedia_OPTIONS REQUIRED) + set(Qt5PrintSupport_OPTIONS REQUIRED) +- set(Qt5Svg_OPTIONS REQUIRED) + set(Qt5Widgets_OPTIONS REQUIRED) + if (APPLE) + set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras) +@@ -1229,11 +1227,6 @@ + # That's the name autofoo uses + set(QT_MULTIMEDIA_LIB 1) + endif() +- if(Qt5Svg_FOUND) +- set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES}) +- # That's the name autofoo uses +- set(QT_SVG_LIB 1) +- endif() + if(Qt5MacExtras_FOUND) + set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES}) + # That's the name autofoo uses diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch new file mode 100644 index 00000000000..fe17609bf61 --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3019,7 +3019,7 @@ + + endif() + +-if(CMAKE_SYSTEM_NAME STREQUAL "Linux") ++if(CMAKE_SYSTEM_NAME STREQUAL "Red Hat") + find_program(RPMBUILD_EXECUTABLE rpmbuild) + find_program(GIT_EXECUTABLE git) + endif() diff --git a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild index 40b8f06bf92..23ffa310a9e 100644 --- a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild @@ -89,6 +89,8 @@ PATCHES=( "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch "${FILESDIR}"/${PN}-2.4-androiddump.patch "${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch + "${FILESDIR}"/${PN}-2.6.0-qtsvg.patch + "${FILESDIR}"/${PN}-2.6.0-redhat.patch "${FILESDIR}"/${PN}-99999999-androiddump.patch ) diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index c216e52d33d..7ca08d8b924 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -88,6 +88,8 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.4-androiddump.patch "${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch + "${FILESDIR}"/${PN}-2.6.0-qtsvg.patch + "${FILESDIR}"/${PN}-2.6.0-redhat.patch ) pkg_setup() {