Drop unused patch.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

3 files changed, 22 insertions, 350 deletions

diff --git a/dev-qt/qtwidgets/ChangeLog b/dev-qt/qtwidgets/ChangeLog
index 5435cfe6fe9d..339c550bdfa4 100644
--- a/dev-qt/qtwidgets/ChangeLog
+++ b/dev-qt/qtwidgets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtwidgets
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/ChangeLog,v 1.10 2015/02/03 11:04:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/ChangeLog,v 1.11 2015/02/18 18:21:53 pesa Exp $
+
+  18 Feb 2015; Davide Pesavento <pesa@gentoo.org>
+  -files/qtwidgets-5.3.1-prefer-qpa.patch:
+  Drop unused patch.
 
   03 Feb 2015; Jeroen Roovers <jer@gentoo.org> qtwidgets-5.4.0.ebuild:
   Marked ~hppa too.
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 0743dd04ab8e..1cf3536b8346 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,15 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX qtwidgets-5.3.1-prefer-qpa.patch 11173 SHA256 15f803723f91ee9346b3d4d94e8082bc646e6a1c45eeac7da8c8edfa76134e7a SHA512 f6a99ae3e655cec116696d56aacfd5d737726deadaffdeae9d6658291c845f7a98ae3a76678506233926b38e04118c6c83b678b1ed6354720e208ab1abff52b8 WHIRLPOOL 43f9985c423d0688577ccac5606c65ecc9173c5dba7e5d86d933db0fc16d8e6e5a95c24cf0740858438731d005e0710f5a178b823a95080fbde4c334b18dc55a
 DIST qtbase-opensource-src-5.4.0.tar.xz 46109688 SHA256 daea240ba5e77bc2d78ec21a2cb664eed83b3d4ad409b6277a6f7d4c0c8e91d1 SHA512 abab8f342301957555ee2f3c6f4fd8e2bfd98aca5a40bd4aea313f30f706d4f900c62d835f48eb736b79c87af9cd88f52ba71cdc4770546c8560d8d2aa8f2690 WHIRLPOOL 7d9c4ce9cb2c7a7c8dd3d0ade1aa1f140dadc5a723b4369fbd255cc248116ad1c0e26ca166e6e8b0a95979433c9b0a45007133aa9add226d398c9f23d41e852c
 EBUILD qtwidgets-5.4.0.ebuild 1142 SHA256 17bcdd0622392a55276c017e911470f181d77e43da53c7415db1b4ecc9d01058 SHA512 7c4752f4a80f10a2f2f31d5c9c8e44cc026be4857586c366eff8d903e4703b529b4fa906ee16e08bbc050b886a801ae6c2dd7004b4b0dca8cacab870aa8c0658 WHIRLPOOL 4488bb97285f21336229200c770c30149092b29c0e4c045359d8d81d237e98e54ee5ab213fbc981a4e9c421482be470703a5efca886ec7dec8a7e5a9d1b31b1e
-MISC ChangeLog 1148 SHA256 2adb65ed18c5299b05aca539700252c078d51035f9e24c2598c40464a613a079 SHA512 7ac7ab0440869519d99486169b73a4602c9ce6b055eb3ef0a4984a77f9ff99008119061da8381b1f4a6182689a71177e0b45125f78582766bd64c8fe546a9ed0 WHIRLPOOL 42dae30ed521e72debcad64ef148a079f0523bc36a6a0b6929918a201663a85a170d682cd02f808504cd4bc894af26831370859ca1bb367b17e353173d70de7a
+MISC ChangeLog 1264 SHA256 9698372c6a548748e455142f20d4766ea0f2c06a178537a81cefe84bb354155b SHA512 08107b695503104aab1f29267497d90801c7932b3ada79fa1968607076997827029557804ea62f9b8d8defe0245b0e04ce0c9419fa03a55932c28f976e76d198 WHIRLPOOL a861f542e4017ca0fed5fc1d8cf376acc9501f4ae27c3306fa2d232da5d8ec8d195617aa62e9ca68c8d6149cfc0f156c2112797a02bcc3b10e57d193ecdddc89
 MISC metadata.xml 355 SHA256 37c610fed4cc20451c5fd235290f613ee63a107010b6592dc5a4dcd5fdedd952 SHA512 12a6be02dc744fb7e1c713f443d4a65c0c74f03380cf68d9bd82f4e9df1c1d1f922359c215895d1da576b0e953a9673f722e1bb625ceaa96e37954f93d9cb45a WHIRLPOOL 3ea9c317e0458aa08ff6f149b40480a490ef91ef0855cbf28648ecc5aab284d8f1a8b9843c26150a0b24a1bac83d0c7bb47af4400f524624a32b382caa18074c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlTQqyMACgkQVWmRsqeSphNyLQCcCCFtj7TdFR98HdNHvMciOZTQ
