qt4: replace all local patches with git patches with headers

* in preparation for upgrade to 4.8.3

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

34 files changed, 589 insertions, 388 deletions

diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index 542f3952f0..23308536ec 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -11,12 +11,12 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
 inherit nativesdk qmake2
 
 SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://0004-no-qmake.patch \
-           file://configure-lflags.patch \
-           file://qt-config.patch \
-           file://configure-paths.patch \
-           file://qt-dbus-const.patch \
-           file://target_qmake.patch \
+           file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+           file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \
+           file://0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch \
+           file://0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch \
+           file://0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch \
+           file://0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch \
            file://g++.conf \
            file://linux.conf"
 
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
index 42d2873f82..6d9800d259 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
@@ -2,7 +2,7 @@ require nativesdk-qt4-tools.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://qmake_pri_fixes.patch"
+SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch"
 
 SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
 SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8"
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1.inc b/meta/recipes-qt/qt4/qt4-4.8.1.inc
index ace665f49e..4cf1222e0e 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.1.inc
@@ -6,25 +6,25 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
 
 SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://0004-no-qmake.patch \
-           file://hack-out-pg2-4.7.0.patch \
-           file://0006-freetype-host-includes.patch \
-           file://0009-support-2bpp.patch \
-           file://0001-Added-Openembedded-crossarch-option.patch \
-           file://fix-translations.patch \
-           file://add_nostrip_for_debug_packages.diff \
-           file://qmake_cxx_eval.patch \
-           file://configure_oe_compiler.patch \
-           file://target_qmake.patch \
-           file://qmake_pri_fixes.patch \
-           file://pulseaudio-config.patch \
+           file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \
+           file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \
+           file://0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch \
+           file://0009-qmake-fix-source-file-references-in-qmake.pri.patch \
+           file://0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch \
+           file://0011-freetype-host-includes.patch \
+           file://0012-Add-2bpp-support.patch \
+           file://0013-configure-add-crossarch-option.patch \
+           file://0014-translations-fix-phony-translation-linking-error.patch \
+           file://0015-configure-add-nostrip-for-debug-packages.patch \
+           file://0016-configure-eval-QMAKE_CXX.patch \
+           file://0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch \
+           file://0018-configure-make-pulseaudio-a-configurable-option.patch \
+           file://0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch \
+           file://0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \
+           file://0021-webkit-disable-the-fuse-ld-gold-flag.patch \
+           file://0022-webkit-fix-conflicting-types.patch \
            file://g++.conf \
            file://linux.conf \
-           file://gcc47-fix.patch \
-           file://gcc47-fix2.patch \
-           file://disable-fuse-gold-flag.patch \
-           file://fix_conflicting_types.patch \
-           file://set-OUTPUT_DIR-if-empty.patch \
            "
 
 SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
new file mode 100644
index 0000000000..a3a8dae641
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -0,0 +1,43 @@
+From 51c37481a0c0ea946567ea2344107428e6d71590 Mon Sep 17 00:00:00 2001
+From: Holger Freyther <zecke@selfish.org>
+Date: Wed, 26 Sep 2012 17:22:30 +0200
+Subject: [PATCH 01/22] qlibraryinfo: allow to set qt.conf from the outside
+ using the environment
+
+Allow to set a qt.conf from the outside using the environment. This allows
+to inject new prefixes and other paths into qmake. This is needed when using
+the same qmake binary to build qt/x11 and qt/embedded
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/corelib/global/qlibraryinfo.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
+index 2862c2c..3a36b01 100644
+--- a/src/corelib/global/qlibraryinfo.cpp
++++ b/src/corelib/global/qlibraryinfo.cpp
+@@ -54,6 +54,7 @@
+ QT_BEGIN_NAMESPACE
+ extern QString qmake_libraryInfoFile();
+ QT_END_NAMESPACE
++#include <stdlib.h>
+ #else
+ # include "qcoreapplication.h"
+ #endif
+@@ -112,6 +113,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration()
+ #ifdef BOOTSTRAPPING
+     if(!QFile::exists(qtconfig))
+         qtconfig = qmake_libraryInfoFile();
++    if (!QFile::exists(qtconfig)) {
++        QByteArray config = getenv("QT_CONF_PATH");
++        qtconfig = QFile::decodeName(config);
++    }
+ #else
+     if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
+ #ifdef Q_OS_MAC
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/fix_qkbdtty_qws.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
index c2aed5ca0f..021a6de41f 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/fix_qkbdtty_qws.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
@@ -1,4 +1,7 @@
-Upstream-Status: Pending
+From 419b6a19d3d506880fa705682613eaaeb7dcd9cf Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <wenzong.fan@windriver.com>
+Date: Wed, 26 Sep 2012 20:18:08 +0200
+Subject: [PATCH 02/22] qkbdtty_qws: fix build with old kernel headers
 
 This issue is that with C++ compiler process an old version of kernel
 header file, coincidently that file has a variable named 'new':
