[oe-commits] org.oe.dev opie-taskbar: Get rid of build-time configuration, do it runtime instead.

[pfalcon commit]

opie-taskbar: Get rid of build-time configuration, do it runtime instead.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: bf546e1b3f00713238ad635fbbf3112cf2e192b3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=bf546e1b3f00713238ad635fbbf3112cf2e192b3
Files:
1
packages/opie-taskbar/opie-taskbar.inc
packages/opie-taskbar/opie-taskbar_cvs.bb
Diffs:

#
# mt diff -r7d3851c28c78bcf6e8d5bd68b2bcfeb646bb9a42 -rbf546e1b3f00713238ad635fbbf3112cf2e192b3
#
# 
# 
# patch "packages/opie-taskbar/opie-taskbar.inc"
#  from [55a57b01683884f6aa9d50f9f159252288818a36]
#    to [612634b0a0376dfe1e4b563804c51987a32320b0]
# 
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
#  from [da42bdffebc1782be9162e711c4c5cf5a5a6e4db]
#    to [0081cd5790b5ddf838977339678872f2b347b50c]
# 
============================================================
--- packages/opie-taskbar/opie-taskbar.inc	55a57b01683884f6aa9d50f9f159252288818a36
+++ packages/opie-taskbar/opie-taskbar.inc	612634b0a0376dfe1e4b563804c51987a32320b0
@@ -7,15 +7,6 @@ S = "${WORKDIR}/launcher"
 
 S = "${WORKDIR}/launcher"
 
-# Caps/Numlock icons for devices with keyboard
-EXTRA_QMAKEVARS_POST_append_collie 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_poodle 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_c7x0 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_tosa 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_spitz	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_akita	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_htcuniversal= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-
 # Wallpaper and welcome splash
 PIXMAP_SIZE 		= ""
 PIXMAP_SIZE_c7x0 	= "-640x480"
============================================================
--- packages/opie-taskbar/opie-taskbar_cvs.bb	da42bdffebc1782be9162e711c4c5cf5a5a6e4db
+++ packages/opie-taskbar/opie-taskbar_cvs.bb	0081cd5790b5ddf838977339678872f2b347b50c
@@ -1,6 +1,6 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -11,5 +11,6 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/
            ${HANDHELDS_CVS};module=opie/etc \
            file://nomax.patch;patch=1;pnum=3 \
            file://no-builtin-qss-startup.patch;patch=1 \
+           file://kbdlocks-runtime.patch;patch=1 \
            file://server.pro \
           "