From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A3337138206 for ; Thu, 28 Apr 2016 13:25:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E163E085D; Thu, 28 Apr 2016 13:25:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68880E085D for ; Thu, 28 Apr 2016 13:25:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E2FD3409E2 for ; Thu, 28 Apr 2016 13:25:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A683C32F for ; Thu, 28 Apr 2016 13:25:32 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1461826636.b20acc01a86c9be6ddfc0ba4f23d4a16fa3f3325.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: www-client/qupzilla/files/, www-client/qupzilla/ X-VCS-Repository: proj/qt X-VCS-Files: www-client/qupzilla/files/qtsingleapplication-QDataStream.patch www-client/qupzilla/qupzilla-9999.ebuild X-VCS-Directories: www-client/qupzilla/files/ www-client/qupzilla/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: b20acc01a86c9be6ddfc0ba4f23d4a16fa3f3325 X-VCS-Branch: master Date: Thu, 28 Apr 2016 13:25:32 +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: fe8b2c84-0406-4754-a10e-397cb1ff3957 X-Archives-Hash: 8d42bcac3f55360d2101cc8880b4dac2 commit: b20acc01a86c9be6ddfc0ba4f23d4a16fa3f3325 Author: Jimi Huotari gentoo org> AuthorDate: Tue Apr 26 20:48:08 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Thu Apr 28 06:57:16 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b20acc01 www-client/qupzilla: Remove unneeded patch. A fix for building with 5.5 has been implemented upstream: https://github.com/QupZilla/qupzilla/ commit/05fcc3565800425d9dc1feb001839a77dc52753d Package-Manager: portage-2.2.28 .../qupzilla/files/qtsingleapplication-QDataStream.patch | 10 ---------- www-client/qupzilla/qupzilla-9999.ebuild | 3 --- 2 files changed, 13 deletions(-) diff --git a/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch b/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch deleted file mode 100644 index 25694af..0000000 --- a/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp.ORIG 2015-05-07 18:29:35.045402873 +0200 -+++ src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp 2015-05-07 18:33:04.942404927 +0200 -@@ -39,6 +39,7 @@ - ****************************************************************************/ - - -+#include - #include "qtlocalpeer.h" - #include - #include diff --git a/www-client/qupzilla/qupzilla-9999.ebuild b/www-client/qupzilla/qupzilla-9999.ebuild index 0f7ffb7..d8d8631 100644 --- a/www-client/qupzilla/qupzilla-9999.ebuild +++ b/www-client/qupzilla/qupzilla-9999.ebuild @@ -65,9 +65,6 @@ src_prepare() { rm translations/${1}.ts || die } - # patch bundled but changed QTSA for Qt-5.5, see bugs 548470 and 489142 - epatch "${FILESDIR}"/qtsingleapplication-QDataStream.patch - epatch_user # remove outdated prebuilt localizations