@@ -9,11 +12,18 @@ header file, coincidently that file has a variable named 'new':
 
 On mostly hosts it has been changed to: new -> newev.
 
+Upstream-Status: Pending
+
 Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
-=======================================
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/gui/embedded/qkbdtty_qws.cpp | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
 diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp
---- a/src/gui/embedded/qkbdtty_qws.cpp	2012-07-27 13:16:58.420198350 +0800
-+++ b/src/gui/embedded/qkbdtty_qws.cpp	2012-07-27 13:24:43.924191127 +0800
+index f4b8461..4cee2e7 100644
+--- a/src/gui/embedded/qkbdtty_qws.cpp
++++ b/src/gui/embedded/qkbdtty_qws.cpp
 @@ -54,8 +54,20 @@
  
  #if defined Q_OS_LINUX
@@ -35,3 +45,6 @@ diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp
  #  include "qscreen_qws.h"
  #  include "qwindowsystem_qws.h"
  #  include "qapplication.h"
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
new file mode 100644
index 0000000000..859a037aa8
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
@@ -0,0 +1,34 @@
+From 96bee73bdf663ddeb2a5d48cab9c5e4df65ba295 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Tue, 1 May 2012 07:48:15 +0200
+Subject: [PATCH 03/22] webkit2: set OUTPUT_DIR value if empty
+
+Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem
+now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl
+
+First reported here:
+http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
+index 006a88c..5e17193 100644
+--- a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
++++ b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
+@@ -3,6 +3,8 @@ TARGET = dummy
+ 
+ CONFIG -= debug_and_release
+ 
++isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
++
+ CONFIG(standalone_package) {
+     isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
+     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
new file mode 100644
index 0000000000..e147375b7d
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
@@ -0,0 +1,29 @@
+From aa1788b0ec0b9b7c0e1a7c6bd9ef5c9555361014 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Wed, 26 Sep 2012 20:24:20 +0200
+Subject: [PATCH 04/22] configure: qmake is already built in qt4-tools-native,
+ so disable it
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index a706908..00b072a 100755
+--- a/configure
++++ b/configure
+@@ -4816,7 +4816,7 @@ END {
+ }
+ 
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+     echo "Creating qmake. Please wait..."
+ 
+     OLD_QCONFIG_H=
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch
deleted file mode 100644
index ed50c6df53..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Sat, 2 Jun 2007 16:06:59 +0200
-Subject: [PATCH] no qmake
-
-qmake is already built in qt4-tools-native, so disable it
-
-Ported from OE by: Yu Ke <ke.yu@intel.com>
-Upstream-Status: Inappropriate [configuration]
-
----
- configure |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: qt-embedded-linux-opensource-src-4.4.3/configure
-===================================================================
---- qt-embedded-linux-opensource-src-4.4.3.orig/configure	2009-03-26 17:03:43.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.4.3/configure	2009-03-26 17:04:17.000000000 +0100
-@@ -3786,7 +3786,7 @@
- }
- 
- # build qmake
--if true; then ###[ '!' -f "$outpath/bin/qmake" ];
-+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
-     echo "Creating qmake. Please wait..."
- 
-     OLD_QCONFIG_H=
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
new file mode 100644
index 0000000000..9171fa76dd
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
@@ -0,0 +1,28 @@
+From 1602cdf7f3bb548e63fca40b5bff8b9a75a144c5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
+Date: Wed, 26 Sep 2012 20:27:44 +0200
+Subject: [PATCH 05/22] configure: set LFLAGS to pick up zlib from staging
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 00b072a..b1ba542 100755
+--- a/configure
++++ b/configure
+@@ -611,7 +611,7 @@ fi
+ # initalize variables
+ #-------------------------------------------------------------------------------
+ 
+-SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
++SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
+ for varname in $SYSTEM_VARIABLES; do
+     qmakevarname="${varname}"
+     # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
index 45208ec415..51a6cfc51e 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
@@ -1,13 +1,22 @@
-Use OE_QMAKE_* values to specify Qt utility paths
+From 074881d57e5d7ad23a7a784a75f4ffebf091e543 Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Wed, 26 Sep 2012 20:29:09 +0200
+Subject: [PATCH 06/22] configure: Use OE_QMAKE_* values to specify Qt utility
+ paths
 
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
 Upstream-Status: Inappropriate [configuration]
 
