From b0862a5cf2ba2878e7fefa5193acae3a82ea46fd Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 26 Sep 2012 20:13:11 +0200 Subject: qt4: move patches from files to qt4-4.8.1 * faster lookup in FILESPATH as small bonus (From OE-Core rev: 8cc54d2d154b2ed9f931da39d75dc9c135f5e26d) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- .../qt4-4.8.1/0006-freetype-host-includes.patch | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch') diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch new file mode 100644 index 0000000000..effc5f14d0 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch @@ -0,0 +1,25 @@ +From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Mon, 4 Jun 2007 14:48:50 +0200 +Subject: [PATCH] freetype host includes + +Host include path should not be used in cross compiling case. + +Ported from OE by: Yu Ke +Upstream-Status: Pending + +--- + config.tests/unix/freetype/freetype.pri | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri 2009-02-25 22:32:32.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri 2009-03-26 17:14:16.000000000 +0100 +@@ -1,5 +1,5 @@ + !cross_compile { +- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH ++ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH + # LSB doesn't allow using headers from /include or /usr/include + linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH + for(p, TRY_INCLUDEPATHS) { -- cgit v1.2.3-54-g00ecf