org.openmoko.xora.qtopia: d55b64b9f88adf721740367f71064f7bfb31f85d

oe at monotone.openmoko.org oe at monotone.openmoko.org
Fri May 2 15:33:15 CEST 2008


revision:            d55b64b9f88adf721740367f71064f7bfb31f85d
date:                2008-04-30T20:36:06
author:              xora at openembedded.org
branch:              org.openmoko.xora.qtopia
changelog:
propagate from branch 'org.openmoko.zecke.april-update' (head 45783a6c8bda4dbae7ddfda0b24df2699006bf9a)
            to branch 'org.openmoko.xora.qtopia' (head 23b9d8f3b74e61ec10387d5df8fc59b30c74e4fc)

manifest:
format_version "1"

new_manifest [9c37a1d9d1e9a54bb6cacdb06bc09cf58989740b]

old_revision [23b9d8f3b74e61ec10387d5df8fc59b30c74e4fc]

patch "conf/distro/include/sane-srcrevs.inc"
 from [c7c38d09ee4de83612cd24a21e437e813f306295]
   to [4822c7c14b601ac8c659d7dc94d8c97c68f37204]

old_revision [45783a6c8bda4dbae7ddfda0b24df2699006bf9a]

patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
 from [25fac0bc36ee60145d0047be5935bba4919e9b6b]
   to [56bce76325f02ded8592fc25e3a2d5ddd3aba416]

patch "packages/tasks/task-openmoko-qtopia-x11.bb"
 from [9ba089cc7d924228e8bf151d1ad3d5279cc23c13]
   to [108f8f9db6bc9e31caeccfbb3259449d44f5409f]
-------------- next part --------------
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [c7c38d09ee4de83612cd24a21e437e813f306295]
#    to [4822c7c14b601ac8c659d7dc94d8c97c68f37204]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	c7c38d09ee4de83612cd24a21e437e813f306295
+++ conf/distro/include/sane-srcrevs.inc	4822c7c14b601ac8c659d7dc94d8c97c68f37204
@@ -87,7 +87,7 @@ SRCREV_pn-openmoko-agpsui ?= "7"
 SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-openmoko-agpsui ?= "7"
-SRCREV_pn-openmoko-alsa-scenarios ?= "4317"
+SRCREV_pn-openmoko-alsa-scenarios ?= "4406"
 SRCREV_pn-openmoko-appearance ?= "3262"
 SRCREV_pn-openmoko-appmanager ?= "1851"
 SRCREV_pn-openmoko-appmanager2 ?= "3442"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/7694cdf7/attachment.htm 
-------------- next part --------------
#
#
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
#  from [25fac0bc36ee60145d0047be5935bba4919e9b6b]
#    to [56bce76325f02ded8592fc25e3a2d5ddd3aba416]
# 
# patch "packages/tasks/task-openmoko-qtopia-x11.bb"
#  from [9ba089cc7d924228e8bf151d1ad3d5279cc23c13]
#    to [108f8f9db6bc9e31caeccfbb3259449d44f5409f]
#
============================================================
--- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb	25fac0bc36ee60145d0047be5935bba4919e9b6b
+++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb	56bce76325f02ded8592fc25e3a2d5ddd3aba416
@@ -10,16 +10,18 @@ HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
-DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst gst-plugins-base"
-RDEPENDS = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic \
-            tzdata-australia tzdata-europe tzdata-pacific \
-            gst-meta-audio gst-plugin-audioconvert gst-plugin-wavparse"
-PROVIDES = "qtopia-phone"
-
-#setting the proper PV breaks configure
-#PV = "4.3.1+git${SRCREV}"
-
-PR = "r11"
+DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 \
+           fontconfig xft libxext libxrender libxrandr libxcursor libxtst \
+           gst-plugins-base"
+RDEPENDS_${PN} = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica \
+                  tzdata-arctic tzdata-asia tzdata-atlantic tzdata-australia \
+                  tzdata-europe tzdata-pacific gst-meta-audio"
+RDEPENDS_${PN}_append_om-gta02 = " ${PN}-multiplexer-ficgta01multiplex \
+                                  ${PN}-phonevendor-ficgta01vendor \
+				  ${PN}-audiohw-ficgta01audiohardware"
+PROVIDES_${PN} = "qtopia-phone"
+PR = "r10"
+SRCREV = "${AUTOREV}"
 SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
            file://Xsession.d/89qtopia \
            file://qtopia.sh"