-Index: qt-everywhere-opensource-src-4.6.3/configure
-===================================================================
---- qt-everywhere-opensource-src-4.6.3.orig/configure	2011-01-10 15:47:37.100607001 +0000
-+++ qt-everywhere-opensource-src-4.6.3/configure	2011-01-10 15:49:14.576606999 +0000
-@@ -7198,11 +7198,11 @@
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure b/configure
+index b1ba542..0231b7d 100755
+--- a/configure
++++ b/configure
+@@ -8517,11 +8517,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
  QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
  
  #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -24,3 +33,6 @@ Index: qt-everywhere-opensource-src-4.6.3/configure
  QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
  QMAKE_LIBDIR_QT  = \$\$QT_BUILD_TREE/lib
  
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
index 6ee402fdc1..010575828e 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
@@ -1,17 +1,26 @@
-Remove "const" usage that causes compile failure building nativesdk-qt4-tools
-
-Upstream-Status: Denied [possible retry]
+From ff6a714f8256c6d98234066ba1788bee234b25a1 Mon Sep 17 00:00:00 2001
+From: Pavel Heimlich <tropikhajma@gmail.com>
+Date: Wed, 26 Sep 2012 20:31:10 +0200
+Subject: [PATCH 07/22] dbus: Remove "const" usage that causes compile failure
+ building nativesdk-qt4-tools
 
 Patch has apparently been rejected upstream, not because it is invalid
 but because the submitter did not submit a merge request for it, so the
 validity of the patch upstream is uncertain. For further details see:
 http://bugreports.qt.nokia.com/browse/QTBUG-17962
 
-Original Author: Pavel Heimlich <tropikhajma at gmail.com>
+Upstream-Status: Denied [possible retry]
 
---- qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp.orig	2011-03-12 02:11:32.313467991 +0100
-+++ qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp	2011-03-12 02:11:03.795809176 +0100
-@@ -71,7 +71,7 @@
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/dbus/qdbusintegrator.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
+index 5d97a8e..5014b8b 100644
+--- a/src/dbus/qdbusintegrator.cpp
++++ b/src/dbus/qdbusintegrator.cpp
+@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
  static bool isDebugging;
  #define qDBusDebug              if (!::isDebugging); else qDebug
  
@@ -20,3 +29,6 @@ Original Author: Pavel Heimlich <tropikhajma at gmail.com>
  
  static inline QString dbusServiceString()
  { return *orgFreedesktopDBusString(); }
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/target_qmake.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
index 9b53aff172..57071c7167 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/target_qmake.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
@@ -1,17 +1,19 @@
-From e4b27237386b3dd864dd603de2ae54a707f5419f Mon Sep 17 00:00:00 2001
+From 049f44c260fb8956f0acf18355e3403638d2a084 Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Mon, 27 Feb 2012 00:13:05 +0000
-Subject: [PATCH] Allow building a separate qmake for the target
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Wed, 26 Sep 2012 20:32:41 +0200
+Subject: [PATCH 08/22] qmake.pro: Allow building a separate qmake for the
+ target
 
 Upstream-Status: Inappropriate [config]
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- qmake/qmake.pro |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ qmake/qmake.pro | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/qmake/qmake.pro b/qmake/qmake.pro
-index b602afa..b59f7fb 100644
+index 38e0fce..53b1ffb 100644
 --- a/qmake/qmake.pro
 +++ b/qmake/qmake.pro
 @@ -7,6 +7,7 @@ CONFIG += console bootstrap
