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 65E89138334 for ; Sun, 3 Jun 2018 10:51:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62620E09D1; Sun, 3 Jun 2018 10:51:43 +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 22CE9E09D1 for ; Sun, 3 Jun 2018 10:51:43 +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 B1F51335C75 for ; Sun, 3 Jun 2018 10:51:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D18A229E for ; Sun, 3 Jun 2018 10:51:37 +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: <1528023096.bd310499ec0055ecb7fb91b69cffa1fabdfe02ba.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.1-Qt-5.11.patch net-analyzer/wireshark/wireshark-2.6.1.ebuild X-VCS-Directories: net-analyzer/wireshark/ net-analyzer/wireshark/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: bd310499ec0055ecb7fb91b69cffa1fabdfe02ba X-VCS-Branch: master Date: Sun, 3 Jun 2018 10:51:37 +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: 21854c4e-ceff-410c-bacf-669818271e54 X-Archives-Hash: 5d9f7266dd0f479536926e95fe460002 commit: bd310499ec0055ecb7fb91b69cffa1fabdfe02ba Author: Jeroen Roovers gentoo org> AuthorDate: Sun Jun 3 10:50:23 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Jun 3 10:51:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd310499 net-analyzer/wireshark: Fix building against Qt 5.11 (bug #656832). Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../wireshark/files/wireshark-2.6.1-Qt-5.11.patch | 54 ++++++++++++++++++++++ net-analyzer/wireshark/wireshark-2.6.1.ebuild | 1 + 2 files changed, 55 insertions(+) diff --git a/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch b/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch new file mode 100644 index 00000000000..c8d8bb9ce9c --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch @@ -0,0 +1,54 @@ +From b8e8aa87f43c12ad564426b3359f593305cd45a1 Mon Sep 17 00:00:00 2001 +From: Roland Knall +Date: Wed, 25 Apr 2018 10:28:30 +0200 +Subject: [PATCH] Qt: Fix various missing header includes + +Qt 5.11 seems to have changed the include dependencies, so adding those, that are missing + +Change-Id: I2b0482f7554467d6981be65bfd3fea1a3e118976 +Reviewed-on: https://code.wireshark.org/review/27145 +Petri-Dish: Roland Knall +Tested-by: Petri Dish Buildbot +Reviewed-by: Roland Knall +--- + ui/qt/packet_format_group_box.cpp | 1 + + ui/qt/time_shift_dialog.cpp | 1 + + ui/qt/wireless_frame.cpp | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/ui/qt/packet_format_group_box.cpp b/ui/qt/packet_format_group_box.cpp +index a80a71aaaddfce2798ececcbb27a4d9e75382c1b..3c0fff28aa4cd91d344f2e70db1e66123bc17f41 100644 +--- a/ui/qt/packet_format_group_box.cpp ++++ b/ui/qt/packet_format_group_box.cpp +@@ -10,6 +10,7 @@ + #include + + #include ++#include + + PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) : + QGroupBox(parent), +diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp +index 93882c09a377a5630e8bb09b4e80d7f6a84f7293..8460db2e966a0f572478de7430b8b63f4473dd16 100644 +--- a/ui/qt/time_shift_dialog.cpp ++++ b/ui/qt/time_shift_dialog.cpp +@@ -14,6 +14,7 @@ + #include + #include + ++#include + + TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) : + QDialog(parent), +diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp +index bd9076abcf4a5d7b6fd73d2bc0b63b4fff8c256a..46fb2dd2f3054f66380239106fb2e27058196447 100644 +--- a/ui/qt/wireless_frame.cpp ++++ b/ui/qt/wireless_frame.cpp +@@ -23,6 +23,7 @@ + #include + + #include ++#include + + // To do: + // - Disable or hide invalid channel types. diff --git a/net-analyzer/wireshark/wireshark-2.6.1.ebuild b/net-analyzer/wireshark/wireshark-2.6.1.ebuild index 0303f97755a..1efd67dc6fe 100644 --- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild +++ b/net-analyzer/wireshark/wireshark-2.6.1.ebuild @@ -91,6 +91,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch "${FILESDIR}"/${PN}-2.6.0-qtsvg.patch "${FILESDIR}"/${PN}-2.6.0-redhat.patch + "${FILESDIR}"/${PN}-2.6.1-Qt-5.11.patch "${FILESDIR}"/${PN}-99999999-androiddump.patch )