diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-04-05 10:42:52 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-06 12:10:51 -0700 |
commit | ea738ee3d3999b1696d70ce7684b96cf4a26e9e6 (patch) | |
tree | 28b05898115984c8b6504e985f591001bbfbe99b /meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch | |
parent | 21f483a90456ba25c9d00bbb7505cc791c572c71 (diff) | |
download | poky-ea738ee3d3999b1696d70ce7684b96cf4a26e9e6.tar.gz |
qt4: replace 4.7.1 with version 4.7.2
Qt 4.7.2 is a bugfix release for the 4.7 series - more details here:
http://qt.nokia.com/developer/changes/changes-4.7.2/
This was prompted by the equivalent change in OE, however the change was
redone by hand. There are no changes to the recipes themselves other than
updating SRC_URI checksums and resetting PR.
(From OE-Core rev: e8a3686ec108f6095bafa5b601c9f763bc39c123)
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.1/hack-out-pg2-4.7.0.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch deleted file mode 100644 index 5c588ff0f7..0000000000 --- a/meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
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 | ||