[SCM] qtbase packaging branch, experimental, updated. debian/5.6.0-beta+dfsg-3-20-g86db00b
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Wed Jan 6 17:21:39 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=86db00b
The following commit has been merged in the experimental branch:
commit 86db00b83d8e73972fe4d5767c11679f1d74bc07
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Wed Jan 6 20:21:23 2016 +0300
Refresh patches.
---
debian/changelog | 1 +
debian/patches/multiscreen.diff | 16 ++++++---------
..._dont_select_XInput_events_on_root_window.patch | 2 +-
...b_fix_drag_and_drop_when_window_is_hidden.patch | 24 +++++++++++-----------
4 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6afb726..45c1f33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtbase-opensource-src (5.6.0~beta+dfsg-4) UNRELEASED; urgency=medium
not present.
* Use wildcards instead of hardcoded ABI versions in Lintian overrides files.
* Merge 5.5.1+dfsg-11 and 5.5.1+dfsg-12 unstable uploads.
+ - Refresh patches.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 05 Jan 2016 21:05:06 +0300
diff --git a/debian/patches/multiscreen.diff b/debian/patches/multiscreen.diff
index 7633328..73a0262 100644
--- a/debian/patches/multiscreen.diff
+++ b/debian/patches/multiscreen.diff
@@ -20,10 +20,8 @@ Date: Sun Oct 25 01:11:28 2015 +0200
Change-Id: I3d76261c0c067293d39949c4428b2d8dfd085dc7
Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
-Index: qtbase/src/widgets/kernel/qdesktopwidget.cpp
-===================================================================
---- qtbase.orig/src/widgets/kernel/qdesktopwidget.cpp 2016-01-03 23:52:43.952944281 -0600
-+++ qtbase/src/widgets/kernel/qdesktopwidget.cpp 2016-01-03 23:52:43.948944297 -0600
+--- a/src/widgets/kernel/qdesktopwidget.cpp
++++ b/src/widgets/kernel/qdesktopwidget.cpp
@@ -36,6 +36,7 @@
#include "qdesktopwidget_p.h"
#include "qscreen.h"
@@ -56,7 +54,7 @@ Index: qtbase/src/widgets/kernel/qdesktopwidget.cpp
changedScreens.push_back(i);
}
virtualGeometry += screenGeometry;
-@@ -190,6 +196,21 @@
+@@ -191,6 +197,21 @@
if (!w)
return 0;
@@ -78,11 +76,9 @@ Index: qtbase/src/widgets/kernel/qdesktopwidget.cpp
QRect frame = w->frameGeometry();
if (!w->isWindow())
frame.moveTopLeft(w->mapToGlobal(QPoint(0, 0)));
-Index: qtbase/src/widgets/widgets/qmenu.cpp
-===================================================================
---- qtbase.orig/src/widgets/widgets/qmenu.cpp 2016-01-03 23:52:43.952944281 -0600
-+++ qtbase/src/widgets/widgets/qmenu.cpp 2016-01-03 23:52:43.948944297 -0600
-@@ -2494,7 +2494,11 @@
+--- a/src/widgets/widgets/qmenu.cpp
++++ b/src/widgets/widgets/qmenu.cpp
+@@ -2586,7 +2586,11 @@
Q_D(QMenu);
if (d->aboutToHide || d->mouseEventTaken(e))
return;
diff --git a/debian/patches/xcb_dont_select_XInput_events_on_root_window.patch b/debian/patches/xcb_dont_select_XInput_events_on_root_window.patch
index 8a66b58..820cbc8 100644
--- a/debian/patches/xcb_dont_select_XInput_events_on_root_window.patch
+++ b/debian/patches/xcb_dont_select_XInput_events_on_root_window.patch
@@ -29,7 +29,7 @@ Reviewed-by: Paul Olav Tvete <paul.tvete at theqtcompany.com>
--- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
-@@ -268,7 +268,7 @@ void QXcbConnection::finalizeXInput2()
+@@ -274,7 +274,7 @@
void QXcbConnection::xi2Select(xcb_window_t window)
{
diff --git a/debian/patches/xcb_fix_drag_and_drop_when_window_is_hidden.patch b/debian/patches/xcb_fix_drag_and_drop_when_window_is_hidden.patch
index 64f070f..3679aa7 100644
--- a/debian/patches/xcb_fix_drag_and_drop_when_window_is_hidden.patch
+++ b/debian/patches/xcb_fix_drag_and_drop_when_window_is_hidden.patch
@@ -23,7 +23,7 @@ Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
-@@ -488,6 +488,7 @@ QXcbConnection::QXcbConnection(QXcbNativ
+@@ -535,6 +535,7 @@
, has_xkb(false)
, m_buttons(0)
, m_focusWindow(0)
@@ -31,7 +31,7 @@ Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
, m_clientLeader(0)
, m_systemTrayTracker(0)
, m_glIntegration(Q_NULLPTR)
-@@ -1269,6 +1270,10 @@ void QXcbConnection::setFocusWindow(QXcb
+@@ -1328,6 +1329,10 @@
{
m_focusWindow = w;
}
@@ -44,7 +44,7 @@ Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
{
--- a/src/plugins/platforms/xcb/qxcbconnection.h
+++ b/src/plugins/platforms/xcb/qxcbconnection.h
-@@ -464,6 +464,8 @@ public:
+@@ -469,6 +469,8 @@
QXcbWindow *focusWindow() const { return m_focusWindow; }
void setFocusWindow(QXcbWindow *);
@@ -53,7 +53,7 @@ Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
QByteArray startupId() const { return m_startupId; }
void setStartupId(const QByteArray &nextId) { m_startupId = nextId; }
-@@ -637,6 +639,7 @@ private:
+@@ -647,6 +649,7 @@
Qt::MouseButtons m_buttons;
QXcbWindow *m_focusWindow;
@@ -63,9 +63,9 @@ Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
QByteArray m_startupId;
--- a/src/plugins/platforms/xcb/qxcbdrag.cpp
+++ b/src/plugins/platforms/xcb/qxcbdrag.cpp
-@@ -186,6 +186,8 @@ void QXcbDrag::startDrag()
- atom(QXcbAtom::XdndTypelist),
- XCB_ATOM_ATOM, 32, drag_types.size(), (const void *)drag_types.constData());
+@@ -194,6 +194,8 @@
+
+ setUseCompositing(current_virtual_desktop->compositingActive());
QBasicDrag::startDrag();
+ if (connection()->mouseGrabber() == Q_NULLPTR)
+ shapedPixmapWindow()->setMouseGrabEnabled(true);
@@ -74,7 +74,7 @@ Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
void QXcbDrag::endDrag()
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
-@@ -666,12 +666,16 @@ QXcbWindow::~QXcbWindow()
+@@ -594,12 +594,16 @@
{
if (window()->type() != Qt::ForeignWindow)
destroy();
@@ -91,7 +91,7 @@ Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
if (m_syncCounter && m_usingSyncProtocol)
Q_XCB_CALL(xcb_sync_destroy_counter(xcb_connection(), m_syncCounter));
-@@ -922,6 +926,9 @@ void QXcbWindow::hide()
+@@ -847,6 +851,9 @@
xcb_flush(xcb_connection());
@@ -101,7 +101,7 @@ Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
m_mapped = false;
}
-@@ -2399,6 +2406,8 @@ void QXcbWindow::handlePropertyNotifyEve
+@@ -2357,6 +2364,8 @@
QWindowSystemInterface::handleWindowStateChanged(window(), newState);
m_lastWindowStateEvent = newState;
m_windowState = newState;
@@ -110,7 +110,7 @@ Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
}
return;
} else if (event->atom == atom(QXcbAtom::_NET_FRAME_EXTENTS)) {
-@@ -2455,9 +2464,15 @@ bool QXcbWindow::setKeyboardGrabEnabled(
+@@ -2411,9 +2420,15 @@
bool QXcbWindow::setMouseGrabEnabled(bool grab)
{
@@ -128,7 +128,7 @@ Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
#endif
if (grab && !connection()->canGrab())
return false;
-@@ -2476,6 +2491,8 @@ bool QXcbWindow::setMouseGrabEnabled(boo
+@@ -2432,6 +2447,8 @@
xcb_grab_pointer_reply_t *reply = xcb_grab_pointer_reply(xcb_connection(), cookie, NULL);
bool result = !(!reply || reply->status != XCB_GRAB_STATUS_SUCCESS);
free(reply);
--
qtbase packaging
More information about the pkg-kde-commits
mailing list