diff options
| author | Michael Krelin <hacker@klever.net> | 2007-07-07 18:48:16 +0000 |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2007-07-07 18:48:16 +0000 |
| commit | 79d14d53ff8560341514a24e4eb8440f94420b9e (patch) | |
| tree | 50ba2c8cce3df7373d4f60f5a914ed0ecd1cda33 /packages/opie-dvorak | |
| parent | 3240787ece90371a1b9802842f1d5345be47c82d (diff) | |
opie-dvorak: adjust post{inst,rm} and rpath to the new layout
Diffstat (limited to 'packages/opie-dvorak')
| -rw-r--r-- | packages/opie-dvorak/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/opie-dvorak/files/fix-rpath.patch | 13 | ||||
| -rw-r--r-- | packages/opie-dvorak/opie-dvorak.inc | 4 | ||||
| -rw-r--r-- | packages/opie-dvorak/opie-dvorak_cvs.bb | 4 |
4 files changed, 18 insertions, 3 deletions
diff --git a/packages/opie-dvorak/files/.mtn2git_empty b/packages/opie-dvorak/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-dvorak/files/.mtn2git_empty diff --git a/packages/opie-dvorak/files/fix-rpath.patch b/packages/opie-dvorak/files/fix-rpath.patch new file mode 100644 index 0000000000..37e2e5a37d --- /dev/null +++ b/packages/opie-dvorak/files/fix-rpath.patch @@ -0,0 +1,13 @@ +diff --git a/dvorak.pro b/dvorak.pro +index b659ab5..c1cf861 100644 +--- a/dvorak.pro ++++ b/dvorak.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-dvorak/opie-dvorak.inc b/packages/opie-dvorak/opie-dvorak.inc index 7e4445dd42..78ba4fc667 100644 --- a/packages/opie-dvorak/opie-dvorak.inc +++ b/packages/opie-dvorak/opie-dvorak.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/libqdvorak.so* diff --git a/packages/opie-dvorak/opie-dvorak_cvs.bb b/packages/opie-dvorak/opie-dvorak_cvs.bb index bf38334b0c..54234dda7a 100644 --- a/packages/opie-dvorak/opie-dvorak_cvs.bb +++ b/packages/opie-dvorak/opie-dvorak_cvs.bb @@ -1,6 +1,8 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dvorak \ - ${HANDHELDS_CVS};module=opie/inputmethods/pickboard" + ${HANDHELDS_CVS};module=opie/inputmethods/pickboard \ + file://fix-rpath.patch;patch=1 " |