summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-05-10 18:39:35 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-05-10 18:40:11 +0200
commitacd0ddbca7c809bd883e4c06ec1e0ca7ca3b8125 (patch)
tree3496e3809458d66e794b1e3727c69df431176257 /dev-qt/qtgui/files
parentscons-utils.eclass: Revert EAPI 7 pending further changes (diff)
downloadgentoo-acd0ddbca7c809bd883e4c06ec1e0ca7ca3b8125.tar.gz
gentoo-acd0ddbca7c809bd883e4c06ec1e0ca7ca3b8125.tar.bz2
gentoo-acd0ddbca7c809bd883e4c06ec1e0ca7ca3b8125.zip
dev-qt: Drop unused patches
Diffstat (limited to 'dev-qt/qtgui/files')
-rw-r--r--dev-qt/qtgui/files/qtgui-5.7.1-qclipboard.patch39
-rw-r--r--dev-qt/qtgui/files/qtgui-5.7.1-x32.patch34
2 files changed, 0 insertions, 73 deletions
diff --git a/dev-qt/qtgui/files/qtgui-5.7.1-qclipboard.patch b/dev-qt/qtgui/files/qtgui-5.7.1-qclipboard.patch
deleted file mode 100644
index 42ee58b611fe..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.7.1-qclipboard.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 291eba6f8099a0fec8fbd9cf8a1fb67e5c9f4f8d Mon Sep 17 00:00:00 2001
-From: Palo Kisa <palo.kisa@gmail.com>
-Date: Mon, 7 Nov 2016 18:27:17 +0100
-Subject: QClipboard: Fix emitting changed() in XCB
-
-In XCB environment the QClipboard::changed() was not delivered if the
-QClipboard::clear() was issued by other Qt app/process.
-
-If the QClipboard::clear() is used, then the owner in
-xcb_xfixes_selection_notify_event_t is XCB_NONE, so we need make the
-decission to handle this event by the selection_timestamp and our
-m_timestamp[mode].
-
-Task-number: QTBUG-56972
-Change-Id: If4c486ac02223eac506465cac7ff1a07bd02a187
-Reviewed-by: Lars Knoll <lars.knoll@qt.io>
----
- src/plugins/platforms/xcb/qxcbclipboard.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp
-index d44ebae..40abef4 100644
---- a/src/plugins/platforms/xcb/qxcbclipboard.cpp
-+++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp
-@@ -723,8 +723,10 @@ void QXcbClipboard::handleXFixesSelectionRequest(xcb_xfixes_selection_notify_eve
- if (mode > QClipboard::Selection)
- return;
-
-- // here we care only about the xfixes events that come from non Qt processes
-- if (event->owner != XCB_NONE && event->owner != owner()) {
-+ // Note1: Here we care only about the xfixes events that come from other processes.
-+ // Note2: If the QClipboard::clear() is issued, event->owner is XCB_NONE,
-+ // so we check selection_timestamp to not handle our own QClipboard::clear().
-+ if (event->owner != owner() && event->selection_timestamp > m_timestamp[mode]) {
- if (!m_xClipboard[mode]) {
- m_xClipboard[mode].reset(new QXcbClipboardMime(mode, this));
- } else {
---
-cgit v1.0-4-g1e03
diff --git a/dev-qt/qtgui/files/qtgui-5.7.1-x32.patch b/dev-qt/qtgui/files/qtgui-5.7.1-x32.patch
deleted file mode 100644
index 9cfc29d1d088..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.7.1-x32.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 92805a0e9c488e47280e93f65e5378818e340ad1 Mon Sep 17 00:00:00 2001
-From: Laszlo Agocs <laszlo.agocs@qt.io>
-Date: Mon, 7 Nov 2016 11:23:21 +0100
-Subject: Fix EGL break on Debian X32
-
-Change to QT_POINTER_SIZE instead of Q_PROCESSOR_WORDSIZE. The latter
-is 8 due to targeting 64-bit, but pointers are 32-bit still in such
-builds. For the condition in question it is the pointer size that
-matters.
-
-Task-number: QTBUG-56686
-Change-Id: I96c203cae91ceb8404606de605c4fdb1a02a9d5f
-Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- src/platformsupport/eglconvenience/qt_egl_p.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/platformsupport/eglconvenience/qt_egl_p.h b/src/platformsupport/eglconvenience/qt_egl_p.h
-index 615ee4b80a..b1495c9f9d 100644
---- a/src/platformsupport/eglconvenience/qt_egl_p.h
-+++ b/src/platformsupport/eglconvenience/qt_egl_p.h
-@@ -83,7 +83,7 @@ struct QtEglConverter<uint32_t, uintptr_t>
- { return v; }
- };
-
--#if Q_PROCESSOR_WORDSIZE > 4
-+#if QT_POINTER_SIZE > 4
- template <>
- struct QtEglConverter<uintptr_t, uint32_t>
- {
---
-cgit v1.1-6-g87c4
-