diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 21:18:02 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:17 +0100 |
| commit | b9fc4928bb93ad720c47920db3869d860c531d0a (patch) | |
| tree | cee44ff93d2434f967b66d1ffa4876355703e6b1 /meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch | |
| parent | 054a0e6c850f92c03fbb6314702de4e6318ccd25 (diff) | |
| download | openembedded-core-contrib-b9fc4928bb93ad720c47920db3869d860c531d0a.tar.gz | |
qt4: add 4.8.3 version with negative D_P
* rebased patches, 3 patches are resolved upstream:
0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
resolved in upstream commit 7ac8d8597db1f58b11338f91fb27f6ad8696b34b
0022-webkit-fix-conflicting-types.patch
resolved in upstream commit929b4443d53fcf3a7ad1cb9f3af5569e41ef56f1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch new file mode 100644 index 0000000000..60acb803a4 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch @@ -0,0 +1,29 @@ +From 95cbbdaaf543bb5747b535b5e4b02114f3d821d6 Mon Sep 17 00:00:00 2001 +From: Michael Krelin <hacker@klever.net> +Date: Mon, 4 Jun 2007 14:48:50 +0200 +Subject: [PATCH 11/20] freetype host includes + +Host include path should not be used in cross compiling case. + +Ported from OE by: Yu Ke <ke.yu@intel.com> +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + config.tests/unix/freetype/freetype.pri | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri +index 7ef1cf9..b362fcd 100644 +--- a/config.tests/unix/freetype/freetype.pri ++++ b/config.tests/unix/freetype/freetype.pri +@@ -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) { +-- +1.7.12 + |