[oe-commits] Richard Purdie : qt4: Add missing patch headers
git at git.openembedded.org
git at git.openembedded.org
Fri Apr 27 11:29:58 UTC 2012
Module: openembedded-core.git
Branch: master-next
Commit: ec2f6e1fb655289f5ef51f2b1fa86d5fedccfc61
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ec2f6e1fb655289f5ef51f2b1fa86d5fedccfc61
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Fri Apr 27 12:21:43 2012 +0100
qt4: Add missing patch headers
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../qt4/qt-4.8.1/disable-fuse-gold-flag.patch | 4 ++++
meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch | 4 ++++
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 d49d7bc..6efbaf5 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 at 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 8252817..47618cf 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 at 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
More information about the Openembedded-commits
mailing list