diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-05-23 09:12:35 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-05-23 09:12:35 +0000 |
| commit | ea1f4abc2d35e40392047ee24f76f6aeb37e1e86 (patch) | |
| tree | 8ad9e6bc456cc832f44bccbccb75503282f87b74 | |
| parent | 12e1f90c669bced20c398d304193775600c1ac69 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages
2004/05/23 01:40:00+02:00 uni-frankfurt.de!mickeyl
add more stuff to opie-image and regroup a few things
2004/05/22 23:48:02+02:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages
2004/05/22 23:16:51+02:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages
2004/05/22 23:06:40+02:00 uni-frankfurt.de!mickeyl
make pyqwt no longer apply the sip-staging-patch
BKrev: 40b06b03mFday80aqNYfS2HaBMptQQ
| -rw-r--r-- | meta/opie-image.oe | 18 | ||||
| -rw-r--r-- | python/python-pyqwt-3.10/qtmod-sip-staging.patch | 16 | ||||
| -rw-r--r-- | python/python-pyqwt_3.10.oe | 1 |
3 files changed, 10 insertions, 25 deletions
diff --git a/meta/opie-image.oe b/meta/opie-image.oe index cf623fea5e..4321c6cc74 100644 --- a/meta/opie-image.oe +++ b/meta/opie-image.oe @@ -14,8 +14,9 @@ OPIE_BASE = "opie-pics opie-qcop opie-quicklauncher opie-taskbar" OPIE_BASE_APPLETS = "opie-aboutapplet opie-clockapplet opie-logoutapplet opie-suspendapplet \ opie-batteryapplet opie-homeapplet opie-multikeyapplet opie-rotateapplet \ - opie-volumeapplet opie-clipboardapplet opie-irdaapplet opie-restartapplet \ - opie-screenshotapplet opie-vtapplet opie-cardmon " + opie-vtapplet opie-cardmon opie-irdaapplet" + +OPIE_BASE_INPUTMETHODS = "opie-multikey opie-handwriting" OPIE_BASE_APPS = "opie-aqpkg opie-console" @@ -26,18 +27,19 @@ OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished" OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh opie-style-metal" OPIE_BASE_DEPENDS = "ipkg ntp" -OPIE_BASE_RDEPENDS = "ntpdate" +OPIE_BASE_RDEPENDS = "ntpdate opie-handwriting-classicset" + # # Additional things for a standard 16MB distribution # -OPIE_PIM = "opie-alarm opie-addressbook opie-datebook opie-textedit opie-todo opie-today" +OPIE_PIM = "opie-alarm opie-addressbook opie-drawpad opie-datebook opie-textedit opie-todo opie-today" -OPIE_EXTRA_APPLETS = "" +OPIE_EXTRA_APPLETS = "opie-clipboardapplet opie-volumeapplet opie-screenshotapplet" OPIE_EXTRA_APPS = "opie-advancedfm" -OPIE_EXTRA_SETTINGS = "" +OPIE_EXTRA_SETTINGS = "opie-language opie-launcher-settings opie-doctab opie-security opie-mediummount" # # Putting it altogether. Better state IPKG_INSTALL and DEPENDS twice, because library names != package names. @@ -45,11 +47,11 @@ OPIE_EXTRA_SETTINGS = "" export IPKG_INSTALL = "task-bootstrap ${OPIE_LIBS} ${OPIE_BASE} ${OPIE_BASE_APPLETS} ${OPIE_BASE_SETTINGS} ${OPIE_BASE_APPS} \ ${OPIE_BASE_RDEPENDS} ${OPIE_PIM} ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS} \ - ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS}" + ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} ${OPIE_BASE_INPUTMETHODS}" DEPENDS = "task-bootstrap ${OPIE_LIBS_DEPEND} ${OPIE_BASE} ${OPIE_BASE_APPLETS} ${OPIE_BASE_SETTINGS} ${OPIE_BASE_APPS} \ ${OPIE_BASE_DEPENDS} ${OPIE_PIM} ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS} \ - ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS}" + ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} ${OPIE_BASE_INPUTMETHODS}" inherit image_ipk diff --git a/python/python-pyqwt-3.10/qtmod-sip-staging.patch b/python/python-pyqwt-3.10/qtmod-sip-staging.patch deleted file mode 100644 index bb90bc10ce..0000000000 --- a/python/python-pyqwt-3.10/qtmod-sip-staging.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- PyQwt-20040118/sip/qwtmod.sip~qtmod-sip-staging 2004-02-14 15:48:17.000000000 +0100 -+++ PyQwt-20040118/sip/qwtmod.sip 2004-02-14 15:52:49.000000000 +0100 -@@ -34,7 +34,7 @@ - - %Include features.sip - --%Import qt/qtmod.sip -+%Import qtmod.sip - - %ModuleHeaderCode - #include <qwt_python.h> diff --git a/python/python-pyqwt_3.10.oe b/python/python-pyqwt_3.10.oe index 6d89f9f62c..beaaf2a8a0 100644 --- a/python/python-pyqwt_3.10.oe +++ b/python/python-pyqwt_3.10.oe @@ -9,7 +9,6 @@ SRCNAME = "pyqwt" SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \ file://qt2.x-compat.patch;patch=1 \ - file://qtmod-sip-staging.patch;patch=1 \ file://features" S = "${WORKDIR}/PyQwt-20040118" |