@@ -101,6 +103,13 @@ do_install() {
    done 
 
    # Install good icons for the desktop files
+   install -d ${D}${datadir}/pixmaps
+   ICONS=`cat ${S}/apps-fdo/*/*.desktop | grep Icon | cut -f 2 -d "="`
+   for icon in $ICONS; do
+      if [ -f "${S}/pics/$icon.png" ] ; then
+         install -D ${S}/pics/$icon.png ${D}${datadir}/pixmaps/$icon.png
+      fi
+   done
 
    # Make sure qpe gets launched by X
    install -d ${D}/${sysconfdir}/X11/Xsession.d
@@ -114,11 +123,666 @@ do_install() {
    install -m 0755 ${WORKDIR}/qtopia.sh ${D}${sysconfdir}/profile.d/
 }
 
+python populate_packages_prepend() {
+	codec_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/codecs/', d)
+	codec_name = bb.data.expand('${PN}-codec-%s', d)
+	do_split_packages(d, codec_dir, '^lib(.*).so$', codec_name, '${PN} codec for %s', extra_depends='' )
+
+	audiohw_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/audiohardware/', d)
+	audiohw_name = bb.data.expand('${PN}-audiohw-%s', d)
+	do_split_packages(d, audiohw_dir, '^lib(.*).so$', audiohw_name, '${PN} audiohw for %s', extra_depends='' )
+
+	composer_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/composers/', d)
+	composer_name = bb.data.expand('${PN}-composer-%s', d)
+	do_split_packages(d, composer_dir, '^lib(.*).so$', composer_name, '${PN} composer for %s', extra_depends='' )
+
+	content_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/content/', d)
+	content_name = bb.data.expand('${PN}-content-%s', d)
+	do_split_packages(d, content_dir, '^lib(.*).so$', content_name, '${PN} content %s', extra_depends='' )
+
+	media_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/mediaengines/', d)
+	media_name = bb.data.expand('${PN}-media-%s', d)
+	do_split_packages(d, media_dir, '^lib(.*).so$', media_name, '${PN} mediaengine %s', extra_depends='' )
+
+	multi_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/multiplexers/', d)
+	multi_name = bb.data.expand('${PN}-multiplexer-%s', d)
+	do_split_packages(d, multi_dir, '^lib(.*).so$', multi_name, '${PN} multiplexer for %s', extra_depends='' )
+
+	viewer_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/viewers/', d)
+	viewer_name = bb.data.expand('${PN}-viewer-%s', d)
+	do_split_packages(d, viewer_dir, '^lib(.*).so$', viewer_name, '${PN} viewer for %s', extra_depends='' )
+	
+	network_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/network/', d)
+	network_name = bb.data.expand('${PN}-network-%s', d)
+	do_split_packages(d, network_dir, '^lib(.*).so$', network_name, '${PN} network %s', extra_depends='' )	
+
+	print_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/qtopiaprinting/', d)
+	print_name = bb.data.expand('${PN}-qtopiaprinting-%s', d)
+	do_split_packages(d, print_dir, '^lib(.*).so$', print_name, '${PN} printingg %s', extra_depends='' )
+
+	vendor_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/phonevendors/', d)
+	vendor_name = bb.data.expand('${PN}-phonevendor-%s', d)
+	do_split_packages(d, vendor_dir, '^lib(.*).so$', vendor_name, '${PN} phonevendor %s', extra_depends='' )
+
+	icon_dir = bb.data.expand('${OE_QT_PREFIX}/qt_plugins/iconengines/', d)
+	icon_name = bb.data.expand('${PN}-iconengine-%s', d)
+	do_split_packages(d, icon_dir, '^lib(.*).so$', icon_name, '${PN} iconengine %s', extra_depends='' )
+
+	image_dir = bb.data.expand('${OE_QT_PREFIX}/qt_plugins/imageformats/', d)
+	image_name = bb.data.expand('${PN}-imageformat-%s', d)
+	do_split_packages(d, image_dir, '^lib(.*).so$', image_name, '${PN} imageformat %s', extra_depends='' )
+
+	input_dir = bb.data.expand('${OE_QT_PREFIX}/qt_plugins/inputmethods/', d)
+	input_name = bb.data.expand('${PN}-inputformat-%s', d)
+	do_split_packages(d, input_dir, '^lib(.*).so$', input_name, '${PN} inputmethod %s', extra_depends='' )
+}
+
+PACKAGES =+ "\
+${PN}-addressbook \
+${PN}-bluetooth \
+${PN}-calculator \
+${PN}-clock \
+${PN}-datebook \
+${PN}-helpbrowser \
+${PN}-mediaplayer \
+${PN}-mediarecorder \
+${PN}-packagemanager \
+${PN}-photoedit \
+${PN}-qtmail \
+${PN}-ringprofile \
+${PN}-serverwidgets \
+${PN}-startupflags \
+${PN}-sysinfo \
+${PN}-systemtime \
+${PN}-textedit \
+${PN}-todolist \
+\
+${PN}-appearance \
+${PN}-beaming \
+${PN}-calibrate \
+${PN}-callforwarding \
+${PN}-fifteen \
+${PN}-handwriting \
+${PN}-homescreen \
+${PN}-language \
+${PN}-light-and-power \
+${PN}-logging \
+${PN}-minesweep \
+${PN}-network \
+${PN}-phonenetworks \
+${PN}-phonesettings \
+${PN}-qdsync \
+${PN}-security \
+${PN}-sip \
+${PN}-snake \
+${PN}-speeddial \
+${PN}-words \
+${PN}-worldtime \
+\
+${PN}-archives \
+${PN}-camera \
+${PN}-drmbrowser \
+\
+${PN}-libamr \
+${PN}-libdissipate2 \
+${PN}-libgsm \
+${PN}-libinputmatch \
+${PN}-libmd5 \
+${PN}-libopenobex \
+${PN}-libqmstroke \
+${PN}-libqtcore \
+${PN}-libqtdbus \
+${PN}-libqtgui \
+${PN}-libqtnetwork \
+${PN}-libqtopengl \
+${PN}-libqtopiaaudio \
+${PN}-libqtopiabase \
+${PN}-libqtopiacomm \
+${PN}-libqtopiamail \
+${PN}-libqtopiamedia \
+${PN}-libqtopiaphonemodem \
+${PN}-libqtopiaphone \
+${PN}-libqtopiapim \
+${PN}-libqtopiaprinting \
+${PN}-libqtopiasmil \
+${PN}-libqtopia \
+${PN}-libqtopia-sqlite \
+${PN}-libqtscript \
+${PN}-libqtsql \
+${PN}-libqtsvg \
+${PN}-libqtxml \
+${PN}-libtimidity \
+${PN}-libvorbisidec \
+\
+${PN}-mediaserver \
+\
+${PN}-pics-samples \
+\
+${PN}-manual \
+${PN}-qpf-fonts \
+"
+
+PACKAGES_DYNAMIC = "${PN}-multiplexer-* ${PN}-phonevendor-* ${PN}-audiohw-* \
+                    ${PN}-media-*"
+
+DEBIAN_NOAUTONAME_${PN}-libamr = "1"
+DEBIAN_NOAUTONAME_${PN}-libdissipate2 = "1"
+DEBIAN_NOAUTONAME_${PN}-libgsm = "1"
+DEBIAN_NOAUTONAME_${PN}-libinputmatch = "1"
+DEBIAN_NOAUTONAME_${PN}-libmd5 = "1"
+DEBIAN_NOAUTONAME_${PN}-libopenobex  = "1"
+DEBIAN_NOAUTONAME_${PN}-libqmstroke = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtcore = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtdbus = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtgui = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtnetwork = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopengl = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiaaudio = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiabase = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiacomm = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiamail = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiamedia = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiaphonemodem = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiaphone = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiapim = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiaprinting = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiasmil = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopia = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopia-sqlite = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtscript = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtsql = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtsvg = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtxml = "1"
+DEBIAN_NOAUTONAME_${PN}-libtimidity = "1"
+DEBIAN_NOAUTONAME_${PN}-libvorbisidec = "1"
+
+# quicklaunched apps
+
+FILES_${PN}-addressbook = "\
+${OE_QT_PREFIX}/plugins/application/libaddressbook.so \
+${OE_QT_PREFIX}/bin/addressbook \
+${OE_QT_PREFIX}/services/Contacts/addressbook \
+${OE_QT_PREFIX}/services/ContactsPhone/addressbook \
+${OE_QT_PREFIX}/services/Contacts.service \
+${OE_QT_PREFIX}/services/ContactsPhone.service \
+${OE_QT_PREFIX}/etc/qds/Contacts \
+${OE_QT_PREFIX}/etc/qds/ContactsPhone \
+${OE_QT_PREFIX}/pics/addressbook \
+${datadir}/applications/qtopia-addressbook.desktop \
+${datadir}/pixmaps/addressbook/AddressBook.png"
+
+FILES_${PN}-bluetooth ="\
+${OE_QT_PREFIX}/bin/bluetooth \
+${OE_QT_PREFIX}/bin/btsettings \
+${OE_QT_PREFIX}/bin/bt-poweroff.sh \
+${OE_QT_PREFIX}/bin/bt-poweron.sh \
+${OE_QT_PREFIX}/services/BluetoothPush.service \
+${OE_QT_PREFIX}/etc/qds/BluetoothPush \
+${OE_QT_PREFIX}/plugins/application/libbluetooth.so \
+${OE_QT_PREFIX}/plugins/application/libbtsettings.so \
+${OE_QT_PREFIX}/plugins/network/libbluetooth.so \
+${OE_QT_PREFIX}/pics/bluetooth \
+${OE_QT_PREFIX}/pics/btsettings \
+${OE_QT_PREFIX}/etc/network/bluetoothDUN.conf \
+${OE_QT_PREFIX}/etc/bluetooth \
+${datadir}/applications/qtopia-bluetooth.desktop \
+${datadir}/applications/qtopia-btsettings.desktop \
+${datadir}/pixmaps/btsettings/BTSettings.png"
+
+FILES_${PN}-calculator = "\
+${OE_QT_PREFIX}/plugins/application/libcalculator.so \
+${OE_QT_PREFIX}/bin/calculator \
+${OE_QT_PREFIX}/pics/calculator \
+${datadir}/applications/qtopia-calculator.desktop \
+${datadir}/pixmaps/calculator/Calculator.png"
+
+FILES_${PN}-clock = "\
+${OE_QT_PREFIX}/plugins/application/libclock.so \
+${OE_QT_PREFIX}/bin/clock \
+${OE_QT_PREFIX}/services/Alarm/clock \
+${OE_QT_PREFIX}/services/Clock/clock \
+${OE_QT_PREFIX}/services/TimeMonitor/clock \
+${OE_QT_PREFIX}/pics/clock \
+${datadir}/applications/qtopia-clock.desktop \
+${datadir}/pixmaps/clock/Clock.png"
+
+FILES_${PN}-datebook = "\
+${OE_QT_PREFIX}/plugins/application/libdatebook.so \
+${OE_QT_PREFIX}/bin/datebook \
+${OE_QT_PREFIX}/services/Calendar/datebook \
+${OE_QT_PREFIX}/services/Receive/text/x-vcalendar-Events/datebook \
+${OE_QT_PREFIX}/services/TimeMonitor/datebook \
+${OE_QT_PREFIX}/services/Calendar.service \
+${OE_QT_PREFIX}/etc/qds/Calendar \
+${OE_QT_PREFIX}/pics/datebook \
+${datadir}/applications/qtopia-datebook.desktop \
+${datadir}/pixmaps/datebook/DateBook.png"
+
+FILES_${PN}-helpbrowser = "\
+${OE_QT_PREFIX}/plugins/application/libhelpbrowser.so \
+${OE_QT_PREFIX}/bin/helpbrowser \
+${OE_QT_PREFIX}/services/Help/helpbrowser \
+${OE_QT_PREFIX}/pics/helpbrowser \
+${datadir}/applications/qtopia-helpbrowser.desktop \
+${datadir}/pixmaps/helpbrowser/HelpBrowser.png"
+
+FILES_${PN}-mediaplayer = "\
+${OE_QT_PREFIX}/plugins/application/libmediaplayer.so \
+${OE_QT_PREFIX}/bin/mediaplayer \
+${OE_QT_PREFIX}/pics/mediaplayer \
+${datadir}/applications/qtopia-mediaplayer.desktop \
+${datadir}/pixmaps/mediaplayer/VideoPlayer.png"
+
+FILES_${PN}-mediarecorder = "\
+${OE_QT_PREFIX}/plugins/application/libmediarecorder.so \
+${OE_QT_PREFIX}/bin/mediarecorder \
+${OE_QT_PREFIX}/services/VoiceRecording/mediarecorder \
+${OE_QT_PREFIX}/services/VoiceRecording.service \
+${OE_QT_PREFIX}/pics/mediarecorder \
+${OE_QT_PREFIX}/etc/qds/VoiceRecording \
+${datadir}/applications/qtopia-mediarecorder.desktop \
+${datadir}/pixmaps/mediarecorder/SoundRecorder.png"
+
+FILES_${PN}-packagemanager = "\
+${OE_QT_PREFIX}/plugins/application/libpackagemanager.so \
+${OE_QT_PREFIX}/bin/packagemanager \
+${OE_QT_PREFIX}/services/PackageManager/packagemanager \
+${OE_QT_PREFIX}/services/PackageManager.service \
+${OE_QT_PREFIX}/pics/packagemanager \
+${OE_QT_PREFIX}/etc/qds/PackageManager \
+${datadir}/applications/qtopia-packagemanager.desktop \
+${datadir}/pixmaps/packagemanager/PackageManager.png"
+
+FILES_${PN}-photoedit = "\
+${OE_QT_PREFIX}/plugins/application/libphotoedit.so \
+${OE_QT_PREFIX}/bin/photoedit \
+${OE_QT_PREFIX}/services/PhotoEdit/photoedit \
+${OE_QT_PREFIX}/services/PhotoEdit.service \
+${OE_QT_PREFIX}/pics/photoedit \
+${OE_QT_PREFIX}/etc/qds/PhotoEdit \
+${datadir}/applications/qtopia-photoedit.desktop \
+${datadir}/pixmaps/ImageViewer.png"
+
+FILES_${PN}-qtmail = "\
+${OE_QT_PREFIX}/plugins/application/libqtmail.so \
+${OE_QT_PREFIX}/bin/qtmail \
+${OE_QT_PREFIX}/services/SMS/qtmail \
+${OE_QT_PREFIX}/services/SMS.service \
+${OE_QT_PREFIX}/services/Email/qtmail \
+${OE_QT_PREFIX}/services/Messages/qtmail \
+${OE_QT_PREFIX}/services/Email.service \
+${OE_QT_PREFIX}/etc/qds/Email \
+${OE_QT_PREFIX}/etc/qds/SMS \
+${OE_QT_PREFIX}/pics/qtmail \
+${datadir}/applications/qtopia-qtmail.desktop \
+${datadir}/pixmaps/qtmail/EMail.png"
+
+FILES_${PN}-ringprofile = "\
+${OE_QT_PREFIX}/plugins/application/libprofileedit.so \
+${OE_QT_PREFIX}/bin/profileedit \
+${OE_QT_PREFIX}/services/SettingsManager/profileedit \
+${OE_QT_PREFIX}/services/Profiles/profileedit \
+${OE_QT_PREFIX}/pics/profileedit \
+${datadir}/applications/qtopia-ringprofile.desktop \
+${datadir}/pixmaps/profileedit/Note.png"
+
+FILES_${PN}-serverwidgets = "\
+${OE_QT_PREFIX}/plugins/application/libserverwidgets.so \
+${OE_QT_PREFIX}/bin/serverwidgets \
+${OE_QT_PREFIX}/pics/serverwidgets \
+${datadir}/applications/qtopia-serverwidgets.desktop \
+${datadir}/pixmaps/serverwidgets/ServerWidgets.png"
+
+FILES_${PN}-startupflags = "\
+${OE_QT_PREFIX}/plugins/application/libstartupflags.so \
+${OE_QT_PREFIX}/bin/startupflags \
+${OE_QT_PREFIX}/bin/startupflags.sh \
+${datadir}/applications/qtopia-startupflags.desktop \
+${datadir}/pixmaps/icons/flag.png"
+
+FILES_${PN}-sysinfo = "\
+${OE_QT_PREFIX}/plugins/application/libsysinfo.so \
+${OE_QT_PREFIX}/bin/sysinfo \
+${OE_QT_PREFIX}/services/CleanupWizard/sysinfo \
+${OE_QT_PREFIX}/pics/sysinfo \
+${datadir}/applications/qtopia-sysinfo.desktop \
+${datadir}/pixmaps/sysinfo/SystemInfo.png"
+
+FILES_${PN}-systemtime = "\
+${OE_QT_PREFIX}/plugins/application/libsystemtime.so \
+${OE_QT_PREFIX}/bin/systemtime \
+${OE_QT_PREFIX}/services/Date/systemtime \
+${OE_QT_PREFIX}/services/Time/systemtime \
+${OE_QT_PREFIX}/pics/systemtime \
+${datadir}/applications/qtopia-systemtime.desktop \
+${datadir}/pixmaps/systemtime/DateTime.png"
+
+FILES_${PN}-textedit = "\
+${OE_QT_PREFIX}/plugins/application/libtextedit.so \
+${OE_QT_PREFIX}/bin/textedit \
+${OE_QT_PREFIX}/services/View/text/plain/textedit \
+${OE_QT_PREFIX}/services/Open/text/plain/textedit \
+${OE_QT_PREFIX}/pics/textedit \
+${datadir}/applications/qtopia-textedit.desktop \
+${datadir}/pixmaps/textedit/TextEditor.png"
+
+FILES_${PN}-todolist = "\
+${OE_QT_PREFIX}/plugins/application/libtodolist.so \
+${OE_QT_PREFIX}/bin/todolist \
+${OE_QT_PREFIX}/services/Tasks.service \
+${OE_QT_PREFIX}/services/Tasks/todolist \
+${OE_QT_PREFIX}/services/Receive/text/x-vcalendar-Tasks/todolist \
+${OE_QT_PREFIX}/pics/todolist \
+${OE_QT_PREFIX}/etc/qds/Tasks \
+${datadir}/applications/qtopia-todolist.desktop \
+${datadir}/pixmaps/todolist/TodoList.png"
+
+# non quicklaunched apps
+
+FILES_${PN}-appearance = "\
+${OE_QT_PREFIX}/bin/appearance \
+${OE_QT_PREFIX}/services/Settings/appearance \
+${OE_QT_PREFIX}/pics/appearance \
+${datadir}/applications/qtopia-appearance.desktop \
+${datadir}/pixmaps/appearance/Appearance.png"
+
+FILES_${PN}-beaming = "\
+${OE_QT_PREFIX}/bin/beaming \
+${OE_QT_PREFIX}/services/InfraredBeaming.service \
+${OE_QT_PREFIX}/pics/beaming \
+${OE_QT_PREFIX}/etc/qds/InfraredBeaming \
+${datadir}/applications/qtopia-beaming.desktop \
+${datadir}/pixmaps/beaming/Infrared.png"
+
+FILES_${PN}-calibrate = "\
+${OE_QT_PREFIX}/bin/calibrate \
+${OE_QT_PREFIX}/services/calibrate/calibrate \
+${OE_QT_PREFIX}/pics/calibrate \
+${datadir}/applications/qtopia-calibrate.desktop \
+${datadir}/pixmaps/calibrate/Calibrate.png"
+
+FILES_${PN}-callforwarding = "\
+${OE_QT_PREFIX}/bin/callforwarding \
+${OE_QT_PREFIX}/services/CallForwarding/callforwarding \
+${OE_QT_PREFIX}/services/Settings/callforwarding \
+${OE_QT_PREFIX}/pics/callforwarding \
+${datadir}/applications/qtopia-callforwarding.desktop \
+${datadir}/pixmaps/callforwarding/CallForwarding.png"
+
+FILES_${PN}-fifteen = "\
+${OE_QT_PREFIX}/bin/fifteen \
+${OE_QT_PREFIX}/pics/fifteen \
+${datadir}/applications/qtopia-fifteen.desktop \
+${datadir}/pixmaps/fifteen/Fifteen.png"
+
+FILES_${PN}-handwriting = "\
+${OE_QT_PREFIX}/bin/hwsettings \
+${OE_QT_PREFIX}/pics/hwsettings \
+${datadir}/applications/qtopia-handwriting.desktop \
+${datadir}/pixmaps/hwsettings/recognition_settings.png"
+
+FILES_${PN}-homescreen = "\
+${OE_QT_PREFIX}/bin/homescreen \
+${OE_QT_PREFIX}/pics/homescreen \
+${datadir}/applications/qtopia-homescreen.desktop \
+${datadir}/pixmaps/homescreen/homescreen.png"
+
+FILES_${PN}-language = "\
+${OE_QT_PREFIX}/bin/language \
+${OE_QT_PREFIX}/pics/language \
+${datadir}/applications/qtopia-language.desktop \
+${datadir}/pixmaps/language/Language.png"
+
+FILES_${PN}-light-and-power = "\
+${OE_QT_PREFIX}/bin/light-and-power \
+${OE_QT_PREFIX}/services/Settings/light-and-power \
+${OE_QT_PREFIX}/pics/light-and-power \
+${datadir}/applications/qtopia-light-and-power.desktop \
+${datadir}/pixmaps/light-and-power/Light.png"
+
+FILES_${PN}-logging = "\
+${OE_QT_PREFIX}/bin/logging \
+${OE_QT_PREFIX}/pics/logging \
+${datadir}/applications/qtopia-logging.desktop \
+${datadir}/pixmaps/logging/logging.png"
+
+FILES_${PN}-minesweep = "\
+${OE_QT_PREFIX}/bin/minesweep \
+${OE_QT_PREFIX}/pics/minesweep \
+${datadir}/applications/qtopia-minesweep.desktop \
+${datadir}/pixmaps/minesweep/MineHunt.png"
+
+FILES_${PN}-network = "\
+${OE_QT_PREFIX}/bin/netsetup \
+${OE_QT_PREFIX}/services/NetworkSetup/netsetup \
+${OE_QT_PREFIX}/services/NetworkSetup.service \
+${OE_QT_PREFIX}/pics/netsetup \
+${OE_QT_PREFIX}/etc/qds/NetworkSetup \
+${datadir}/applications/qtopia-network.desktop \
+${datadir}/pixmaps/netsetup/PPPConnect.png"
+
+FILES_${PN}-phonenetworks = "\
+${OE_QT_PREFIX}/bin/phonenetworks \
+${OE_QT_PREFIX}/services/CallNetworks/phonenetworks \
+${OE_QT_PREFIX}/pics/phonenetworks \
+${datadir}/applications/qtopia-phonenetworks.desktop \
+${datadir}/pixmaps/phonenetworks/PhoneNetworks.png"
+
+FILES_${PN}-phonesettings = "\
+${OE_QT_PREFIX}/bin/phonesettings \
+${OE_QT_PREFIX}/pics/phonesettings \
+${datadir}/applications/qtopia-phonesettings.desktop \
+${datadir}/pixmaps/phonesettings/PhoneSettings.png"
+
+FILES_${PN}-qdsync = "\
+${OE_QT_PREFIX}/bin/qdsync \
+${OE_QT_PREFIX}/plugins/qdsync/*.so \
+${OE_QT_PREFIX}/pics/qdsync \
+${OE_QT_PREFIX}/lib/libqdsync_common.so.*"
+
+FILES_${PN}-security = "\
+${OE_QT_PREFIX}/bin/security \
+${OE_QT_PREFIX}/pics/security \
+${datadir}/applications/qtopia-security.desktop \
+${datadir}/pixmaps/security/Security.png"
+
+FILES_${PN}-sip = "\
+${OE_QT_PREFIX}/bin/sipagent \
+${OE_QT_PREFIX}/bin/sipsettings \
+${OE_QT_PREFIX}/services/Telephony/sipagent \
+${OE_QT_PREFIX}/services/MediaSession/sipagent \
+${OE_QT_PREFIX}/pics/sipsettings \
+${datadir}/applications/qtopia-sipsettings.desktop \
+${datadir}/pixmaps/sipsettings/SIP.png"
+
+FILES_${PN}-snake = "\
+${OE_QT_PREFIX}/bin/snake \
+${OE_QT_PREFIX}/pics/snake \
+${datadir}/applications/qtopia-snake.desktop \
+${datadir}/pixmaps/snake/Snake.png"
+
+FILES_${PN}-speeddial = "\
+${OE_QT_PREFIX}/bin/speeddial \
+${OE_QT_PREFIX}/pics/speeddial \
+${OE_QT_PREFIX}/sounds/speeddial \
+${datadir}/applications/qtopia-speeddial.desktop \
+${datadir}/pixmaps/speeddial/speeddial.png"
+
+FILES_${PN}-words = "\
+${OE_QT_PREFIX}/bin/words \
+${OE_QT_PREFIX}/pics/words \
+${OE_QT_PREFIX}/etc/dict/en_US/words.dawg \
+${datadir}/applications/qtopia-words.desktop \
+${datadir}/pixmaps/words/Words.png"
+
+FILES_${PN}-worldtime = "\
+${OE_QT_PREFIX}/bin/worldtime \
+${OE_QT_PREFIX}/pics/worldtime \
+${datadir}/applications/qtopia-worldtime.desktop \
+${datadir}/pixmaps/worldtime/CityTime.png"
+
+# non existing apps
+
+FILES_${PN}-archives = "\
+${datadir}/applications/qtopia-archives.desktop"
+
+FILES_${PN}-callscreen = "\
+${datadir}/applications/qtopia-callscreen.desktop"
+
+FILES_${PN}-camera = "\
+${OE_QT_PREFIX}/pics/icons/camera.pic \
+${datadir}/applications/qtopia-camera.desktop \
+${datadir}/pixmaps/camera/Camera.png"
+
+FILES_${PN}-drmbrowser = "\
+${OE_QT_PREFIX}/pics/drm \
+${datadir}/applications/qtopia-drmbrowser.desktop \
+${datadir}/pixmaps/drm/Drm.png"
+
+
+# libs
+
+FILES_${PN}-libamr = "\
+${OE_QT_PREFIX}/lib/libamr.so.* \
+"
+
+FILES_${PN}-libdissipate2 = "\
+${OE_QT_PREFIX}/lib/libdissipate2.so.* \
+"
+
+FILES_${PN}-libgsm = "\
+${OE_QT_PREFIX}/lib/libgsm.so.* \
+"
+
+FILES_${PN}-libinputmatch = "\
+${OE_QT_PREFIX}/lib/libinputmatch.so.* \
+"
+
+FILES_${PN}-libmd5 = "\
+${OE_QT_PREFIX}/lib/libmd5.so.* \
+"
+
+FILES_${PN}-libopenobex = "\
+${OE_QT_PREFIX}/lib/libopenobex.so.* \
+"
+
+FILES_${PN}-libqmstroke = "\
+${OE_QT_PREFIX}/lib/libqmstroke.so.* \
+"
+
+FILES_${PN}-libqtcore = "\
+${OE_QT_PREFIX}/lib/libQtCore.so.* \
+"
+
+FILES_${PN}-libqtdbus = "\
+${OE_QT_PREFIX}/lib/libQtDBus.so.* \
+"
+
+FILES_${PN}-libqtgui = "\
+${OE_QT_PREFIX}/lib/libQtGui.so.* \
+"
+
+FILES_${PN}-libqtnetwork = "\
+${OE_QT_PREFIX}/lib/libQtNetwork.so.* \
+"
+
+FILES_${PN}-libqtopengl = "\
+${OE_QT_PREFIX}/lib/libQtOpenGL.so.* \
+"
+
+FILES_${PN}-libqtopiaaudio = "\
+${OE_QT_PREFIX}/lib/libqtopiaaudio.so.* \
+"
+
+FILES_${PN}-libqtopiabase = "\
+${OE_QT_PREFIX}/lib/libqtopiabase.so.* \
+"
+
+FILES_${PN}-libqtopiacomm = "\
+${OE_QT_PREFIX}/lib/libqtopiacomm.so.* \
+"
+
+FILES_${PN}-libqtopiamail = "\
+${OE_QT_PREFIX}/lib/libqtopiamail.so.* \
+"
+
+FILES_${PN}-libqtopiamedia = "\
+${OE_QT_PREFIX}/lib/libqtopiamedia.so.* \
+"
+
+FILES_${PN}-libqtopiaphonemodem = "\
+${OE_QT_PREFIX}/lib/libqtopiaphonemodem.so.* \
+"
+
+FILES_${PN}-libqtopiaphone = "\
+${OE_QT_PREFIX}/lib/libqtopiaphone.so.* \
+"
+
+FILES_${PN}-libqtopiapim = "\
+${OE_QT_PREFIX}/lib/libqtopiapim.so.* \
+"
+
+FILES_${PN}-libqtopiaprinting = "\
+${OE_QT_PREFIX}/lib/libqtopiaprinting.so.* \
+"
+
+FILES_${PN}-libqtopiasmil = "\
+${OE_QT_PREFIX}/lib/libqtopiasmil.so.* \
+"
+
+FILES_${PN}-libqtopia = "\
+${OE_QT_PREFIX}/lib/libqtopia.so.* \
+"
+
+FILES_${PN}-libqtopia-sqlite = "\
+${OE_QT_PREFIX}/lib/libqtopia-sqlite.so.* \
+"
+
+FILES_${PN}-libqtscript = "\
+${OE_QT_PREFIX}/lib/libQtScript.so.* \
+"
+
+FILES_${PN}-libqtsql = "\
+${OE_QT_PREFIX}/lib/libQtSql.so.* \
+"
+
+FILES_${PN}-libqtsvg = "\
+${OE_QT_PREFIX}/lib/libQtSvg.so.* \
+"
+
+FILES_${PN}-libqtxml = "\
+${OE_QT_PREFIX}/lib/libQtXml.so.* \
+"
+
+FILES_${PN}-libtimidity = "\
+${OE_QT_PREFIX}/lib/libtimidity.so.* \
+${OE_QT_PREFIX}/etc/timidity \
+"
+
+FILES_${PN}-libvorbisidec = "\
+${OE_QT_PREFIX}/lib/libvorbisidec.so.* \
+"
+
+# misc stuff
+
+FILES_${PN}-mediaserver = "\
+${OE_QT_PREFIX}/bin/mediaserver \
+${OE_QT_PREFIX}/services/MediaServer/mediaserver \
+"
+
+FILES_${PN}-pics-samples = "\
+${OE_QT_PREFIX}/pics/samples \
+"
+
+FILES_${PN}-manual = "${OE_QT_PREFIX}/help"
+
+FILES_${PN}-qpf-fonts = "${OE_QT_PREFIX}/lib/fonts"
+
 FILES_${PN} += "${OE_QT_PREFIX}/bin ${OE_QT_PREFIX}/help  \
-                ${OE_QT_PREFIX}/lib/*.so.* ${OE_QT_PREFIX}/plugins/*/*.so \
+                ${OE_QT_PREFIX}/lib/*.so.* \
                 ${OE_QT_PREFIX}/qtopia_db.sqlite ${OE_QT_PREFIX}/sounds \
                 ${OE_QT_PREFIX}/etc ${OE_QT_PREFIX}/i18n \
-                ${OE_QT_PREFIX}/pics ${OE_QT_PREFIX}/qt_plugins/*/*.so \
+                ${OE_QT_PREFIX}/pics \
                 ${OE_QT_PREFIX}/services"
 
 FILES_${PN}-dbg += "${OE_QT_PREFIX}/lib/.debug/ ${OE_QT_PREFIX}/bin/.debug/ \
============================================================
--- packages/tasks/task-openmoko-qtopia-x11.bb	9ba089cc7d924228e8bf151d1ad3d5279cc23c13
+++ packages/tasks/task-openmoko-qtopia-x11.bb	108f8f9db6bc9e31caeccfbb3259449d44f5409f
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 LICENSE = "MIT"
-PR = "r51"
+PR = "r51.1"
 
 inherit task
 
@@ -16,9 +16,18 @@ RDEPENDS_task-openmoko-qtopia-x11 = "\
 #
 DESCRIPTION_task-openmoko-qtopia-x11 = "Openmoko: The Qtopia/X11 based User Interface"
 RDEPENDS_task-openmoko-qtopia-x11 = "\
+  alsa-state \
   bluez-hcidump \
   readline \
   qtopia-phone-x11 \
+  qtopia-phone-x11-addressbook \
+  qtopia-phone-x11-qtmail \
+  qtopia-phone-x11-clock \
+  qtopia-phone-x11-systemtime \
+  qtopia-phone-x11-light-and-power \
+  qtopia-phone-x11-minesweep \
+  qtopia-phone-x11-mediaserver \
+  qtopia-phone-x11-media-gstreamer \
   e-wm \
   illume \
   illume-theme \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/7694cdf7/attachment-0001.htm 


More information about the commitlog mailing list