diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2015-06-02 09:52:57 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-08 17:30:50 +0100 |
| commit | 4d033fdc5e754e22edb2e9074e30e58847c4b791 (patch) | |
| tree | 85189088f467605738c715ae5b2dcdc78c729354 /meta/recipes-qt/qt4/qt4-4.8.6/0011-freetype-host-includes.patch | |
| parent | 3b1d89a51445cf526ca84eb5b53de434f9585d6e (diff) | |
| download | openembedded-core-contrib-4d033fdc5e754e22edb2e9074e30e58847c4b791.tar.gz | |
qt4: upgrade to 4.8.7
Upgrade qt4 packages from version 4.8.6 to 4.8.7.
* remove arm64 related patches which are merged
* remove 0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch
which is backported.
* update 0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
and 0013-configure-add-crossarch-option.patch for new version
* remove useless variable INC_PR
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.6/0011-freetype-host-includes.patch')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.6/0011-freetype-host-includes.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0011-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0011-freetype-host-includes.patch deleted file mode 100644 index e0879c5615..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.6/0011-freetype-host-includes.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3fcffa79e6a5f0448cbfe2bb33fe1218f5dae61d 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/21] 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.8.0 - |