-CBIAn3+TUHbjvmTT0+dFjSi8Ztf2tJ2x
-=E3tj
+iQJ8BAEBCABmBQJU5NhCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9Bz0P/1STFHnXjJdAWLPCbwE+uvOT
+ZnvUsMNsVhoOo8K+5DUBrLJInoINqA9ErjizFp6aDvwuhd2BMsCTDUNykzMqmIn+
+4u/8/UBOoPiRr8w3/Q9xadSqFGpBw4av6UjIMswSiRvV/fa+86WKtp0BFZ9PODrL
+UtP3ZzmabFQx7FPJokioeSsnpGxxLiA+rp94NTBLyiJjuw+vhho6kyqnQFzNabcu
+j4cQBEx908i72QPBLuSiNN9s2UHluJJzd+UeiISULNEzOZWnLNVkE7ZMXfD8iHfo
+g6pGdvbEdv6A4wr8Fs223Q6gblUpSHaXGe+TYOpsnyFwGJaJT69C21NmWNnZnEWm
+kZQIhbfyfXjzrDxnzD+4zDwM8NBb0mw3KidrWb7jKWVWsk/dGZiFWxsKXiAwGHUq
+rZNyAoFMRBIEW3ddGGx/dgXshQKWd0zrHjZSLBdeNQb0silOJ9ZAN6oYprRbNPhM
+kJZT/VhCCKVdXAMIrJQAaYgtpY/VEOw5UEJsbQaPb7qo7LrmU2wv48TdpICvNqvh
+WMHaUj1TmdEQVLdkIPuLTptsho+QmTMBriycJWJZ2O/S6m+wuaYi4gQ5z5fofdHj
+py6/94z6HGMa+7iEzHdm1c2aXrKTa+78s32LSJdOKGxil3RibXJfVMa7+dpKY8rp
+oHJ7GEYMc7yUKvRV7255
+=Xa0F
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch b/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch
deleted file mode 100644
index 2a5d130ae4ed..000000000000
--- a/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-From f1ee10f81ac18789e9a7dc715b464415ba2bc2b8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
-Date: Wed, 19 Feb 2014 11:01:44 +0100
-Subject: Prefer QPA implementation in qsystemtrayicon_x11 if available
-
-In order to have the possibility to provide a custom QSystemTrayIcon
-implementation in the platform theme instead of the X11 xembed based
-one, the qpa implementation needs to be called. This was not possible
-as qpa and x11 implementation were compile time mutual exclusive.
-
-This change moves the qpa implementation in the shared part and the
-methods in qsystemtrayicon_qpa just delegate to them. In addition the
-_x11 part tries to create a QPlatformSystemTrayIcon through the
-platform theme and if that succeeds the implementation prefers the qpa
-variant and delegates to the same methods.
-
-Change-Id: I6b33acac63524a77ebdce39af6eb74666f8c7561
-Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
-Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
----
- src/widgets/util/qsystemtrayicon.cpp     | 68 ++++++++++++++++++++++++++++++++
- src/widgets/util/qsystemtrayicon_p.h     |  9 +++++
- src/widgets/util/qsystemtrayicon_qpa.cpp | 51 +++++-------------------
- src/widgets/util/qsystemtrayicon_x11.cpp | 40 ++++++++++++++++++-
- 4 files changed, 126 insertions(+), 42 deletions(-)
-
-diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
-index f1a69e6..fa318f3 100644
---- a/src/widgets/util/qsystemtrayicon.cpp
-+++ b/src/widgets/util/qsystemtrayicon.cpp
-@@ -672,6 +672,74 @@ void QBalloonTip::timerEvent(QTimerEvent *e)
-     QWidget::timerEvent(e);
- }
- 
-+//////////////////////////////////////////////////////////////////////
-+void QSystemTrayIconPrivate::install_sys_qpa()
-+{
-+    qpa_sys->init();
-+    QObject::connect(qpa_sys, SIGNAL(activated(QPlatformSystemTrayIcon::ActivationReason)),
-+                     q_func(), SLOT(_q_emitActivated(QPlatformSystemTrayIcon::ActivationReason)));
-+    QObject::connect(qpa_sys, &QPlatformSystemTrayIcon::messageClicked,
-+                     q_func(), &QSystemTrayIcon::messageClicked);
-+    updateMenu_sys();
-+    updateIcon_sys();
-+    updateToolTip_sys();
-+}
-+
-+void QSystemTrayIconPrivate::remove_sys_qpa()
-+{
-+    qpa_sys->cleanup();
-+}
-+
-+QRect QSystemTrayIconPrivate::geometry_sys_qpa() const
-+{
-+    return qpa_sys->geometry();
-+}
-+
-+void QSystemTrayIconPrivate::updateIcon_sys_qpa()
-+{
-+    qpa_sys->updateIcon(icon);
-+}
-+
-+void QSystemTrayIconPrivate::updateMenu_sys_qpa()
-+{
-+    if (menu) {
-+        if (!menu->platformMenu()) {
-+            QPlatformMenu *platformMenu = qpa_sys->createMenu();
-+            if (platformMenu)
-+                menu->setPlatformMenu(platformMenu);
-+        }
-+        qpa_sys->updateMenu(menu->platformMenu());
-+    }
-+}
-+
-+void QSystemTrayIconPrivate::updateToolTip_sys_qpa()
-+{
-+    qpa_sys->updateToolTip(toolTip);
-+}
-+
-+void QSystemTrayIconPrivate::showMessage_sys_qpa(const QString &message,
-+                                                 const QString &title,
-+                                                 QSystemTrayIcon::MessageIcon icon,
-+                                                 int msecs)
-+{
-+    QIcon notificationIcon;
-+    switch (icon) {
-+    case QSystemTrayIcon::Information:
-+        notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation);
-+        break;
-+    case QSystemTrayIcon::Warning:
-+        notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning);
-+        break;
-+    case QSystemTrayIcon::Critical:
-+        notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical);
-+        break;
-+    default:
-+        break;
-+    }
-+    qpa_sys->showMessage(message, title, notificationIcon,
-+                     static_cast<QPlatformSystemTrayIcon::MessageIcon>(icon), msecs);
-+}
-+
- QT_END_NAMESPACE
- 
- #endif // QT_NO_SYSTEMTRAYICON
-diff --git a/src/widgets/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h
-index 211ef30..317664a 100644
---- a/src/widgets/util/qsystemtrayicon_p.h
-+++ b/src/widgets/util/qsystemtrayicon_p.h
-@@ -98,6 +98,15 @@ public:
-     QSystemTrayIconSys *sys;
-     QPlatformSystemTrayIcon *qpa_sys;
-     bool visible;
-+
-+private:
-+    void install_sys_qpa();
-+    void remove_sys_qpa();
-+    void updateIcon_sys_qpa();
-+    void updateToolTip_sys_qpa();
-+    void updateMenu_sys_qpa();
-+    QRect geometry_sys_qpa() const;
-+    void showMessage_sys_qpa(const QString &msg, const QString &title, QSystemTrayIcon::MessageIcon icon, int secs);
- };
- 
- class QBalloonTip : public QWidget
-diff --git a/src/widgets/util/qsystemtrayicon_qpa.cpp b/src/widgets/util/qsystemtrayicon_qpa.cpp
-index f98aeaf..045641c 100644
---- a/src/widgets/util/qsystemtrayicon_qpa.cpp
-+++ b/src/widgets/util/qsystemtrayicon_qpa.cpp
-@@ -65,28 +65,20 @@ QSystemTrayIconPrivate::~QSystemTrayIconPrivate()
- 
- void QSystemTrayIconPrivate::install_sys()
- {
--    if (qpa_sys) {
--        qpa_sys->init();
--        QObject::connect(qpa_sys, SIGNAL(activated(QPlatformSystemTrayIcon::ActivationReason)),
--                         q_func(), SLOT(_q_emitActivated(QPlatformSystemTrayIcon::ActivationReason)));
--        QObject::connect(qpa_sys, SIGNAL(messageClicked()),
--                         q_func(), SIGNAL(messageClicked()));
--        updateMenu_sys();
--        updateIcon_sys();
--        updateToolTip_sys();
--    }
-+    if (qpa_sys)
-+        install_sys_qpa();
- }
- 
- void QSystemTrayIconPrivate::remove_sys()
- {
-     if (qpa_sys)
--        qpa_sys->cleanup();
-+        remove_sys_qpa();
- }
- 
- QRect QSystemTrayIconPrivate::geometry_sys() const
- {
-     if (qpa_sys)
--        return qpa_sys->geometry();
-+        return geometry_sys_qpa();
-     else
-         return QRect();
- }
-@@ -94,25 +86,19 @@ QRect QSystemTrayIconPrivate::geometry_sys() const
- void QSystemTrayIconPrivate::updateIcon_sys()
- {
-     if (qpa_sys)
--        qpa_sys->updateIcon(icon);
-+        updateIcon_sys_qpa();
- }
- 
- void QSystemTrayIconPrivate::updateMenu_sys()
- {
--    if (qpa_sys && menu) {
--        if (!menu->platformMenu()) {
--            QPlatformMenu *platformMenu = qpa_sys->createMenu();
--            if (platformMenu)
--                menu->setPlatformMenu(platformMenu);
--        }
--        qpa_sys->updateMenu(menu->platformMenu());
--    }
-+    if (qpa_sys)
-+        updateMenu_sys_qpa();
- }
- 
- void QSystemTrayIconPrivate::updateToolTip_sys()
- {
-     if (qpa_sys)
--        qpa_sys->updateToolTip(toolTip);
-+        updateToolTip_sys_qpa();
- }
- 
- bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
-@@ -138,25 +124,8 @@ void QSystemTrayIconPrivate::showMessage_sys(const QString &message,
-                                              QSystemTrayIcon::MessageIcon icon,
-                                              int msecs)
- {
--    if (!qpa_sys)
--        return;
--
--    QIcon notificationIcon;
--    switch (icon) {
--    case QSystemTrayIcon::Information:
--        notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation);
--        break;
--    case QSystemTrayIcon::Warning:
--        notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning);
--        break;
--    case QSystemTrayIcon::Critical:
--        notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical);
--        break;
--    default:
--        break;
--    }
--    qpa_sys->showMessage(message, title, notificationIcon,
--                     static_cast<QPlatformSystemTrayIcon::MessageIcon>(icon), msecs);
-+    if (qpa_sys)
-+        showMessage_sys_qpa(message, title, icon, msecs);
- }
- 
- QT_END_NAMESPACE
-diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp
-index 347e570..27d0418 100644
---- a/src/widgets/util/qsystemtrayicon_x11.cpp
-+++ b/src/widgets/util/qsystemtrayicon_x11.cpp
-@@ -55,6 +55,9 @@
- #include <qscreen.h>
- #include <qbackingstore.h>
- #include <qpa/qplatformnativeinterface.h>
-+#include <qpa/qplatformsystemtrayicon.h>
-+#include <qpa/qplatformtheme.h>
-+#include <private/qguiapplication_p.h>
- #include <qdebug.h>
- 
- #ifndef QT_NO_SYSTEMTRAYICON
-@@ -209,16 +212,22 @@ void QSystemTrayIconSys::paintEvent(QPaintEvent *)
- 
- QSystemTrayIconPrivate::QSystemTrayIconPrivate()
-     : sys(0),
-+      qpa_sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon()),
-       visible(false)
- {
- }
- 
- QSystemTrayIconPrivate::~QSystemTrayIconPrivate()
- {
-+    delete qpa_sys;
- }
- 
- void QSystemTrayIconPrivate::install_sys()
- {
-+    if (qpa_sys) {
-+        install_sys_qpa();
-+        return;
-+    }
-     Q_Q(QSystemTrayIcon);
-     if (!sys && locateSystemTray()) {
-         sys = new QSystemTrayIconSys(q);
-@@ -229,6 +238,8 @@ void QSystemTrayIconPrivate::install_sys()
- 
- QRect QSystemTrayIconPrivate::geometry_sys() const
- {
-+    if (qpa_sys)
-+        return geometry_sys_qpa();
-     if (!sys)
-         return QRect();
-     return sys->globalGeometry();
-@@ -236,6 +247,10 @@ QRect QSystemTrayIconPrivate::geometry_sys() const
- 
- void QSystemTrayIconPrivate::remove_sys()
- {
-+    if (qpa_sys) {
-+        remove_sys_qpa();
-+        return;
-+    }
-     if (!sys)
-         return;
-     QBalloonTip::hideBalloon();
-@@ -246,17 +261,26 @@ void QSystemTrayIconPrivate::remove_sys()
- 
- void QSystemTrayIconPrivate::updateIcon_sys()
- {
-+    if (qpa_sys) {
-+        updateIcon_sys_qpa();
-+        return;
-+    }
-     if (sys)
-         sys->updateIcon();
- }
- 
- void QSystemTrayIconPrivate::updateMenu_sys()
- {
--
-+    if (qpa_sys)
-+        updateMenu_sys_qpa();
- }
- 
- void QSystemTrayIconPrivate::updateToolTip_sys()
- {
-+    if (qpa_sys) {
-+        updateToolTip_sys_qpa();
-+        return;
-+    }
-     if (!sys)
-         return;
- #ifndef QT_NO_TOOLTIP
-@@ -266,6 +290,11 @@ void QSystemTrayIconPrivate::updateToolTip_sys()
- 
- bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
- {
-+    QScopedPointer<QPlatformSystemTrayIcon> sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon());
-+    if (sys)
-+        return sys->isSystemTrayAvailable();
-+
-+    // no QPlatformSystemTrayIcon so fall back to default xcb platform behavior
-     const QString platform = QGuiApplication::platformName();
-     if (platform.compare(QStringLiteral("xcb"), Qt::CaseInsensitive) == 0)
-        return locateSystemTray();
-@@ -274,12 +303,21 @@ bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
- 
- bool QSystemTrayIconPrivate::supportsMessages_sys()
- {
-+    QScopedPointer<QPlatformSystemTrayIcon> sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon());
-+    if (sys)
-+        return sys->supportsMessages();
-+
-+    // no QPlatformSystemTrayIcon so fall back to default xcb platform behavior
-     return true;
- }
- 
- void QSystemTrayIconPrivate::showMessage_sys(const QString &message, const QString &title,
-                                    QSystemTrayIcon::MessageIcon icon, int msecs)
- {
-+    if (qpa_sys) {
-+        showMessage_sys_qpa(message, title, icon, msecs);
-+        return;
-+    }
-     if (!sys)
-         return;
-     const QPoint g = sys->globalGeometry().topLeft();
--- 
-2.0.0
-