| 1 |
commit: b20acc01a86c9be6ddfc0ba4f23d4a16fa3f3325 |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 26 20:48:08 2016 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 28 06:57:16 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b20acc01 |
| 7 |
|
| 8 |
www-client/qupzilla: Remove unneeded patch. |
| 9 |
|
| 10 |
A fix for building with 5.5 has been implemented upstream: |
| 11 |
|
| 12 |
https://github.com/QupZilla/qupzilla/ |
| 13 |
commit/05fcc3565800425d9dc1feb001839a77dc52753d |
| 14 |
|
| 15 |
Package-Manager: portage-2.2.28 |
| 16 |
|
| 17 |
.../qupzilla/files/qtsingleapplication-QDataStream.patch | 10 ---------- |
| 18 |
www-client/qupzilla/qupzilla-9999.ebuild | 3 --- |
| 19 |
2 files changed, 13 deletions(-) |
| 20 |
|
| 21 |
diff --git a/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch b/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch |
| 22 |
deleted file mode 100644 |
| 23 |
index 25694af..0000000 |
| 24 |
--- a/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch |
| 25 |
+++ /dev/null |
| 26 |
@@ -1,10 +0,0 @@ |
| 27 |
---- src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp.ORIG 2015-05-07 18:29:35.045402873 +0200 |
| 28 |
-+++ src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp 2015-05-07 18:33:04.942404927 +0200 |
| 29 |
-@@ -39,6 +39,7 @@ |
| 30 |
- ****************************************************************************/ |
| 31 |
- |
| 32 |
- |
| 33 |
-+#include <QDataStream> |
| 34 |
- #include "qtlocalpeer.h" |
| 35 |
- #include <QCoreApplication> |
| 36 |
- #include <QTime> |
| 37 |
|
| 38 |
diff --git a/www-client/qupzilla/qupzilla-9999.ebuild b/www-client/qupzilla/qupzilla-9999.ebuild |
| 39 |
index 0f7ffb7..d8d8631 100644 |
| 40 |
--- a/www-client/qupzilla/qupzilla-9999.ebuild |
| 41 |
+++ b/www-client/qupzilla/qupzilla-9999.ebuild |
| 42 |
@@ -65,9 +65,6 @@ src_prepare() { |
| 43 |
rm translations/${1}.ts || die |
| 44 |
} |
| 45 |
|
| 46 |
- # patch bundled but changed QTSA for Qt-5.5, see bugs 548470 and 489142 |
| 47 |
- epatch "${FILESDIR}"/qtsingleapplication-QDataStream.patch |
| 48 |
- |
| 49 |
epatch_user |
| 50 |
|
| 51 |
# remove outdated prebuilt localizations |
Archives