summaryrefslogtreecommitdiff
path: root/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-05-12 15:11:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-16 15:18:45 +0100
commit57b3cbf2b7b8a716481cb3efb68b7e4c08af6703 (patch)
treebf2d1e510a8360ef762c461c5b59f10de8a20fb5 /meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
parent00e30eba2f9970ec229f2702a73d6b3fd7d0d1b5 (diff)
downloadopenembedded-core-57b3cbf2b7b8a716481cb3efb68b7e4c08af6703.tar.gz
openembedded-core-57b3cbf2b7b8a716481cb3efb68b7e4c08af6703.tar.bz2
openembedded-core-57b3cbf2b7b8a716481cb3efb68b7e4c08af6703.tar.xz
openembedded-core-57b3cbf2b7b8a716481cb3efb68b7e4c08af6703.zip
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
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.patch19
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 000000000..5c588ff0f
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
@@ -0,0 +1,19 @@
+Index: qt-everywhere-opensource-src-4.7.0/configure
+===================================================================
+--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400
++++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400
+@@ -4921,10 +4921,10 @@
+ psql)
+ if [ "$CFG_SQL_psql" != "no" ]; then
+ # Be careful not to use native pg_config when cross building.
+- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
+- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
+- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
+- fi
++# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
++# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
++# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
++# fi
+ [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
+ [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
+ # But, respect PSQL_LIBS if set