diff options
| author | Oyvind Repvik <nail@nslu2-linux.org> | 2005-07-14 13:30:43 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-14 13:30:43 +0000 |
| commit | 2a87d84f3ef7a44edf05f7f73762ef58107e66f3 (patch) | |
| tree | f1b79945aee6a5112fbbd14915459e68f226356c /packages | |
| parent | 6b1a50e77050d8d0e5ccb230a10240bd1a85a323 (diff) | |
| parent | 63048702254b15cd3fadf3bc81c6b6ee4707de43 (diff) | |
propagate from branch 'org.openembedded.dev' (head fb87c6675723cb138a41ecb1b79ceae9fcd25754)
to branch 'org.openembedded.nslu2-linux' (head d32f204f274e9d1d693eb680d1de4e3807521227)
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/abiword/abiword_2.0.14.bb | 2 | ||||
| -rw-r--r-- | packages/abiword/abiword_2.2.7.bb | 4 | ||||
| -rw-r--r-- | packages/uicmoc/uicmoc-native-2.3.10/gcc4.patch | 12 | ||||
| -rw-r--r-- | packages/uicmoc/uicmoc-native_2.3.10.bb | 3 |
4 files changed, 17 insertions, 4 deletions
diff --git a/packages/abiword/abiword_2.0.14.bb b/packages/abiword/abiword_2.0.14.bb index 2b17edb4d8..e79da688ae 100644 --- a/packages/abiword/abiword_2.0.14.bb +++ b/packages/abiword/abiword_2.0.14.bb @@ -1,6 +1,6 @@ DESCRIPTION = "AbiWord Word Processor" -DEPENDS = "cdump-native libfribidi enchant jpeg libpng perl glibc" +DEPENDS = "cdump-native libfribidi enchant jpeg libpng perl glibc libxml2" RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" diff --git a/packages/abiword/abiword_2.2.7.bb b/packages/abiword/abiword_2.2.7.bb index 58098b797f..de857a4abc 100644 --- a/packages/abiword/abiword_2.2.7.bb +++ b/packages/abiword/abiword_2.2.7.bb @@ -3,10 +3,10 @@ HOMEPAGE="http://www.abiword.org"" MAINTAINER="Koen Kooi <koen@handhelds.org>" LICENSE="GPLv2" -DEPENDS = "cdump-native libglade libfribidi enchant jpeg libpng perl glibc" +DEPENDS = "cdump-native libglade libfribidi enchant jpeg libpng perl glibc libxml2" RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" -PR="r2" +PR="r3" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://cdump-hack.patch;patch=1" diff --git a/packages/uicmoc/uicmoc-native-2.3.10/gcc4.patch b/packages/uicmoc/uicmoc-native-2.3.10/gcc4.patch new file mode 100644 index 0000000000..633fe86c29 --- /dev/null +++ b/packages/uicmoc/uicmoc-native-2.3.10/gcc4.patch @@ -0,0 +1,12 @@ +--- qt-2.3.10/src/kernel/qwindowsystem_qws.h.orig 2005-07-13 20:23:30.061728456 +0100 ++++ qt-2.3.10/src/kernel/qwindowsystem_qws.h 2005-07-13 20:37:57.183905848 +0100 +@@ -168,6 +168,9 @@ + class QWSMouseHandler; + struct QWSCommandStruct; + ++class QWSInputMethod; ++class QWSGestureMethod; ++ + #ifndef QT_NO_QWS_MULTIPROCESS + class QWSServer : public QWSServerSocket + #else diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb index 7d39cc15eb..a596ec6824 100644 --- a/packages/uicmoc/uicmoc-native_2.3.10.bb +++ b/packages/uicmoc/uicmoc-native_2.3.10.bb @@ -7,7 +7,8 @@ PR = "r0" 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://gcc3_4.patch;patch=1" \ + file://gcc4.patch;patch=1" S = "${WORKDIR}/qt-${PV}" inherit native qmake-base |