OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e35772d79306d1d9de19c12b23681618532d.

5 files changed, 104 insertions, 0 deletions

diff --git a/org.handhelds.familiar/packages/xkbd/xkbd-0.8.15/fix-circumkey.patch b/org.handhelds.familiar/packages/xkbd/xkbd-0.8.15/fix-circumkey.patch
new file mode 100644
index 0000000..b23a2a3
--- /dev/null
+++ b/org.handhelds.familiar/packages/xkbd/xkbd-0.8.15/fix-circumkey.patch
@@ -0,0 +1,18 @@
+--- xkbd-0.8.15.orig/data/en_GB.qwerty.xkbd.in	2006-03-09 14:48:09.000000000 +0100
++++ xkbd-0.8.15/data/en_GB.qwerty.xkbd.in	2006-03-09 14:52:36.000000000 +0100
+@@ -95,7 +95,7 @@
+ 		default  6
+ 		default_ks  6
+ 		shift  ^
+-		shift_ks  numbersign
++		shift_ks  asciicircum
+ 	</key>
+ 	<key>
+ 		default  7
+@@ -438,4 +438,4 @@
+ 		shift_ks  Control_R
+ 	</key>
+ </row>
+-</layout>
+\ No newline at end of file
++</layout>
diff --git a/org.handhelds.familiar/packages/xkbd/xkbd-0.8.15/fix-equalsign.patch b/org.handhelds.familiar/packages/xkbd/xkbd-0.8.15/fix-equalsign.patch
new file mode 100644
index 0000000..dac0a60
--- /dev/null
+++ b/org.handhelds.familiar/packages/xkbd/xkbd-0.8.15/fix-equalsign.patch
@@ -0,0 +1,24 @@
+diff -upr xkbd-0.8.15.orig/data/en_GB.qwerty.tabletpc.xkbd.in xkbd-0.8.15/data/en_GB.qwerty.tabletpc.xkbd.in
+--- xkbd-0.8.15.orig/data/en_GB.qwerty.tabletpc.xkbd.in	2003-06-30 19:58:35.000000000 +0100
++++ xkbd-0.8.15/data/en_GB.qwerty.tabletpc.xkbd.in	2006-02-04 10:59:19.000000000 +0000
+@@ -131,7 +131,7 @@ button_style rounded
+ 		default  +
+ 		default_ks  plus
+ 		shift  =
+-		shift_ks KP_Equal
++		shift_ks equal
+ 	</key>
+ 	<key>
+ 		default <--
+diff -upr xkbd-0.8.15.orig/data/en_GB.qwerty.xkbd.in xkbd-0.8.15/data/en_GB.qwerty.xkbd.in
+--- xkbd-0.8.15.orig/data/en_GB.qwerty.xkbd.in	2003-08-10 18:46:29.000000000 +0100
++++ xkbd-0.8.15/data/en_GB.qwerty.xkbd.in	2006-02-04 10:59:10.000000000 +0000
+@@ -131,7 +131,7 @@ button_style square
+ 		default  +
+ 		default_ks  plus
+ 		shift  =
+-		shift_ks KP_Equal
++		shift_ks equal
+ 	</key>
+ 	<key>
+ 		img  @pkgdatadir@/img/backspace.xpm
diff --git a/org.handhelds.familiar/packages/xkbd/xkbd-0.8.15/libtool-lossage.patch b/org.handhelds.familiar/packages/xkbd/xkbd-0.8.15/libtool-lossage.patch
new file mode 100644
index 0000000..2d1b7db
--- /dev/null
+++ b/org.handhelds.familiar/packages/xkbd/xkbd-0.8.15/libtool-lossage.patch
@@ -0,0 +1,43 @@
+--- clean/xkbd-0.8.12/configure.ac	2003-06-03 17:27:20.000000000 +0100
++++ xkbd-0.8.12/configure.ac	2004-03-28 19:35:33.000000000 +0100
+@@ -46,11 +46,11 @@
+       CFLAGS="$CFLAGS -g -DDEBUG"
+   fi])
+ 
++PKG_CHECK_MODULES(XTEST, xtst xext)
+ 
+ # Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
+-AC_PROG_LIBTOOL
+ 
+ # Checks for libraries.
+ 
+@@ -70,6 +70,8 @@
+ 
+ AC_SUBST(XFT_LIBS)
+ AC_SUBST(XPM_LIBS)
++AC_SUBST(XTEST_LIBS)
++AC_SUBST(XTEST_CFLAGS)
+ 
+ AC_OUTPUT(Makefile 
+           src/Makefile
+@@ -78,4 +80,4 @@
+           data/img/Makefile
+           packaging/Makefile
+           packaging/ipkg/Makefile
+-          packaging/ipkg/control )
+\ No newline at end of file
++          packaging/ipkg/control )
+--- clean/xkbd-0.8.12/src/Makefile.am	2003-06-03 17:31:07.000000000 +0100
++++ xkbd-0.8.12/src/Makefile.am	2004-03-28 19:34:39.000000000 +0100
+@@ -1,7 +1,7 @@
+ DEFAULT_CONFIG=$(pkgdatadir)/en_GB.qwerty.xkbd
+ 
+-LDADD = @X_LIBS@ -lX11 -lXtst $(XPM_LIBS) $(XFT_LIBS)
+-CFLAGS = @CFLAGS@ -DDEFAULTCONFIG=\"$(DEFAULT_CONFIG)\"
++LDADD = @XTEST_LIBS@ $(XPM_LIBS) $(XFT_LIBS)
++AM_CFLAGS = @XTEST_CFLAGS@ @CFLAGS@ -DDEFAULTCONFIG=\"$(DEFAULT_CONFIG)\"
+ 
+ bin_PROGRAMS = xkbd
+ xkbd_SOURCES = xkbd.c libXkbd.c box.c button.c kb.c libvirtkeys.c \
diff --git a/org.handhelds.familiar/packages/xkbd/xkbd-0.8.15/xkbd.png b/org.handhelds.familiar/packages/xkbd/xkbd-0.8.15/xkbd.png
new file mode 100644
index 0000000..3304a77
--- /dev/null
+++ b/org.handhelds.familiar/packages/xkbd/xkbd-0.8.15/xkbd.png
diff --git a/org.handhelds.familiar/packages/xkbd/xkbd_0.8.15.bb b/org.handhelds.familiar/packages/xkbd/xkbd_0.8.15.bb
new file mode 100644
index 0000000..786ce5f
--- /dev/null
+++ b/org.handhelds.familiar/packages/xkbd/xkbd_0.8.15.bb
@@ -0,0 +1,19 @@
+SRC_URI = "http://handhelds.org/~mallum/xkbd/xkbd-${PV}-CVS.tar.gz \
+           file://libtool-lossage.patch;patch=1;pnum=1 \
+	   file://fix-equalsign.patch;patch=1 \
+	   file://fix-circumkey.patch;patch=1 \
+	   file://xkbd.png"
+LICENSE = "GPL"
+PR = "r2"
+
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+SECTION = "x11"
+DEPENDS = "xpm xtst libxft"
+
+inherit autotools
+
+do_install_append() {
+	install -d ${D}${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/xkbd.png ${D}${datadir}/pixmaps/
+}
+