From 6f41469dd2143114330cc25090d59bb2e369d819 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Thu, 12 Jul 2007 19:56:27 +0000
Subject: opie-taskbar: Add patch to get rid of 1-pix stray gap under taskbar.
 * Upstream http://opie-bugs.oszine.de/view.php?id=1864

---
 packages/opie-taskbar/opie-taskbar/01-1px-gap.patch | 12 ++++++++++++
 packages/opie-taskbar/opie-taskbar_cvs.bb           |  5 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 packages/opie-taskbar/opie-taskbar/01-1px-gap.patch

diff --git a/packages/opie-taskbar/opie-taskbar/01-1px-gap.patch b/packages/opie-taskbar/opie-taskbar/01-1px-gap.patch
new file mode 100644
index 0000000000..bfb4d1d234
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/01-1px-gap.patch
@@ -0,0 +1,12 @@
+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 ad3931adc7..a2d69a7af1 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 = "r13"
+PR = "r14"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -12,6 +12,7 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            file://nomax.patch;patch=1;pnum=3 \
            file://no-builtin-qss-startup.patch;patch=1 \
            file://kbdlocks-runtime.patch;patch=1 \
-           file://server.pro \
 	   file://restart-from-bindir.patch;patch=1 \
+	   file://01-1px-gap.patch;patch=1 \
+           file://server.pro \
           "
-- 
cgit 1.2.3-korg