diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-07-05 16:21:53 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-07-05 16:21:53 +0000 |
| commit | 8d3f7b27e80ba08d2dc0e8167f01d27527697e06 (patch) | |
| tree | b1fa703042aa93dc9aaa90df0695211de7d9e807 /packages/opie-multikey | |
| parent | b0dc3a8d1dc7e79b7960ee7503d80a7d43b8793f (diff) | |
| parent | 2ed2875b6c56be3a2f2b9db557e22024d3e92dd6 (diff) | |
merge of '6ecc6574ba0db38196a290448aaaf3706bcacee3'
and '7314baf01ff720449ddb034e256e260501df588f'
Diffstat (limited to 'packages/opie-multikey')
| -rw-r--r-- | packages/opie-multikey/files/fix-rpath.patch | 11 | ||||
| -rw-r--r-- | packages/opie-multikey/opie-multikey_cvs.bb | 5 |
2 files changed, 14 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" |