diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-01-03 11:23:51 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-01-03 11:23:51 +0000 |
| commit | 2bf2795e073cf284ec32b4e659496971a3fbb819 (patch) | |
| tree | 7f8dcb144ddf851f653852dc79c4f69975d7ac3b | |
| parent | e6456ede2a1737515f82c0acce0f30604c5e013b (diff) | |
| parent | c045002750b6789b13668abef077e22d2b598808 (diff) | |
merge of 'b56480f5496377245fb319218acc01132afd55d4'
and 'e073022cc54795bb1f1d4970d0785a18d25a5136'
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar/firstuse-path.patch | 11 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_1.2.3.bb | 1 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_cvs.bb | 3 | ||||
| -rw-r--r-- | packages/xrestop/xrestop_0.4.bb | 3 |
4 files changed, 17 insertions, 1 deletions
diff --git a/packages/opie-taskbar/opie-taskbar/firstuse-path.patch b/packages/opie-taskbar/opie-taskbar/firstuse-path.patch new file mode 100644 index 0000000000..636eb81675 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar/firstuse-path.patch @@ -0,0 +1,11 @@ +--- launcher/firstuse.cpp 2007-10-14 12:47:55.000000000 +1300 ++++ launcher/firstuse.cpp 2007-10-14 13:58:54.000000000 +1300 +@@ -124,7 +124,7 @@ + #endif + + for ( int i = 0; settingsTable[i].app; i++ ) { +- QString file = QPEApplication::qpeDir() + "bin/"; ++ QString file = OPIE_BINDIR + QString("/"); + file += settingsTable[i].app; + file += exeSuffix; + if ( QFile::exists(file) ) diff --git a/packages/opie-taskbar/opie-taskbar_1.2.3.bb b/packages/opie-taskbar/opie-taskbar_1.2.3.bb index d8a794fc16..c22e3bed5f 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.3.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.3.bb @@ -13,4 +13,5 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ file://kbdlocks-runtime.patch;patch=1 \ file://restart-from-bindir.patch;patch=1 \ file://server.pro \ + file://firstuse-path.patch;patch=1 \ " diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 3bda5c4f40..e84e35d820 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r15" +PR = "r16" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -14,4 +14,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ file://kbdlocks-runtime.patch;patch=1 \ file://restart-from-bindir.patch;patch=1 \ file://server.pro \ + file://firstuse-path.patch;patch=1 \ " diff --git a/packages/xrestop/xrestop_0.4.bb b/packages/xrestop/xrestop_0.4.bb index 40396a2362..0ecf39a84b 100644 --- a/packages/xrestop/xrestop_0.4.bb +++ b/packages/xrestop/xrestop_0.4.bb @@ -1,5 +1,8 @@ +DESCRIPTION = "top-like statistics of X11 server resource usage by clients" +SECTION = "x11/utils" HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xrestop" LICENSE = "GPL" +PR = "r1" DEPENDS = "libxres libxext virtual/libx11" |