[oe-commits] org.oe.dev opie-keyboard: adjust post{inst, rm} and rpath to the new layout

[polyonymous commit]

opie-keyboard: adjust post{inst,rm} and rpath to the new layout

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: 4b50a70c61d4ec680a831974ffb44c055e21884a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4b50a70c61d4ec680a831974ffb44c055e21884a
Files:
1
packages/opie-keyboard/files
packages/opie-keyboard/files/fix-rpath.patch
packages/opie-keyboard/opie-keyboard.inc
packages/opie-keyboard/opie-keyboard_cvs.bb
Diffs:

#
# mt diff -rde51552e84a1acc4ce884c7272d672ba1e156906 -r4b50a70c61d4ec680a831974ffb44c055e21884a
#
# 
# 
# add_dir "packages/opie-keyboard/files"
# 
# add_file "packages/opie-keyboard/files/fix-rpath.patch"
#  content [d6c5f3c1f91119af69f831b4f0105983131ce1cf]
# 
# patch "packages/opie-keyboard/opie-keyboard.inc"
#  from [e33f6839599638f3da65eb77597bd39b9805e53f]
#    to [9aa5e2261617a930ad1c18040c026784a8a6f640]
# 
# patch "packages/opie-keyboard/opie-keyboard_cvs.bb"
#  from [b0d6785c582eedcd7e61fa81ce9425706b24c423]
#    to [9598a6775d246bf310ac42f466b9847f35af1351]
# 
============================================================
--- packages/opie-keyboard/files/fix-rpath.patch	d6c5f3c1f91119af69f831b4f0105983131ce1cf
+++ packages/opie-keyboard/files/fix-rpath.patch	d6c5f3c1f91119af69f831b4f0105983131ce1cf
@@ -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 )
============================================================
--- packages/opie-keyboard/opie-keyboard.inc	e33f6839599638f3da65eb77597bd39b9805e53f
+++ packages/opie-keyboard/opie-keyboard.inc	9aa5e2261617a930ad1c18040c026784a8a6f640
@@ -14,7 +14,7 @@ if pidof -s qpe >/dev/null; then
 #!/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 @@ if [ -n "$D" ]; then exit 1; 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*
============================================================
--- packages/opie-keyboard/opie-keyboard_cvs.bb	b0d6785c582eedcd7e61fa81ce9425706b24c423
+++ packages/opie-keyboard/opie-keyboard_cvs.bb	9598a6775d246bf310ac42f466b9847f35af1351
@@ -1,5 +1,7 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
+SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard \
+	file://fix-rpath.patch;patch=1 "
-SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard "