diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-03-19 01:37:05 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-19 01:37:05 +0000 |
| commit | 89d5937f9deb21493e356da573c432c2faab7371 (patch) | |
| tree | 91dba40e1ed978748c8cabb57d7fa8e3e38f3236 | |
| parent | 941bff95c3b80ea01c7fa0fdc8062ea04260b6fe (diff) | |
| parent | dacf6b8afe4dfec74a08e9dbcccb65c02fa0bfb7 (diff) | |
merge of 80f6af3e8d9657bdfa59fa62d84fe03c09d93944
and ba687e58e5920f60f96f8753b6d3e6dba22c0dad
| -rw-r--r-- | packages/qte/qte-2.3.10/gcc4.patch | 16 | ||||
| -rw-r--r-- | packages/qte/qte_2.3.10.bb | 3 |
2 files changed, 18 insertions, 1 deletions
diff --git a/packages/qte/qte-2.3.10/gcc4.patch b/packages/qte/qte-2.3.10/gcc4.patch new file mode 100644 index 0000000000..550effd7ba --- /dev/null +++ b/packages/qte/qte-2.3.10/gcc4.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/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index 363f8df00c..fc03ca216b 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -8,7 +8,7 @@ DEPENDS = "zlib libpng jpeg tslib uicmoc-native" DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" DEPENDS_append_c7x0 = " sharp-aticore-oss" PROVIDES = "virtual/qte virtual/libqte2" -PR = "r29" +PR = "r30" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5sum=af7ad30113afc500cab7f5b2f4dec0d7 \ file://qpe.patch;patch=1 \ @@ -16,6 +16,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m file://daemonize.patch;patch=1 \ file://no-moc.patch;patch=1 \ file://gcc3.patch;patch=1 \ + file://gcc4.patch;patch=1 \ file://c700-hardware.patch;patch=1 \ file://encoding.patch;patch=1 \ file://fix-qgfxraster.patch;patch=1 \ |