[oe] [PATCH] xkbd_0.8.15.bb: Fix geometry flag to accept negative offsets.

[Graham Gower]

Signed-off-by: Graham Gower <graham.gower at gmail.com>
---
 .../xkbd-0.8.15/xkbd-0.8.15-fix-geometry.patch     |   37 ++++++++++++++++++++
 recipes/xkbd/xkbd_0.8.15.bb                        |    3 +-
 2 files changed, 39 insertions(+), 1 deletions(-)
 create mode 100644 recipes/xkbd/xkbd-0.8.15/xkbd-0.8.15-fix-geometry.patch

diff --git a/recipes/xkbd/xkbd-0.8.15/xkbd-0.8.15-fix-geometry.patch b/recipes/xkbd/xkbd-0.8.15/xkbd-0.8.15-fix-geometry.patch
new file mode 100644
index 0000000..65deb8d
--- /dev/null
+++ b/recipes/xkbd/xkbd-0.8.15/xkbd-0.8.15-fix-geometry.patch
@@ -0,0 +1,37 @@
+Fix handling of the -geometry option.
+Author: Gautam Iyer, see http://bugs.gentoo.org/214353
+diff -ruN xkbd-0.8.15/src/xkbd.c xkbd-0.8.15-new/src/xkbd.c
+--- xkbd-0.8.15/src/xkbd.c	2003-09-29 10:29:35.000000000 -0700
++++ xkbd-0.8.15-new/src/xkbd.c	2008-03-23 02:43:20.000000000 -0700
+@@ -307,19 +307,20 @@
+ 				0, BlackPixel(display, screen_num),
+ 				WhitePixel(display, screen_num));
+       
++      wret = DisplayWidth(display, screen_num);
++      hret = DisplayHeight(display, screen_num)/4;
++      xret = 0;
++      yret = DisplayHeight(display, screen_num) - hret;
++
+       if (geometry != NULL)
+ 	{
+-	  XParseGeometry(geometry, &xret, &yret, &wret, &hret );
+-	}
+-      else
+-	{
+-	  if (wm_type != WM_MATCHBOX)
+-	    {
+-	      wret = DisplayWidth(display, screen_num);
+-	      hret = DisplayHeight(display, screen_num)/4;
+-	      xret = 0;
+-	      yret = DisplayHeight(display, screen_num) - hret;
+-	    }
++	  int flags;
++
++	  flags = XParseGeometry(geometry, &xret, &yret, &wret, &hret );
++	  if( flags & XNegative )
++	      xret += DisplayWidth( display, screen_num ) - wret;
++	  if( flags & YNegative )
++	      yret += DisplayHeight( display, screen_num ) - hret;
+ 	}
+       
+       /* check for user selected keyboard conf file */
diff --git a/recipes/xkbd/xkbd_0.8.15.bb b/recipes/xkbd/xkbd_0.8.15.bb
index 309d7d8..cda2be9 100644
--- a/recipes/xkbd/xkbd_0.8.15.bb
+++ b/recipes/xkbd/xkbd_0.8.15.bb
@@ -4,9 +4,10 @@ SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/xkbd-${PV}-CVS.
 	   file://fix-circumkey.patch \
 	   file://add-default-common-slides.patch \
 	   file://differentiate-desktop-name.patch \
+	   file://xkbd-0.8.15-fix-geometry.patch \
 	   file://xkbd.png"
 LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
 
 SECTION = "x11"
 DEPENDS = "libxpm libxtst libxft"
-- 
1.7.1