opie-taskbar cvs: Patches merged upstream.

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 (file)
index bfb4d1d..0000000
--- 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 a2d69a7..3bda5c4 100644 (file)
--- 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 \
           "