commit:     b20acc01a86c9be6ddfc0ba4f23d4a16fa3f3325
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 20:48:08 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> 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 <QDataStream>
- #include "qtlocalpeer.h"
- #include <QCoreApplication>
- #include <QTime>

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

Reply via email to