diff options
30 files changed, 277 insertions, 63 deletions
diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf new file mode 100644 index 0000000000..15ec45f34e --- /dev/null +++ b/conf/distro/maemo-1.0.conf @@ -0,0 +1,40 @@ +include conf/distro/familiar.conf + +DISTRO = "maemo" +DISTRO_NAME = "Maemo Linux" +DISTRO_VERSION = "v1.0b-${DATE}" + +DISTRO_TYPE = "debug" +#DISTRO_TYPE = "release" + +FEED_URIS += " \ + base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ + updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" + +#CVSDATE = 20050331 + +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" + +#PREFERRED_VERSION_binutils-cross = "2.15.91.0.2" +#PREFERRED_VERSION_gcc-cross = "3.4.4" +#PREFERRED_VERSION_gcc-cross-initial = "3.4.4 +#PREFERRED_VERSION_libtool-native = "1.5.6" +#PREFERRED_VERSION_libtool-cross= "1.5.6" + +# +# GPE +# + +PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" +PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" +PREFERRED_PROVIDER_x11 = "diet-x11" + +include conf/distro/preferred-gpe-versions.inc + +# +# Maemo +# + +include conf/distro/maemo-preferred.inc diff --git a/conf/distro/maemo-preferred.inc b/conf/distro/maemo-preferred.inc new file mode 100644 index 0000000000..6a8c311837 --- /dev/null +++ b/conf/distro/maemo-preferred.inc @@ -0,0 +1,5 @@ +PREFERRED_PROVIDER_gconf = "gconf-osso" +PREFERRED_PROVIDER_tslib = "tslib-maemo" +PREFERRED_VERSION_dbus = "0.23.1-osso5" +PREFERRED_VERSION_audiofile = "0.2.6-3osso4" +PREFERRED_PROVIDER_esd = "osso-esd" diff --git a/packages/bluez-libs/bluez-libs_2.16.bb b/packages/bluez-libs/bluez-libs_2.17.bb index cf80d773e7..7a5df4ebe4 100644 --- a/packages/bluez-libs/bluez-libs_2.16.bb +++ b/packages/bluez-libs/bluez-libs_2.17.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" +PR = "r0" SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" diff --git a/packages/bluez-utils/bluez-utils-common_2.16.inc b/packages/bluez-utils/bluez-utils-common_2.17.inc index 69f9514695..69f9514695 100644 --- a/packages/bluez-utils/bluez-utils-common_2.16.inc +++ b/packages/bluez-utils/bluez-utils-common_2.17.inc diff --git a/packages/bluez-utils/bluez-utils-dbus_2.16.bb b/packages/bluez-utils/bluez-utils-dbus_2.17.bb index f405cd5133..f405cd5133 100644 --- a/packages/bluez-utils/bluez-utils-dbus_2.16.bb +++ b/packages/bluez-utils/bluez-utils-dbus_2.17.bb diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.16.bb b/packages/bluez-utils/bluez-utils-nodbus_2.17.bb index 6334a4a499..6334a4a499 100644 --- a/packages/bluez-utils/bluez-utils-nodbus_2.16.bb +++ b/packages/bluez-utils/bluez-utils-nodbus_2.17.bb diff --git a/packages/bluez-utils/files/base.patch b/packages/bluez-utils/files/base.patch index dbbff5199c..c4bb288303 100644 --- a/packages/bluez-utils/files/base.patch +++ b/packages/bluez-utils/files/base.patch @@ -3,19 +3,20 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- bluez-utils-2.14/pcmcia/bluetooth~base -+++ bluez-utils-2.14/pcmcia/bluetooth -@@ -15,6 +15,9 @@ - - if [ -r ./shared ]; then . ./shared ; else . /etc/pcmcia/shared ; fi +--- bluez-utils-2.17/pcmcia/bluetooth~base.patch ++++ bluez-utils-2.17/pcmcia/bluetooth +@@ -18,6 +18,10 @@ + # Get device attributes + get_info $DEVICE +test "$DEVICE" = "ttyS7" && DEVICE="/dev/tts/7" +test -z "$MANFID" && MANFID="bcsp" ++test "$MANFID" = "0000,0000" && MANFID="bcsp" + - # Get device attributes - get_info $DEVICE - -@@ -25,7 +28,7 @@ + # + # Serial devices + # +@@ -25,7 +29,7 @@ IRQ=`setserial /dev/$DEVICE | sed -e 's/.*IRQ: //'` setserial /dev/$DEVICE irq 0 ; setserial /dev/$DEVICE irq $IRQ diff --git a/packages/dbus/dbus_0.23.1-osso5.bb b/packages/dbus/dbus_0.23.1-osso5.bb index a313bb3f45..fffc93b636 100644 --- a/packages/dbus/dbus_0.23.1-osso5.bb +++ b/packages/dbus/dbus_0.23.1-osso5.bb @@ -1,5 +1,6 @@ +DEFAULT_PREFERENCE = "-1" SECTION = "base" -PR = "r0" +PR = "r1" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" diff --git a/packages/maemo/audiofile_0.2.6-3osso4.bb b/packages/maemo/audiofile_0.2.6-3osso4.bb new file mode 100644 index 0000000000..46c1b701cb --- /dev/null +++ b/packages/maemo/audiofile_0.2.6-3osso4.bb @@ -0,0 +1,26 @@ +DEFAULT_PREFERENCE = "-1" +PR = "r0" +SECTION = "libs" +LICENSE = "LGPL GPL" +DESCRIPTION = "The Audio File Library provides a uniform and elegant \ +API for accessing a variety of audio file formats, such as AIFF/AIFF-C, \ +WAVE, NeXT/Sun .snd/.au, Berkeley/IRCAM/CARL Sound File, Audio Visual \ +Research, Amiga IFF/8SVX, and NIST SPHERE." + +PACKAGES += "${PN}-bin" +FILES_${PN} = "${libdir}/libaudiofile*.so.*" +FILES_${PN}-dev += "${bindir}/*-config" +FILES_${PN}-bin += "${bindir}" +RPROVIDES_${PN} += "audiofile" + +SRC_URI = "http://stage.maemo.org/pool/maemo/ossw/source/a/${PN}/${PN}_${PV}.tar.gz" + +S = ${WORKDIR}/${PN}-0.2.6 + +inherit autotools pkgconfig binconfig + +do_stage () { + install -m 0644 libaudiofile/audiofile.h libaudiofile/aupvlist.h libaudiofile/af_vfs.h ${STAGING_INCDIR}/ + oe_libinstall -C libaudiofile libaudiofile ${STAGING_LIBDIR} + install -m 0644 audiofile.m4 ${STAGING_DATADIR}/aclocal/ +} diff --git a/packages/maemo/hildon-fm_0.9.1-2.bb b/packages/maemo/hildon-fm_0.9.1-2.bb index 8d4a71d0e0..f5346286c0 100644 --- a/packages/maemo/hildon-fm_0.9.1-2.bb +++ b/packages/maemo/hildon-fm_0.9.1-2.bb @@ -1,12 +1,12 @@ +PR = "r1" LICENSE = "GPL/LGPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -PR = "r1" +MAINTAINER = "Koen Kooi <koen@handhelds.org>" DEPENDS = "gtk+-2.6.4-1.osso7 outo libxi xt libpng gconf hildon-lgpl osso-thumbnail osso-gwconnect" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-fm/hildon-fm_${PV}.tar.gz" -S = "${WORKDIR}/hildon-fm-0.9.1" -FILES_${PN} += "${libdir}/outo/*.so" +S = "${WORKDIR}/hildon-fm-0.9.1" +FILES_${PN} += "${libdir}/outo/*.so" inherit pkgconfig autotools diff --git a/packages/maemo/hildon-libs_0.9.6-2.bb b/packages/maemo/hildon-libs_0.9.6-2.bb index aabd6b7fa7..05403155b5 100644 --- a/packages/maemo/hildon-libs_0.9.6-2.bb +++ b/packages/maemo/hildon-libs_0.9.6-2.bb @@ -1,17 +1,20 @@ -PR = "r1" +PR = "r1" LICENSE = "LGPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@handhelds.org>" DEPENDS = "dbus hildon-lgpl hildon-fm outo gtk+-2.6.4-1.osso7" -SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-libs/hildon-libs_${PV}.tar.gz \ - file://hildon-libs-no-werror.patch;patch=1" +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \ + file://hildon-libs-no-werror.patch;patch=1" -S = "${WORKDIR}/hildon-libs-0.9.6" +S = "${WORKDIR}/hildon-libs-0.9.6" + +inherit autotools pkgconfig -inherit pkgconfig autotools EXTRA_OECONF = "--disable-gtk-doc" +FILES_${PN} += "${libdir}/outo/*.so" + do_stage() { install -d ${STAGING_LIBDIR}/outo install -m755 ${S}/ut/.libs/libhildonwidgets_unittests.so ${STAGING_LIBDIR}/outo @@ -20,4 +23,3 @@ do_stage() { install -d ${STAGING_INCDIR}/hildon-widgets install -m 644 hildon-widgets/*.h ${STAGING_INCDIR}/hildon-widgets } - diff --git a/packages/maemo/osso-app-killer_0.4-3.bb b/packages/maemo/osso-app-killer_0.4-3.bb new file mode 100644 index 0000000000..7ecc7723bf --- /dev/null +++ b/packages/maemo/osso-app-killer_0.4-3.bb @@ -0,0 +1,14 @@ +PR = "r0" +LICENSE = "GPL" +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" + +DEPENDS = "libosso" + +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz" + +S = ${WORKDIR}/${PN}-0.4 + +inherit autotools pkgconfig + +FILES_${PN} += "${libdir}/dbus-1.0" + diff --git a/packages/maemo/osso-dsp-headers_0.1.bb b/packages/maemo/osso-dsp-headers_0.1.bb new file mode 100644 index 0000000000..41e4fe87ea --- /dev/null +++ b/packages/maemo/osso-dsp-headers_0.1.bb @@ -0,0 +1,21 @@ +PR = "r0" +LICENSE = "GPL" +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" + +DEPENDS = "" + +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.orig.tar.gz" + +inherit autotools pkgconfig + +headers = "a_igeq.h amrnb_socket_node.h audio_socket_node.h pcm_socket_node.h \ + a_imumdrc.h amrwb_socket_node.h interface_common.h video_socket_node.h \ + aac_socket_node.h audio_pp_socket_node.h mp3_socket_node.h" + +do_stage () { + + install -d ${STAGING_INCDIR}/dsp + for h in ${headers}; do + install -m 0644 ${S}/include/dsp/$h ${STAGING_INCDIR}/dsp/$h + done +}
\ No newline at end of file diff --git a/packages/maemo/osso-esd_0.5.bb b/packages/maemo/osso-esd_0.5.bb new file mode 100644 index 0000000000..e2710c4a0b --- /dev/null +++ b/packages/maemo/osso-esd_0.5.bb @@ -0,0 +1,14 @@ +PR = "r0" +LICENSE = "GPL" +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" +PROVIDES = "esd" +RPROVIDES = "esd" + +DEPENDS = "audiofile osso-dsp-headers" + +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.orig.tar.gz" + +S = ${WORKDIR}/esd + +inherit autotools pkgconfig + diff --git a/packages/maemo/osso-screenshot-tool_1.20-1.bb b/packages/maemo/osso-screenshot-tool_1.20-1.bb new file mode 100644 index 0000000000..3b039be934 --- /dev/null +++ b/packages/maemo/osso-screenshot-tool_1.20-1.bb @@ -0,0 +1,10 @@ +PR = "r0" +LICENSE = "" +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" + +DEPENDS = "gtk+-2.6.4-1.osso7" +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz" + +S = "${WORKDIR}/${PN}-1.20" + +inherit pkgconfig autotools diff --git a/packages/maemo/osso-sounds_0.3-1.bb b/packages/maemo/osso-sounds_0.3-1.bb new file mode 100644 index 0000000000..588c3139fd --- /dev/null +++ b/packages/maemo/osso-sounds_0.3-1.bb @@ -0,0 +1,31 @@ +PR = "r0" +LICENSE = "GPL" +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" + +DEPENDS = "audiofile" + +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz" + +S = ${WORKDIR}/${PN}-0.3 + +datafiles = "game-chess_check.wav ui-charging_started.wav game-chess_checkmate.wav \ + ui-clock_alarm.mp3 game-chess_illegal_move.wav ui-confirmation_note.wav \ + game-chess_piece_capture.wav ui-connection_lost.wav \ + game-chess_successful_movement.wav ui-default_beep.wav \ + game-chess_successful_selection.wav ui-general_warning.wav \ + game-chess_unsuccesful_selection.wav ui-information_note.wav \ + game-mahjong_correct_combination.wav ui-key_press.wav \ + game-mahjong_hint_usage.wav ui-new_email.wav \ + game-mahjong_incorrect_combination.wav ui-operation_ready.wav \ + game-mahjong_incorrect_selection.wav ui-pen_down.wav \ + game-mahjong_shuffle_usage.wav ui-recharge_battery.wav \ + game-mahjong_successful_selection.wav ui-shutdown.wav \ + game-mahjong_undo_usage.wav ui-wake_up_tune.wav \ + ui-battery_low.wav ui-wrong_charger.wav" + +do_install () { + install -d ${D}/${datadir}/sounds + for h in ${datafiles}; do + install -m 0644 ${S}/usr/share/sounds/$h ${D}/${datadir}/sounds/$h + done +} diff --git a/packages/maemo/osso-thumbnail_0.3.1-1.bb b/packages/maemo/osso-thumbnail_0.3.1-1.bb index 93e41a47e4..03659654f3 100644 --- a/packages/maemo/osso-thumbnail_0.3.1-1.bb +++ b/packages/maemo/osso-thumbnail_0.3.1-1.bb @@ -1,19 +1,16 @@ +PR = "r2" LICENSE = "" MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "gtk+-2.6.4-1.osso7 osso-gnome-vfs2" +DEPENDS = "gtk+-2.6.4-1.osso7 osso-gnome-vfs2" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/osso-thumbnail/osso-thumbnail_${PV}.tar.gz" -S = "${WORKDIR}/osso-thumbnail-0.3.1" + +S = "${WORKDIR}/osso-thumbnail-0.3.1" inherit pkgconfig autotools EXTRA_OECONF = "--disable-gtk-doc" -do_install_prepend() { - install -d ${D}/${libdir} - install thumbs/.libs/libossothumbnail.so.0.0.3 ${D}${libdir}/ -} - do_stage() { install -d ${STAGING_INCDIR} install -d ${STAGING_LIBDIR} diff --git a/packages/maemo/tscalib/.mtn2git_empty b/packages/maemo/tscalib/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/maemo/tscalib/.mtn2git_empty diff --git a/packages/maemo/tscalib/makefile.patch b/packages/maemo/tscalib/makefile.patch new file mode 100644 index 0000000000..7bfab4f142 --- /dev/null +++ b/packages/maemo/tscalib/makefile.patch @@ -0,0 +1,24 @@ +--- Makefile.orig 2005-06-20 18:44:26.000000000 +0200 ++++ Makefile 2005-06-20 18:43:56.000000000 +0200 +@@ -1,6 +1,4 @@ + +-CC = gcc +-CFLAGS = -Os + LIBS = -lts + PREFIX = /usr/local + +@@ -20,11 +18,11 @@ + rm -rf $(OBJECTS) $(TARGET) .depends + + install: $(TARGET) +- install -d -m 755 $(PREFIX)/bin +- install -c -m 755 $(TARGET) $(PREFIX)/bin/$(TARGET) ++ install -d -m 755 $(DESTDIR)/$(PREFIX)/bin ++ install -c -m 755 $(TARGET) $(DESTDIR)/$(PREFIX)/bin/$(TARGET) + + .depends: +- $(CC) -MM $(SOURCES) > .depends ++ $(CC) -MM $(CFLAGS) $(SOURCES) > .depends + + + -include .depends diff --git a/packages/maemo/tscalib_0.0.1-3.bb b/packages/maemo/tscalib_0.0.1-3.bb new file mode 100644 index 0000000000..6c1a72b185 --- /dev/null +++ b/packages/maemo/tscalib_0.0.1-3.bb @@ -0,0 +1,19 @@ +PR = "r0" +LICENSE = "GPL" +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" +DEPENDS = "virtual/xserver tslib" + +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/${PN}/${PN}_${PV}.tar.gz \ + file://makefile.patch;patch=1;pnum=0" + +S = "${WORKDIR}/${PN}" + +inherit autotools pkgconfig + +do_compile () { + oe_runmake PREFIX=${prefix} +} + +do_install() { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install +} diff --git a/packages/meta/maemo-image.bb b/packages/meta/maemo-image.bb index b9aad68edd..2adc88b958 100644 --- a/packages/meta/maemo-image.bb +++ b/packages/meta/maemo-image.bb @@ -2,31 +2,24 @@ # Meta package for maemo based system image # -FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - maemo##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/maemo" -FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - maemo##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/maemo" -FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11" +FEED_URIS_append_familiar = " maemo##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/maemo" -PR = "r1" +PR = "r2" export IMAGE_BASENAME = "maemo-image" GUI_MACHINE_CLASS ?= "none" -MAEMO_EXTRA_DEPENDS = "scap" -MAEMO_EXTRA_INSTALL = "osso-af-services osso-af-base-apps scap" +MAEMO_EXTRA_DEPENDS = "scap dosfstools" +MAEMO_EXTRA_INSTALL = "osso-af-services osso-af-base-apps scap dosfstools" -#prefer some versions of the maemo stack -PREFERRED_VERSION_gtk+="gtk+-2.6.4-1.osso7" -PREFERRED_VERSION_dbus = "0.23.1-osso5" -PREFERRED_PROVIDER_gconf = "gconf-osso" +XSERVER ?= "xserver-kdrive-omap" DEPENDS = "task-bootstrap \ meta-maemo \ ${MAEMO_EXTRA_DEPENDS}" -export IPKG_INSTALL = "task-bootstrap maemo-task-base \ +export IPKG_INSTALL = "task-bootstrap maemo-task-base maemo-task-theme \ maemo-task-apps ${MAEMO_EXTRA_INSTALL} \ ${XSERVER}" diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb index 4144a6c284..2482be0351 100644 --- a/packages/meta/meta-maemo.bb +++ b/packages/meta/meta-maemo.bb @@ -1,6 +1,6 @@ -PR = "r4" -PACKAGES = maemo-task-base maemo-task-apps maemo-task-libs-install +PR = "r5" +PACKAGES = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme DESCRIPTION = "Meta-package for maemo environment" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" @@ -28,21 +28,14 @@ RDEPENDS_maemo-task-libs-install := "${maemo-task-libs-install}" maemo-task-base = "\ bluez-utils-dbus \ matchbox \ - xcursor-transparent-theme \ - sdk-default-theme \ - sdk-default-theme-config \ - sdk-default-icons \ - sapwood \ shared-mime-info \ rxvt-unicode \ xst \ xhost \ xrdb \ - ttf-bitstream-vera \ libgtkstylus \ detect-stylus \ outo \ - sapwood \ hildon-initscripts \ libosso \ osso-af-utils \ @@ -50,7 +43,8 @@ maemo-task-base = "\ osso-core-config \ osso-gnome-vfs2 \ osso-thumbnail \ - xauth" + xauth \ + esd" RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \ gdk-pixbuf-loader-xpm \ @@ -58,8 +52,26 @@ RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \ pango-module-basic-x \ pango-module-basic-fc \ ${maemo-task-base}" + DEPENDS += " ${maemo-task-base}" + +maemo-task-theme = "\ + xcursor-transparent-theme \ + sdk-default-theme \ + sdk-default-theme-config \ + sdk-default-icons \ + sapwood \ + ttf-bitstream-vera \ + sapwood \ + osso-sounds" + +RDEPENDS_maemo-task-theme := "${maemo-task-theme}" + +DEPENDS += " ${maemo-task-theme}" + + + maemo-task-apps = "\ osso-gwobex \ osso-gwconnect \ @@ -69,6 +81,8 @@ maemo-task-apps = "\ hildon-navigator \ hildon-control-panel \ osso-application-installer \ + osso-app-killer \ + osso-screenshot-tool \ gpe-todo-hildon \ gpe-contacts-maemo" diff --git a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf index 75b4453cfd..3740bfc351 100644 --- a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf @@ -4,7 +4,7 @@ SmallIconSize = 32 BigIconSize = 48 FontFamily = DejaVu_Sans FontStyle = Regular -FontSize = 14 +FontSize = 16 FixedFontFamily = DejaVu_Sans_Mono FixedFontStyle = Regular FixedFontSize = 14 diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf index 75b4453cfd..3740bfc351 100644 --- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf @@ -4,7 +4,7 @@ SmallIconSize = 32 BigIconSize = 48 FontFamily = DejaVu_Sans FontStyle = Regular -FontSize = 14 +FontSize = 16 FixedFontFamily = DejaVu_Sans_Mono FixedFontStyle = Regular FixedFontSize = 14 diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie index 2267ede9fa..88bfd4fd34 100755 --- a/packages/opie-taskbar/opie-taskbar/opie +++ b/packages/opie-taskbar/opie-taskbar/opie @@ -3,6 +3,7 @@ [ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root [ -z $HOME ] && export HOME=/home/$LOGNAME +export QWS_DISPLAY=Transformed:Rot0:0 export QTDIR=/opt/QtPalmtop export OPIEDIR=/opt/QtPalmtop export QPEDIR=/opt/QtPalmtop diff --git a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf index 75b4453cfd..3740bfc351 100644 --- a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf @@ -4,7 +4,7 @@ SmallIconSize = 32 BigIconSize = 48 FontFamily = DejaVu_Sans FontStyle = Regular -FontSize = 14 +FontSize = 16 FixedFontFamily = DejaVu_Sans_Mono FixedFontStyle = Regular FixedFontSize = 14 diff --git a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf index 75b4453cfd..3740bfc351 100644 --- a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf @@ -4,7 +4,7 @@ SmallIconSize = 32 BigIconSize = 48 FontFamily = DejaVu_Sans FontStyle = Regular -FontSize = 14 +FontSize = 16 FixedFontFamily = DejaVu_Sans_Mono FixedFontStyle = Regular FixedFontSize = 14 diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 80a705a08a..f1fd277a9e 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,7 +1,7 @@ include ${PN}.inc PV = "1.2.0+cvs-${CVSDATE}" -PR = "r4" +PR = "r5" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -10,10 +10,10 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/apps \ ${HANDHELDS_CVS};module=opie/root \ ${HANDHELDS_CVS};module=opie/etc \ - file://nomax.patch;patch=1;pnum=3 \ + file://nomax.patch;patch=1;pnum=3 \ file://server.pro \ file://opie-reorgfiles \ file://opie \ file://qpe.conf \ - file://locale.conf \ - file://opie_defaults" + file://locale.conf \ + file://opie_defaults" diff --git a/packages/python/python-2.4.1-manifest.inc b/packages/python/python-2.4.1-manifest.inc index df5bd07dca..586a525cda 100644 --- a/packages/python/python-2.4.1-manifest.inc +++ b/packages/python/python-2.4.1-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Mon Jun 27 22:39:53 2005 +### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Fri Jul 1 18:03:30 2005 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -36,8 +36,8 @@ RDEPENDS_python-pickle="python-core python-codecs python-re" FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so " DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml4" -RDEPENDS_python-datetime="python-core python-locale" +PR_python-datetime="ml5" +RDEPENDS_python-datetime="python-core python-codecs" FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" diff --git a/packages/python/python_2.4.1.bb b/packages/python/python_2.4.1.bb index 89b0d64e2f..9ac8cee701 100644 --- a/packages/python/python_2.4.1.bb +++ b/packages/python/python_2.4.1.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" PROVIDES = "python python-core" DEPENDS = "python-native zlib gdbm openssl" -PR = "ml4" +PR = "ml5" PYTHON_MAJMIN = "2.4" |