[SCM] qtbase packaging branch, ubuntu+1, updated. ubuntu/5.6.1+dfsg-3ubuntu2-7-g2e2ce39

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=2e2ce39

The following commit has been merged in the ubuntu+1 branch:
commit 2e2ce3980eb059f387cb7753c6a2ca62b2834317
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Aug 24 13:06:53 2016 +0000

    hard code the cross compilation pkg-config command for the ubuntu armhf qmake.conf
---
 debian/changelog                             | 2 +-
 debian/patches/qt5-qmake-arm-linux-gnueabihf | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 180769c..6ecd93f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ qtbase-opensource-src (5.6.1+dfsg-3ubuntu3) UNRELEASED; urgency=medium
   * debian/patches/xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch:
     - Fix drag and drop from Qt to skype (LP: #1586857)
   * debian/patches/qt5-qmake-arm-linux-gnueabihf:
-    - Support manual cross-compilation inside chroot (LP: #1580981) 
+    - Support cross-compilation inside chroot using pkg-config (LP: #1580981)
   * debian/patches/Make-sure-connection-is-not-null-before-using-it.patch:
     - Fix unity8 crasher (LP: #1612309)
 
diff --git a/debian/patches/qt5-qmake-arm-linux-gnueabihf b/debian/patches/qt5-qmake-arm-linux-gnueabihf
index aec8e9b..245d152 100644
--- a/debian/patches/qt5-qmake-arm-linux-gnueabihf
+++ b/debian/patches/qt5-qmake-arm-linux-gnueabihf
@@ -21,7 +21,7 @@ Last-Update: <YYYY-MM-DD>
 
 --- /dev/null
 +++ qtbase-opensource-src/mkspecs/ubuntu-arm-gnueabihf-g++/qmake.conf
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,33 @@
 +#
 +# qmake configuration for building with arm-linux-gnueabi-g++
 +#
@@ -51,8 +51,7 @@ Last-Update: <YYYY-MM-DD>
 +QMAKE_STRIP             = arm-linux-gnueabihf-strip
 +QMAKE_LIBDIR            = /usr/lib/arm-linux-gnueabihf
 +
-+contains(DISTRO_OPTS, deb-multi-arch): \
-+ PKG_CONFIG = $${CROSS_COMPILE}pkg-config
++ PKG_CONFIG = arm-linux-gnueabihf-pkg-config
 +
 +load(qt_config)
 +QMAKE_DEFAULT_INCDIRS   = /usr/include/arm-linux-gnueabihf/c++/4.9 /usr/include/arm-linux-gnueabihf/c++/4.9/backward /usr/include/arm-linux-gnueabihf

-- 
qtbase packaging