diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-17 11:39:55 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-17 11:39:55 +0000 |
| commit | 63666c67e22069c7054a8a1067fecff7c027c425 (patch) | |
| tree | 9e9914433968cefbab995e4cf24257eda8e04861 /packages/opie-taskbar | |
| parent | 00dfa13f6ae93309ea2f209634a41e2c3666873f (diff) | |
opie-taskbar cvs: Patches merged upstream.
Diffstat (limited to 'packages/opie-taskbar')
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar/01-1px-gap.patch | 12 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_cvs.bb | 3 |
2 files changed, 1 insertions, 14 deletions
diff --git a/packages/opie-taskbar/opie-taskbar/01-1px-gap.patch b/packages/opie-taskbar/opie-taskbar/01-1px-gap.patch deleted file mode 100644 index bfb4d1d234..0000000000 --- a/packages/opie-taskbar/opie-taskbar/01-1px-gap.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naru launcher.orig/serverinterface.cpp launcher/serverinterface.cpp ---- launcher.orig/serverinterface.cpp 2003-08-28 16:45:00.000000000 +0200 -+++ launcher/serverinterface.cpp 2007-07-05 13:02:08.000000000 +0200 -@@ -113,7 +113,7 @@ - mwr.setTop( w->geometry().bottom() + 1 ); - break; - case ServerInterface::Bottom: -- w->setGeometry( mwr.left(), mwr.bottom() - sh.height(), -+ w->setGeometry( mwr.left(), mwr.bottom() - sh.height() + 1, - mwr.width(), sh.height() ); - mwr.setBottom( w->geometry().top() - 1 ); - break; diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index a2d69a7af1..3bda5c4f40 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 = "r14" +PR = "r15" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -13,6 +13,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ file://no-builtin-qss-startup.patch;patch=1 \ file://kbdlocks-runtime.patch;patch=1 \ file://restart-from-bindir.patch;patch=1 \ - file://01-1px-gap.patch;patch=1 \ file://server.pro \ " |