From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: www-client/qupzilla/files/, www-client/qupzilla/
Date: Thu, 28 Apr 2016 13:25:32 +0000 (UTC) [thread overview]
Message-ID: <1461826636.b20acc01a86c9be6ddfc0ba4f23d4a16fa3f3325.pesa@gentoo> (raw)
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
next reply other threads:[~2016-04-28 13:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-28 13:25 Davide Pesavento [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-08-22 9:22 [gentoo-commits] proj/qt:master commit in: www-client/qupzilla/files/, www-client/qupzilla/ Ben de Groot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461826636.b20acc01a86c9be6ddfc0ba4f23d4a16fa3f3325.pesa@gentoo \
--to=pesa@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox