diff options
Diffstat (limited to 'packages/opie-taskbar')
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar-images.inc | 7 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar/firstuse-path.patch | 11 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_1.2.3.bb | 1 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_cvs.bb | 3 |
4 files changed, 20 insertions, 2 deletions
diff --git a/packages/opie-taskbar/opie-taskbar-images.inc b/packages/opie-taskbar/opie-taskbar-images.inc index 2eac502751..7ec97bc56c 100644 --- a/packages/opie-taskbar/opie-taskbar-images.inc +++ b/packages/opie-taskbar/opie-taskbar-images.inc @@ -7,6 +7,8 @@ APPNAME = "qpe" S = "${WORKDIR}/pics" +inherit opie + # Wallpaper and welcome splash PIXMAP_SIZE = "" PIXMAP_SIZE_c7x0 = "-640x480" @@ -18,7 +20,9 @@ PIXMAP_SIZE_asus730 = "-480x640" PIXMAP_SIZE_htcuniversal= "-480x640" PIXMAP_SIZE_hx4700 = "-480x640" -PACKAGES = "${PN}-320x480 ${PN}-480x320 ${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320" +do_configure() { + : +} do_install() { install -d ${D}${palmtopdir}/pics/launcher @@ -54,3 +58,4 @@ python do_package_prepend () { } PACKAGE_ARCH = "all" +PACKAGES = "${PN}-dbg ${PN}-320x480 ${PN}-480x320 ${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320" diff --git a/packages/opie-taskbar/opie-taskbar/firstuse-path.patch b/packages/opie-taskbar/opie-taskbar/firstuse-path.patch new file mode 100644 index 0000000000..636eb81675 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar/firstuse-path.patch @@ -0,0 +1,11 @@ +--- launcher/firstuse.cpp 2007-10-14 12:47:55.000000000 +1300 ++++ launcher/firstuse.cpp 2007-10-14 13:58:54.000000000 +1300 +@@ -124,7 +124,7 @@ + #endif + + for ( int i = 0; settingsTable[i].app; i++ ) { +- QString file = QPEApplication::qpeDir() + "bin/"; ++ QString file = OPIE_BINDIR + QString("/"); + file += settingsTable[i].app; + file += exeSuffix; + if ( QFile::exists(file) ) diff --git a/packages/opie-taskbar/opie-taskbar_1.2.3.bb b/packages/opie-taskbar/opie-taskbar_1.2.3.bb index d8a794fc16..c22e3bed5f 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.3.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.3.bb @@ -13,4 +13,5 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ file://kbdlocks-runtime.patch;patch=1 \ file://restart-from-bindir.patch;patch=1 \ file://server.pro \ + file://firstuse-path.patch;patch=1 \ " diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 3bda5c4f40..e84e35d820 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r15" +PR = "r16" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -14,4 +14,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ file://kbdlocks-runtime.patch;patch=1 \ file://restart-from-bindir.patch;patch=1 \ file://server.pro \ + file://firstuse-path.patch;patch=1 \ " |