Pull request 20130423
cover Pull request 20130423
Hello,
The patch that comes as a follow-up of this message fix a compile error when building uicmoc-native with GCC-4.7.
The modifications are done on top of the master branch in the meta-opie layer, and tested by building uicmoc-native from scratch.
Please pull into the meta-opie layer.
The following changes since commit c242efc6ca55772a88602f1f8f94dff697b38430:
layer.conf: use ??= to set variables (2013-03-25 22:42:32 +0000)
are available in the git repository at:
git://seketeli.fr/~apelete/meta-opie.git fix-uicmoc-build
Apelete Seketeli (1):
uicmoc: fix compile issue with GCC-4.7
recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.7.patch | 11 +++++++++++ recipes-qt/uicmoc/uicmoc_2.3.10.bb | 1 + 2 files changed, 12 insertions(+) create mode 100644 recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.7.patch
Signature · 1 line
1.7.10.4
PATCH 1/1 uicmoc: fix compile issue with GCC-4.7
Fix compile issue found when building uicmoc-native with GCC-4.7. Though it was detected with version 4.7, the problem may appear with an earlier version of GCC-4.x.
--- recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.7.patch | 11 +++++++++++ recipes-qt/uicmoc/uicmoc_2.3.10.bb | 1 + 2 files changed, 12 insertions(+) create mode 100644 recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.7.patch
recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.7.patch new file +11 -0
@@ -0,0 +1,11 @@ +--- qt-2.3.10/src/tools/qvaluestack.h.orig 2013-04-23 21:04:50.373589050 +0200 ++++ qt-2.3.10/src/tools/qvaluestack.h 2013-04-23 21:33:48.857599178 +0200 +@@ -49,7 +49,7 @@ + public: + QValueStack() {} + ~QValueStack() {} +- void push( const T& d ) { append(d); } ++ void push( const T& d ) { this->append(d); } + T pop() + { + T elem( this->last() );
recipes-qt/uicmoc/uicmoc_2.3.10.bb +1 -0
@@ -9,6 +9,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ file://gcc3_4.patch \ file://gcc4.patch \ file://gcc4_1.patch \ + file://gcc4.7.patch \ file://64bit-cleanup.patch \ file://kernel-asm-page.patch" S = "${WORKDIR}/qt-${PV}"
Signature · 1 line
1.7.10.4