@@ -23,5 +25,5 @@ index b602afa..b59f7fb 100644
  OBJECTS_DIR = .
  MOC_DIR = .
 -- 
-1.7.5.4
+1.7.12
 
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0009-qmake-fix-source-file-references-in-qmake.pri.patch
index 82bff04974..43072e0938 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0009-qmake-fix-source-file-references-in-qmake.pri.patch
@@ -1,7 +1,7 @@
-From c56ed5f64a5f47cf8d539aa4ca9bedbe1fea2264 Mon Sep 17 00:00:00 2001
+From e863f35a80b130d8b520cdb7c81112a601157c44 Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Fri, 10 Feb 2012 15:32:12 +0000
-Subject: [PATCH] qmake: fix source file references in qmake.pri
+Date: Wed, 26 Sep 2012 20:33:49 +0200
+Subject: [PATCH 09/22] qmake: fix source file references in qmake.pri
 
 Fix duplicate entries in SOURCES and HEADERS, and fix the source file
 list for the split of qlocale.cpp.
@@ -9,9 +9,10 @@ list for the split of qlocale.cpp.
 Upstream-Status: Pending
 
 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- qmake/qmake.pri |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ qmake/qmake.pri | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/qmake/qmake.pri b/qmake/qmake.pri
 index f2a3705..2d4e94c 100644
@@ -47,5 +48,5 @@ index f2a3705..2d4e94c 100644
          qmap.cpp \
          qmetatype.cpp \
 -- 
-1.7.5.4
+1.7.12
 
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
index 39c5f4a32c..38e3cdf60d 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
@@ -1,4 +1,8 @@
-Hack to not use the pg_config of the host system which will add /usr/include
+From 64c70ae60b96c940805ab50be3ce724df094eddc Mon Sep 17 00:00:00 2001
+From: Holger Freyther <zecke@selfish.org>
+Date: Wed, 26 Sep 2012 20:36:38 +0200
+Subject: [PATCH 10/22] configure: Hack to not use the pg_config of the host
+ system which will add /usr/include
 
 pg_config is a native binary so using that when cross compiling
 will always fail.  The commented out fix would do, but for OE
@@ -7,14 +11,18 @@ really cross compiling. Just comment out the test, we are passing
 the location to the postgres headers and if they are okay we
 will pad.
 
-Original Author: Holger Hans Peter Freyther <zecke@selfish.org>
 Upstream-Status: Inappropriate [configuration]
 
-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 @@
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 0231b7d..9650199f6 100755
+--- a/configure
++++ b/configure
+@@ -5362,10 +5362,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
          psql)
              if [ "$CFG_SQL_psql" != "no" ]; then
                  # Be careful not to use native pg_config when cross building.
@@ -29,3 +37,6 @@ Index: qt-everywhere-opensource-src-4.7.0/configure
                  [ -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
+-- 
+1.7.12
+
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0011-freetype-host-includes.patch
index effc5f14d0..7f6ff32289 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0011-freetype-host-includes.patch
@@ -1,21 +1,22 @@
-From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
+From 9b05106d0bdfa84e8406633d71206ef1defaade8 Mon Sep 17 00:00:00 2001
 From: Michael Krelin <hacker@klever.net>
 Date: Mon, 4 Jun 2007 14:48:50 +0200
-Subject: [PATCH] freetype host includes
+Subject: [PATCH 11/22] 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 files changed, 1 insertions(+), 1 deletions(-)
+ config.tests/unix/freetype/freetype.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri	2009-02-25 22:32:32.000000000 +0100
-+++ qt-embedded-linux-opensource-s