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 25F60138334 for ; Sun, 3 Jun 2018 11:06:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DF19E083B; Sun, 3 Jun 2018 11:06:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 1F5E2E083B for ; Sun, 3 Jun 2018 11:06:13 +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 93740335C75 for ; Sun, 3 Jun 2018 11:06:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8CC529E for ; Sun, 3 Jun 2018 11:06:09 +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: <1528023959.d66c707eef1fa2e8fe400d0c7897feb4ebd6783c.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-99999999-qtsvg.patch 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: d66c707eef1fa2e8fe400d0c7897feb4ebd6783c X-VCS-Branch: master Date: Sun, 3 Jun 2018 11:06:09 +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: 84e59869-b3de-4310-b5a9-548441a18a22 X-Archives-Hash: 7dccca43f4498440f6e7426b441d569f commit: d66c707eef1fa2e8fe400d0c7897feb4ebd6783c Author: Jeroen Roovers gentoo org> AuthorDate: Sun Jun 3 11:05:59 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Jun 3 11:05:59 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d66c707e net-analyzer/wireshark: Update live ebuild. Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../wireshark/files/wireshark-99999999-qtsvg.patch | 29 ++++++++++++++++++++++ net-analyzer/wireshark/wireshark-99999999.ebuild | 3 +-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch new file mode 100644 index 00000000000..4f151dbba21 --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch @@ -0,0 +1,29 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -910,14 +910,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) +@@ -1187,11 +1185,6 @@ + # That's the name autotools used + set(QT_MULTIMEDIA_LIB 1) + endif() +- if(Qt5Svg_FOUND) +- set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES}) +- # That's the name autotools used +- set(QT_SVG_LIB 1) +- endif() + if(Qt5MacExtras_FOUND) + set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES}) + # That's the name autotools used diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 7ca08d8b924..039381a543b 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -87,8 +87,7 @@ 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}-99999999-qtsvg.patch "${FILESDIR}"/${PN}-2.6.0-redhat.patch )