From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1072712-garchives=archives.gentoo.org@lists.gentoo.org> 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 655F1138334 for <garchives@archives.gentoo.org>; Sat, 16 Feb 2019 10:24:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 854B1E085E; Sat, 16 Feb 2019 10:24:11 +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 54EBCE085E for <gentoo-commits@lists.gentoo.org>; Sat, 16 Feb 2019 10:24:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 468B9335CED for <gentoo-commits@lists.gentoo.org>; Sat, 16 Feb 2019 10:24:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D994B53A for <gentoo-commits@lists.gentoo.org>; Sat, 16 Feb 2019 10:24:08 +0000 (UTC) From: "Jeroen Roovers" <jer@gentoo.org> 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" <jer@gentoo.org> Message-ID: <1550312643.561e765fc776910165e5bda5de9cdf1bf6197c26.jer@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-99999999-qtsvg.patch X-VCS-Directories: net-analyzer/wireshark/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 561e765fc776910165e5bda5de9cdf1bf6197c26 X-VCS-Branch: master Date: Sat, 16 Feb 2019 10:24:08 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0e97c1b9-db20-4a6c-9feb-80eba5a0abf5 X-Archives-Hash: c00c0958a64d3b1ee756b551b0082029 commit: 561e765fc776910165e5bda5de9cdf1bf6197c26 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sat Feb 16 10:23:36 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sat Feb 16 10:24:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=561e765f net-analyzer/wireshark: Update qtsvg patch Package-Manager: Portage-2.3.60, Repoman-2.3.12 Fixes: https://bugs.gentoo.org/678120 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> .../wireshark/files/wireshark-99999999-qtsvg.patch | 23 ++-------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch index 231acd5a6fa..8cff4bdd075 100644 --- a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch +++ b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch @@ -1,29 +1,10 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -910,14 +910,12 @@ +@@ -1058,7 +1058,6 @@ Qt5LinguistTools Qt5Multimedia Qt5PrintSupport - Qt5Svg Qt5Widgets ) - set(Qt5Core_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - set(Qt5LinguistTools_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - set(Qt5Multimedia_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - set(Qt5PrintSupport_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) -- set(Qt5Svg_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - set(Qt5Widgets_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - 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 + if(APPLE)