diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-04 18:22:38 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-04 18:22:38 +0000 |
| commit | baa8e0c157d4196478fb2c69b0e384d9a4c44b23 (patch) | |
| tree | ff6f9b347aad83c3e6f3708a3061e34941c923db | |
| parent | 529c3cb8561d06ade5b58a9b439f7c88781b009f (diff) | |
| parent | 992dd4f3c4d17321d0baaf5087ad022c980bff43 (diff) | |
merge of '0eb06e644668e069af094409f30e23fcd3d9c1dc'
and 'f9f12a308eb181f774d74489bbf74aab0dbdb33b'
| -rw-r--r-- | packages/opie-multikey/files/fix-rpath.patch | 11 | ||||
| -rw-r--r-- | packages/opie-multikey/opie-multikey_cvs.bb | 5 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch | 35 |
3 files changed, 49 insertions, 2 deletions
diff --git a/packages/opie-multikey/files/fix-rpath.patch b/packages/opie-multikey/files/fix-rpath.patch new file mode 100644 index 0000000000..786f618324 --- /dev/null +++ b/packages/opie-multikey/files/fix-rpath.patch @@ -0,0 +1,11 @@ +--- multikey/multikey.pro.org 2005-06-16 01:54:51.000000000 +0300 ++++ multikey/multikey.pro 2007-07-04 21:02:52.000000000 +0300 +@@ -11,7 +11,7 @@ + INCLUDEPATH += $(OPIEDIR)/include + DEPENDPATH += ../../launcher + LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2 -lopiecore2 -lopieui2 +-QMAKE_LFLAGS += -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods ++QMAKE_LFLAGS += -Wl,-rpath,$(palmtopdir)/plugins/inputmethods + VERSION = 1.0.0 + + include( $(OPIEDIR)/include.pro ) diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb index 53d8db91b4..c16c36616b 100644 --- a/packages/opie-multikey/opie-multikey_cvs.bb +++ b/packages/opie-multikey/opie-multikey_cvs.bb @@ -1,9 +1,10 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r3" +PR = "r4" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \ - ${HANDHELDS_CVS};module=opie/share" + ${HANDHELDS_CVS};module=opie/share \ + file://fix-rpath.patch;patch=1" # file://friendly-button-names.patch;patch=1" diff --git a/packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch b/packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch new file mode 100644 index 0000000000..e356682768 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch @@ -0,0 +1,35 @@ +--- launcher/taskbar.h.org 2004-08-23 00:35:22.000000000 +0300 ++++ launcher/taskbar.h 2007-07-04 19:23:54.000000000 +0300 +@@ -84,6 +84,7 @@ + LockKeyState* lockState; + StartMenu *sm; + bool resizeRunningApp; ++ bool showKbdLockState; + }; + + +--- launcher/taskbar.cpp.org 2005-07-04 01:13:00.000000000 +0300 ++++ launcher/taskbar.cpp 2007-07-04 19:24:48.000000000 +0300 +@@ -213,12 +213,9 @@ + (void)new SafeMode( this ); + #endif + +- // ## make customizable in some way? +-#ifdef OPIE_TASKBAR_LOCK_KEY_STATE +- lockState = new LockKeyState( this ); +-#else + lockState = 0; +-#endif ++ if ( showKbdLockState ) ++ lockState = new LockKeyState( this ); + + #if defined(Q_WS_QWS) + #if !defined(QT_NO_COP) +@@ -388,6 +385,7 @@ + Config cfg( "Launcher" ); + cfg.setGroup( "InputMethods" ); + resizeRunningApp = cfg.readBoolEntry( "Resize", true ); ++ showKbdLockState = cfg.readBoolEntry( "ShowKbdLocks", true ); + } + + #include "taskbar.moc" |