summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-27 12:21:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-27 12:21:43 +0100
commitec2f6e1fb655289f5ef51f2b1fa86d5fedccfc61 (patch)
tree59140a2792ff6845b028474385a45379ea3cc6b2 /meta
parentc98d60923b84bcd285644cecaed1fa0455747a2f (diff)
downloadopenembedded-core-ec2f6e1fb655289f5ef51f2b1fa86d5fedccfc61.tar.gz
openembedded-core-ec2f6e1fb655289f5ef51f2b1fa86d5fedccfc61.tar.bz2
openembedded-core-ec2f6e1fb655289f5ef51f2b1fa86d5fedccfc61.zip
qt4: Add missing patch headers
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch4
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch4
2 files changed, 8 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch b/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch
index d49d7bcff2..6efbaf5d97 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch
+++ b/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch
@@ -1,6 +1,10 @@
Disable the -fuse-ld=gold flag. This option is a Debian/Ubuntu specific
extension to the g++ and causes upstream GCC to throw an error.
+Upstream-Status: Pending
+
+Signed-off-by: Ken Werner <ken.werner@linaro.org>
+
Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
===================================================================
--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/webkit/Source/common.pri
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch b/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch
index 8252817af1..47618cfde1 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch
+++ b/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch
@@ -1,5 +1,9 @@
Fix compile error when using toolchains based on GCC 4.7.
+Upstream-Status: Pending
+
+Signed-off-by: Ken Werner <ken.werner@linaro.org>
+
Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
===================================================================
--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h