[SCM] qtlocation packaging branch, experimental, updated. debian/5.9.0+dfsg-1-2-g144422b

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtlocation.git;a=commitdiff;h=144422b

The following commit has been merged in the experimental branch:
commit 144422bec30918b4e5061c19df640ee461297b90
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jun 18 15:37:03 2017 +0300

    Drop fix_qtdeclarative_private_code.patch.
    
    It was only needed with qtdeclarative 5.9.0 beta 3.
---
 debian/changelog                                   |  3 +++
 .../patches/fix_qtdeclarative_private_code.patch   | 30 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index df08be6..eace8ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtlocation-opensource-src (5.9.0+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Drop fix_qtdeclarative_private_code.patch, it was only needed with
+    qtdeclarative 5.9.0 beta 3.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 18 Jun 2017 15:36:06 +0300
 
diff --git a/debian/patches/fix_qtdeclarative_private_code.patch b/debian/patches/fix_qtdeclarative_private_code.patch
deleted file mode 100644
index 18af036..0000000
--- a/debian/patches/fix_qtdeclarative_private_code.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit ccd098330f2be230733107c3c6b15e05771f7150
-Author: Simon Quigley <tsimonq2 at ubuntu.com>
-Date:   Sat Jun 10 22:23:08 2017 -0500
-
-    Revert "Fix compile due to change in private API in qtdeclarative"
-
-    This patch should only be in the packaging until qtdeclarative final
-    gets out of the NEW queue.
-
-diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
-index 9f4dae3f..45d84470 100644
---- a/src/location/declarativemaps/qdeclarativegeomap.cpp
-+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp
-@@ -2139,12 +2139,11 @@ bool QDeclarativeGeoMap::sendMouseEvent(QMouseEvent *event)
-
- bool QDeclarativeGeoMap::sendTouchEvent(QTouchEvent *event)
- {
--    QQuickPointerDevice *touchDevice = QQuickPointerDevice::touchDevice(event->device());
-+    const QQuickPointerDevice *touchDevice = QQuickPointerDevice::touchDevice(event->device());
-     const QTouchEvent::TouchPoint &point = event->touchPoints().first();
--    QQuickWindowPrivate *windowPriv = QQuickWindowPrivate::get(window());
-
--    auto touchPointGrabberItem = [touchDevice, windowPriv](const QTouchEvent::TouchPoint &point) -> QQuickItem* {
--        if (QQuickEventPoint *eventPointer = windowPriv->pointerEventInstance(touchDevice)->pointById(point.id()))
-+    auto touchPointGrabberItem = [touchDevice](const QTouchEvent::TouchPoint &point) -> QQuickItem* {
-+        if (QQuickEventPoint *eventPointer = touchDevice->pointerEvent()->pointById(point.id()))
-             return eventPointer->grabber();
-         return nullptr;
-     };
-
diff --git a/debian/patches/series b/debian/patches/series
index 3c9a2e4..726d5ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 disable_failing_tests.patch
-fix_qtdeclarative_private_code.patch

-- 
qtlocation packaging