diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-03-24 10:28:25 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-24 10:28:25 +0000 |
| commit | 29897e4068b700d0a3258d16184b86d239f9169b (patch) | |
| tree | 225db3137e7f0eac3841b242659f78803e0a1735 /packages | |
| parent | 5d85e7fc4152bc8b9478738ae2de60c7933dad7c (diff) | |
| parent | a579c9f67fe7a324fc798b25a4bf6695f01d7193 (diff) | |
merge of bcb91ddbe21b7a5889fe98f3853d19ddcb2471cb
and ff499565cdf6658417de4beeeba44d618266fd0d
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/uicmoc/uicmoc-native-2.3.10/gcc4_1.patch | 16 | ||||
| -rw-r--r-- | packages/uicmoc/uicmoc-native_2.3.10.bb | 5 |
2 files changed, 19 insertions, 2 deletions
diff --git a/packages/uicmoc/uicmoc-native-2.3.10/gcc4_1.patch b/packages/uicmoc/uicmoc-native-2.3.10/gcc4_1.patch new file mode 100644 index 0000000000..550effd7ba --- /dev/null +++ b/packages/uicmoc/uicmoc-native-2.3.10/gcc4_1.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- qt-2.3.10/src/tools/qvaluestack.h~gcc4 2005-01-23 15:00:47.000000000 +0100 ++++ qt-2.3.10/src/tools/qvaluestack.h 2006-03-19 02:32:56.000000000 +0100 +@@ -54,7 +54,7 @@ + { + T elem( this->last() ); + if ( !this->isEmpty() ) +- remove( this->fromLast() ); ++ this->remove( this->fromLast() ); + return elem; + } + T& top() { return this->last(); } diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb index ca959c1579..db884e166a 100644 --- a/packages/uicmoc/uicmoc-native_2.3.10.bb +++ b/packages/uicmoc/uicmoc-native_2.3.10.bb @@ -3,12 +3,13 @@ SECTION = "devel" PRIORITY = "optional" LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ file://fix-makefile.patch;patch=1 \ file://gcc3_4.patch;patch=1" \ - file://gcc4.patch;patch=1" + file://gcc4.patch;patch=1 \ + file://gcc4_1.patch;patch=1" S = "${WORKDIR}/qt-${PV}" inherit native qmake-base |