diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-05-17 15:51:01 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-18 14:32:48 +0100 |
commit | 18b0adee1e79577b99eb4bdbcf43e749c8616719 (patch) | |
tree | 9eb370b0e04f4b60bbee7066bd7233b1fa824b57 /meta/recipes-qt/qt4/qt-4.7.3 | |
parent | 0f574ccf07fd35fb3a8a9ddf01b5fd1ce6865cad (diff) | |
download | poky-18b0adee1e79577b99eb4bdbcf43e749c8616719.tar.gz |
qt4: add comments and Upstream-Status to all patches
(From OE-Core rev: 5eed81039f33b846303a2032afcf832709b18210)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.7.3')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch | 5 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch index 71a04a59d2..f302c5bd61 100644 --- a/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch +++ b/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch | |||
@@ -1,8 +1,11 @@ | |||
1 | From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001 | 1 | From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com> | 2 | From: Matthias GΓΌnther <matgnt@gmail.com> |
3 | Date: Wed, 12 May 2010 16:52:45 +0200 | 3 | Date: Wed, 12 May 2010 16:52:45 +0200 |
4 | Subject: [PATCH 1/9] Added Openembedded "-crossarch" option | 4 | Subject: [PATCH 1/9] Added Openembedded "-crossarch" option |
5 | 5 | ||
6 | Original Author: Michael Lauer <mickey@vanille-media.de> | ||
7 | Upstream-Status: Pending | ||
8 | |||
6 | --- | 9 | --- |
7 | configure | 7 ++++++- | 10 | configure | 7 ++++++- |
8 | 1 files changed, 6 insertions(+), 1 deletions(-) | 11 | 1 files changed, 6 insertions(+), 1 deletions(-) |
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch index 5c588ff0f7..39c5f4a32c 100644 --- a/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch +++ b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch | |||
@@ -1,3 +1,15 @@ | |||
1 | Hack to not use the pg_config of the host system which will add /usr/include | ||
2 | |||
3 | pg_config is a native binary so using that when cross compiling | ||
4 | will always fail. The commented out fix would do, but for OE | ||
5 | our -platform and -xplatform is the same so we are actually not | ||
6 | really cross compiling. Just comment out the test, we are passing | ||
7 | the location to the postgres headers and if they are okay we | ||
8 | will pad. | ||
9 | |||
10 | Original Author: Holger Hans Peter Freyther <zecke@selfish.org> | ||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
1 | Index: qt-everywhere-opensource-src-4.7.0/configure | 13 | Index: qt-everywhere-opensource-src-4.7.0/configure |
2 | =================================================================== | 14 | =================================================================== |
3 | --- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400 | 15 | --- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400 |