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

[polyonymous commit]

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

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

#
# mt diff -rad674e0204e9c297078728d296e742da2788ebca -rb8f3ceea8c191a18b6467c7543464c706bdfa8a7
#
# 
# 
# add_dir "packages/opie-dvorak/files"
# 
# add_file "packages/opie-dvorak/files/fix-rpath.patch"
#  content [80ef89fabf32f6bf724a517e2c8b182049a2faf7]
# 
# patch "packages/opie-dvorak/opie-dvorak.inc"
#  from [9f6ea781f5c962c033391eb3677e734f930a4a0b]
#    to [9f99624ce70248f0d6ece81420c6ca33021f42b0]
# 
# patch "packages/opie-dvorak/opie-dvorak_cvs.bb"
#  from [8f4ee9e171bf1cf5c4b42ea7c8fe1d7a88559220]
#    to [b7e83e92b18dc1bb83c5c6f3f6c170e9f0e100e1]
# 
============================================================
--- packages/opie-dvorak/files/fix-rpath.patch	80ef89fabf32f6bf724a517e2c8b182049a2faf7
+++ packages/opie-dvorak/files/fix-rpath.patch	80ef89fabf32f6bf724a517e2c8b182049a2faf7
@@ -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 )
============================================================
--- packages/opie-dvorak/opie-dvorak.inc	9f6ea781f5c962c033391eb3677e734f930a4a0b
+++ packages/opie-dvorak/opie-dvorak.inc	9f99624ce70248f0d6ece81420c6ca33021f42b0
@@ -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/libqdvorak.so*
============================================================
--- packages/opie-dvorak/opie-dvorak_cvs.bb	8f4ee9e171bf1cf5c4b42ea7c8fe1d7a88559220
+++ packages/opie-dvorak/opie-dvorak_cvs.bb	b7e83e92b18dc1bb83c5c6f3f6c170e9f0e100e1
@@ -1,6 +1,8 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dvorak \
+           ${HANDHELDS_CVS};module=opie/inputmethods/pickboard \
+	   file://fix-rpath.patch;patch=1 "
-           ${HANDHELDS_CVS};module=opie/inputmethods/pickboard"