diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-05-12 15:11:16 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-16 15:32:19 +0100 |
| commit | 0de1bd8d130ab684c549271c08b60f9ea172b92d (patch) | |
| tree | 2a1c4d3dac5685c13d86a871819142b2122a54a9 /meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch | |
| parent | a69153b46b76626a6cd4d578f6903c580a112044 (diff) | |
| download | poky-0de1bd8d130ab684c549271c08b60f9ea172b92d.tar.gz | |
qt4: update from 4.7.2 to 4.7.3
The Comodo certificates patch has been merged upstream so it no longer
needs to be applied. Some PR values were reset and SRC_URI checksums
updated but other than this there are no recipe changes.
(From OE-Core rev: 57b3cbf2b7b8a716481cb3efb68b7e4c08af6703)
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/hack-out-pg2-4.7.0.patch')
| -rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch | 19 |
1 files changed, 19 insertions, 0 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 new file mode 100644 index 0000000000..5c588ff0f7 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | Index: qt-everywhere-opensource-src-4.7.0/configure | ||
| 2 | =================================================================== | ||
| 3 | --- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400 | ||
| 4 | +++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400 | ||
| 5 | @@ -4921,10 +4921,10 @@ | ||
| 6 | psql) | ||
| 7 | if [ "$CFG_SQL_psql" != "no" ]; then | ||
| 8 | # Be careful not to use native pg_config when cross building. | ||
| 9 | - if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then | ||
| 10 | - QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` | ||
| 11 | - QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` | ||
| 12 | - fi | ||
| 13 | +# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then | ||
| 14 | +# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` | ||
| 15 | +# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` | ||
| 16 | +# fi | ||
| 17 | [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" | ||
| 18 | [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" | ||
| 19 | # But, respect PSQL_LIBS if set | ||