diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-07-08 18:53:15 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-07-08 18:53:15 +0000 |
| commit | e35b03a3bad4a30461aad4fecb16a1a7a9c67d8a (patch) | |
| tree | 6b5b8bccaaeb18d1cde7137c01c6c981d0950f48 /packages/opie-keyboard | |
| parent | c00723de0b20bbd6b1674442834d10bb68d78752 (diff) | |
| parent | d539197e866ddfac5c6c2f6f91435df5310dd04a (diff) | |
merge of '3b04f9d33d900f95c8814c78ad7693a4bd404ded'
and 'f6a57e1a7e63e62b04f74e02986c4cc6c30ece2a'
Diffstat (limited to 'packages/opie-keyboard')
| -rw-r--r-- | packages/opie-keyboard/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/opie-keyboard/files/fix-rpath.patch | 13 | ||||
| -rw-r--r-- | packages/opie-keyboard/opie-keyboard.inc | 4 | ||||
| -rw-r--r-- | packages/opie-keyboard/opie-keyboard_cvs.bb | 4 |
4 files changed, 18 insertions, 3 deletions
diff --git a/packages/opie-keyboard/files/.mtn2git_empty b/packages/opie-keyboard/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-keyboard/files/.mtn2git_empty diff --git a/packages/opie-keyboard/files/fix-rpath.patch b/packages/opie-keyboard/files/fix-rpath.patch new file mode 100644 index 0000000000..d917aeb609 --- /dev/null +++ b/packages/opie-keyboard/files/fix-rpath.patch @@ -0,0 +1,13 @@ +diff --git a/keyboard.pro b/keyboard.pro +index 3a9e075..52bc10d 100644 +--- a/keyboard.pro ++++ b/keyboard.pro +@@ -9,7 +9,7 @@ DESTDIR = ../../plugins/inputmethods + INCLUDEPATH += $(OPIEDIR)/include + DEPENDPATH += ../../launcher + LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard +-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-keyboard/opie-keyboard.inc b/packages/opie-keyboard/opie-keyboard.inc index d99b02ab80..122e30f38e 100644 --- a/packages/opie-keyboard/opie-keyboard.inc +++ b/packages/opie-keyboard/opie-keyboard.inc @@ -14,7 +14,7 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()" + ${bindir}/qcop QPE/TaskBar "reloadInputMethods()" else exit 0 fi @@ -24,7 +24,7 @@ fi pkg_postrm() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()" +${bindir}/qcop QPE/TaskBar "reloadInputMethods()" } # FILES plugins/inputmethods/libqkeyboard.so* diff --git a/packages/opie-keyboard/opie-keyboard_cvs.bb b/packages/opie-keyboard/opie-keyboard_cvs.bb index 0e6f66710e..e2cdeef495 100644 --- a/packages/opie-keyboard/opie-keyboard_cvs.bb +++ b/packages/opie-keyboard/opie-keyboard_cvs.bb @@ -1,5 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" -SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard " +SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard \ + file://fix-rpath.patch;patch=1 " |