summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-07-04 18:19:42 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-07-04 18:19:42 +0000
commitf20d1cf61150e90ad8d804fe9d4ddbd0663dd296 (patch)
tree4f595519ee7092f051e6bd134c6ab87024271e28 /packages
parentd8f8c8ae824998c9e7b886f0a6c3e0488e998cde (diff)
opie-multikey: Fix hardcoded rpath.
Diffstat (limited to 'packages')
-rw-r--r--packages/opie-multikey/files/fix-rpath.patch11
-rw-r--r--packages/opie-multikey/opie-multikey_cvs.bb5
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"