Patchwork [meta-opie,1/1] uicmoc: fix compile issue with GCC-4.7

login
register
mail settings
Submitter Apelete Seketeli
Date April 23, 2013, 9:48 p.m.
Message ID <05bfb679afd9d4f22f794adf1b8aa85bdb58b04c.1366753073.git.apelete@seketeli.net>
Download mbox | patch
Permalink /patch/48719/
State Accepted, archived
Headers show

Comments

Apelete Seketeli - April 23, 2013, 9:48 p.m.
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.

Signed-off-by: Apelete Seketeli <apelete@seketeli.net>
---
 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

Patch

diff --git a/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.7.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.7.patch
new file mode 100644
index 0000000..ad09bfe
--- /dev/null
+++ b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.7.patch
@@ -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() );
diff --git a/recipes-qt/uicmoc/uicmoc_2.3.10.bb b/recipes-qt/uicmoc/uicmoc_2.3.10.bb
index ca6a7a1..0588436 100644
--- a/recipes-qt/uicmoc/uicmoc_2.3.10.bb
+++ b/recipes-qt/uicmoc/uicmoc_2.3.10.bb
@@ -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}"