[oe] [meta-qt / branch jansa/qt5-5.2.0][PATCH 1/1] qtbase: fix paths in packageconfig *.pc files

[Andreas Müller]

include- and lib-paths contained build-sysroot paths

Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
---
 .../0020-fix-paths-in-packageconfig-files.patch    | 42 ++++++++++++++++++++++
 recipes-qt/qt5/qtbase_git.bb                       |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 recipes-qt/qt5/qtbase-git/0020-fix-paths-in-packageconfig-files.patch

diff --git a/recipes-qt/qt5/qtbase-git/0020-fix-paths-in-packageconfig-files.patch b/recipes-qt/qt5/qtbase-git/0020-fix-paths-in-packageconfig-files.patch
new file mode 100644
index 0000000..8e7842b
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0020-fix-paths-in-packageconfig-files.patch
@@ -0,0 +1,42 @@
+From c5768c394beac79f9e888f6afbd47c8dac37eb50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at googlemail.com>
+Date: Thu, 19 Dec 2013 18:04:57 +0100
+Subject: [PATCH] fix paths in packageconfig files
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts parts of:
+
+enable path replacement in installed prl files on all platforms
+
+Task-number: QTBUG-33794
+Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b
+Reviewed-by: Joerg Bornemann <joerg.bornemann at digia.com>
+
+Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
+---
+ mkspecs/features/qt_module.prf | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
+index f9dfb01..2f95684 100644
+--- a/mkspecs/features/qt_module.prf
++++ b/mkspecs/features/qt_module.prf
+@@ -164,8 +164,11 @@ QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
+ 
+ unix|win32-g++* {
+    CONFIG += create_pc
+-   QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace
+-   QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace
++   host_build: \
++       QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS]
++   else: \
++       QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw]
++   QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]
+    QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME
+    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+    QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
+-- 
+1.8.3.1
+
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 07bf28a..5ca50e8 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -26,6 +26,7 @@ SRC_URI += "\
     file://0017-enables-tslib-device-to-be-read-from-env-variable.patch \
     file://0018-qtbase-allow-build-of-examples.patch \
     file://0019-QOpenGLPaintDevice-sub-area-support.patch \
+    file://0020-fix-paths-in-packageconfig-files.patch \
 "
 
 SRCREV = "313a74cc4a9a5d200b2059d3d8767fe1a274c50d"
-- 
1.8.3.1