[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.0+dfsg-1-257-gb51360c
Simon Quigley
tsimonq2-guest at moszumanska.debian.org
Sun Jun 11 23:58:32 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=b51360c
The following commit has been merged in the ubuntu+1 branch:
commit b51360cafd0182ace762174331403a51f31f3937
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date: Sun Jun 11 07:55:16 2017 -0500
Remove a couple of patches not specified in debian/patches/series.
---
debian/changelog | 5 ++
debian/patches/armv4.diff | 26 ------
.../patches/xcb-Fix-drag-and-drop-to-Emacs.patch | 35 --------
...g-and-drop-to-applications-like-Emacs-and.patch | 98 ----------------------
4 files changed, 5 insertions(+), 159 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4b1c72b..78c4931 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,11 @@ qtbase-opensource-src (5.9.0+dfsg-1ubuntu1) UNRELEASED; urgency=medium
- global_menu_shortcuts.diff
- Add-support-for-selecting-the-printer-plugin-via-the.patch
- Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch
+ * Remove the following patches from the tree that were not specified in the
+ series file:
+ - armv4.diff
+ - xcb-Fix-drag-and-drop-to-Emacs.patch
+ - xcb-Fix-drag-and-drop-to-applications-like-Emacs-and.patch
* Change build deps from 5.8.0 to 5.7.1 because 5.8.0 never made it in
Ubuntu.
diff --git a/debian/patches/armv4.diff b/debian/patches/armv4.diff
deleted file mode 100644
index 987ad42..0000000
--- a/debian/patches/armv4.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: support ARMv4 architecture, needed for armel builds
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: no
-Last-Update: 2016-07-01
-
---- a/src/corelib/global/qprocessordetection.h
-+++ b/src/corelib/global/qprocessordetection.h
-@@ -130,6 +130,8 @@
- # elif defined(__ARM_ARCH_5TEJ__) \
- || defined(__ARM_ARCH_5TE__)
- # define Q_PROCESSOR_ARM 5
-+# elif defined(__ARM_ARCH_4T__)
-+# define Q_PROCESSOR_ARM 4
- # else
- # define Q_PROCESSOR_ARM 0
- # endif
-@@ -144,6 +146,9 @@
- # endif
- # if Q_PROCESSOR_ARM >= 5
- # define Q_PROCESSOR_ARM_V5
-+# endif
-+# if Q_PROCESSOR_ARM >= 4
-+# define Q_PROCESSOR_ARM_V4
- # else
- # error "ARM architecture too old"
- # endif
diff --git a/debian/patches/xcb-Fix-drag-and-drop-to-Emacs.patch b/debian/patches/xcb-Fix-drag-and-drop-to-Emacs.patch
deleted file mode 100644
index 159987d..0000000
--- a/debian/patches/xcb-Fix-drag-and-drop-to-Emacs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 427a0fc9bc3481626da250efe5229186ab8847d4 Mon Sep 17 00:00:00 2001
-From: Urs Fleisch <ufleisch at users.sourceforge.net>
-Date: Sun, 1 May 2016 14:31:48 +0200
-Subject: [PATCH] xcb: Fix drag and drop to Emacs.
-
-Unfortunately, the improved patch for QTBUG-45812 fixed things for
-Chromium, but did no longer work for Emacs. This fixes commit [269fdb]
-to make it work for both Emacs and Chromium.
-
-Task-number: QTBUG-45812
-Change-Id: I2fca708503f27679681bc6959de1ad94943a063e
----
- src/plugins/platforms/xcb/qxcbdrag.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp
-index f1428d0..529f91e 100644
---- a/src/plugins/platforms/xcb/qxcbdrag.cpp
-+++ b/src/plugins/platforms/xcb/qxcbdrag.cpp
-@@ -1134,10 +1134,10 @@ void QXcbDrag::handleSelectionRequest(const xcb_selection_request_event_t *event
- at = findTransactionByWindow(event->requestor);
- }
-
-- if (at == -1 && event->time == XCB_CURRENT_TIME) {
-+ if (at == -1) {
- xcb_window_t target = findXdndAwareParent(connection(), event->requestor);
- if (target) {
-- if (current_target == target)
-+ if (event->time == XCB_CURRENT_TIME && current_target == target)
- at = -2;
- else
- at = findTransactionByWindow(target);
---
-2.7.4
-
diff --git a/debian/patches/xcb-Fix-drag-and-drop-to-applications-like-Emacs-and.patch b/debian/patches/xcb-Fix-drag-and-drop-to-applications-like-Emacs-and.patch
deleted file mode 100644
index 9e89ba5..0000000
--- a/debian/patches/xcb-Fix-drag-and-drop-to-applications-like-Emacs-and.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 269fdbdd2bedda5f5eacb751224d3a3fc3eed5bc Mon Sep 17 00:00:00 2001
-From: Urs Fleisch <ufleisch at users.sourceforge.net>
-Date: Fri, 26 Feb 2016 17:46:09 +0100
-Subject: [PATCH] xcb: Fix drag and drop to applications like Emacs and
- Chromium.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Drops without matching time stamp do not work. I have fixed the issue by
-reanimating the findXdndAwareParent() function (adapted to XCB) and
-using it to find a matching transaction if all else fails.
-
-Task-number: QTBUG-45812
-Change-Id: Ibca15bbab02ccf2f25280418e9edf36972ebf9a0
-Reviewed-by: Błażej Szczygieł <spaz16 at wp.pl>
-Reviewed-by: Dmitry Shachnev <mitya57 at gmail.com>
-Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
----
- src/plugins/platforms/xcb/qxcbdrag.cpp | 55 +++++++++++++++++++++++++++-------
- 1 file changed, 44 insertions(+), 11 deletions(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp
-index f5cc873..f1428d0 100644
---- a/src/plugins/platforms/xcb/qxcbdrag.cpp
-+++ b/src/plugins/platforms/xcb/qxcbdrag.cpp
-@@ -1072,6 +1072,40 @@ void QXcbDrag::cancel()
- send_leave();
- }
-
-+// find an ancestor with XdndAware on it
-+static xcb_window_t findXdndAwareParent(QXcbConnection *c, xcb_window_t window)
-+{
-+ xcb_window_t target = 0;
-+ forever {
-+ // check if window has XdndAware
-+ xcb_get_property_cookie_t gpCookie = Q_XCB_CALL(
-+ xcb_get_property(c->xcb_connection(), false, window,
-+ c->atom(QXcbAtom::XdndAware), XCB_GET_PROPERTY_TYPE_ANY, 0, 0));
-+ xcb_get_property_reply_t *gpReply = xcb_get_property_reply(
-+ c->xcb_connection(), gpCookie, 0);
-+ bool aware = gpReply && gpReply->type != XCB_NONE;
-+ free(gpReply);
-+ if (aware) {
-+ target = window;
-+ break;
-+ }
-+
-+ // try window's parent
-+ xcb_query_tree_cookie_t qtCookie = Q_XCB_CALL(
-+ xcb_query_tree_unchecked(c->xcb_connection(), window));
-+ xcb_query_tree_reply_t *qtReply = xcb_query_tree_reply(
-+ c->xcb_connection(), qtCookie, NULL);
-+ if (!qtReply)
-+ break;
-+ xcb_window_t root = qtReply->root;
-+ xcb_window_t parent = qtReply->parent;
-+ free(qtReply);
-+ if (window == root)
-+ break;
-+ window = parent;
-+ }
-+ return target;
-+}
-
- void QXcbDrag::handleSelectionRequest(const xcb_selection_request_event_t *event)
- {
-@@ -1099,17 +1133,16 @@ void QXcbDrag::handleSelectionRequest(const xcb_selection_request_event_t *event
- // xcb_convert_selection() that we sent the XdndDrop event to.
- at = findTransactionByWindow(event->requestor);
- }
--// if (at == -1 && event->time == XCB_CURRENT_TIME) {
--// // previous Qt versions always requested the data on a child of the target window
--// // using CurrentTime... but it could be asking for either drop data or the current drag's data
--// Window target = findXdndAwareParent(event->requestor);
--// if (target) {
--// if (current_target && current_target == target)
--// at = -2;
--// else
--// at = findXdndDropTransactionByWindow(target);
--// }
--// }
-+
-+ if (at == -1 && event->time == XCB_CURRENT_TIME) {
-+ xcb_window_t target = findXdndAwareParent(connection(), event->requestor);
-+ if (target) {
-+ if (current_target == target)
-+ at = -2;
-+ else
-+ at = findTransactionByWindow(target);
-+ }
-+ }
- }
-
- QDrag *transactionDrag = 0;
---
-2.7.4
-
--
qtbase packaging
More information about the pkg-kde-commits
mailing list