Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-misc/xkbd
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc/xkbd')
-rw-r--r--x11-misc/xkbd/Manifest2
-rw-r--r--x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch35
-rw-r--r--x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch13
-rw-r--r--x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch22
-rw-r--r--x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch36
-rw-r--r--x11-misc/xkbd/metadata.xml5
-rw-r--r--x11-misc/xkbd/xkbd-0.8.15-r1.ebuild56
-rw-r--r--x11-misc/xkbd/xkbd-0.8.16.ebuild56
8 files changed, 225 insertions, 0 deletions
diff --git a/x11-misc/xkbd/Manifest b/x11-misc/xkbd/Manifest
new file mode 100644
index 000000000000..01b8ec054b14
--- /dev/null
+++ b/x11-misc/xkbd/Manifest
@@ -0,0 +1,2 @@
+DIST xkbd-0.8.15-CVS.tar.gz 344790 RMD160 f09960cd044e7135f5700290a1b0c74ea59fa5c8 SHA1 f047609e4710bb20b1fdab40c1f2dc850c78fe04 SHA256 04bc9f6ea423f7fbd9150767cef6a1bc5c70c545eeb923539a93a549905457de
+DIST xkbd-0.8.16.tar.gz 347616 RMD160 09f3b8b1e53eb5e471275879ee1d8171b18e8869 SHA1 0d4c2bbcf50d5b93b2eb7cd0abc4bc95b4e4da82 SHA256 c85848851dfa42636a4eebec7f7f121365aa28b27554a0c1d5eca15ed4107471
diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch b/x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch
new file mode 100644
index 000000000000..3620dc5d6f2a
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch
@@ -0,0 +1,35 @@
+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/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch b/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch
new file mode 100644
index 000000000000..0d4d5c29cc9c
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/287075
+
+--- src/libvirtkeys.c
++++ src/libvirtkeys.c
+@@ -341,7 +341,7 @@
+
+ for (keycode = 0; ((keycode < (maxKeycode - minKeycode + 1)) && !found); keycode++)
+ {
+- for (column = 0; ((column < keysymsPerKeycode) && !found); column++)
++ for (column = 0; ((column < (keysymsPerKeycode > 4 ? 4 : keysymsPerKeycode)) && !found); column++)
+ {
+ if (keymap[(keycode * keysymsPerKeycode + column)] == ks)
+ {
diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch b/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch
new file mode 100644
index 000000000000..deadcd7cddb1
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch
@@ -0,0 +1,22 @@
+diff -ruN xkbd-0.8.15/data/en_GB.qwerty.xkbd.in xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in
+--- xkbd-0.8.15/data/en_GB.qwerty.xkbd.in 2003-08-10 10:46:29.000000000 -0700
++++ xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in 2008-03-23 02:52:52.000000000 -0700
+@@ -24,6 +24,7 @@
+
+ # button style, can be rounded ( default ), square or plain
+ button_style square
++repeat_delay 50
+
+ </global>
+ #
+diff -ruN xkbd-0.8.15/data/en_US.qwerty.xkbd.in xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in
+--- xkbd-0.8.15/data/en_US.qwerty.xkbd.in 2002-11-28 03:46:04.000000000 -0800
++++ xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in 2008-03-23 02:50:39.000000000 -0700
+@@ -26,6 +26,7 @@
+
+ # button style, can be rounded ( default ), square or plain
+ # button_style plain
++repeat_delay 50
+
+ </global>
+
diff --git a/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch b/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch
new file mode 100644
index 000000000000..d90824085ea4
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch
@@ -0,0 +1,36 @@
+--- xkbd-0.8.16/src/xkbd.c
++++ xkbd-0.8.16/src/xkbd.c
+@@ -307,21 +307,22 @@
+ 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;
++
+ // deactivate geometry for 0.8.16 release - mb
+ geometry = NULL;
+ 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/x11-misc/xkbd/metadata.xml b/x11-misc/xkbd/metadata.xml
new file mode 100644
index 000000000000..40838bc36783
--- /dev/null
+++ b/x11-misc/xkbd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xkbd/xkbd-0.8.15-r1.ebuild b/x11-misc/xkbd/xkbd-0.8.15-r1.ebuild
new file mode 100644
index 000000000000..d0da45f65692
--- /dev/null
+++ b/x11-misc/xkbd/xkbd-0.8.15-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Xkbd - onscreen soft keyboard for X11"
+HOMEPAGE="http://handhelds.org/"
+SRC_URI="ftp://ftp.yzu.edu.tw/mirror/pub2/ftp.handhelds.org/distributions/familiar/source/v0.8.4-rc1/sources/${P}-CVS.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="doc debug"
+
+RDEPEND="x11-libs/libXrender
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXtst
+ x11-libs/libXpm
+ media-libs/freetype
+ dev-libs/expat
+ sys-libs/zlib
+ doc? ( app-text/docbook-sgml-utils )"
+DEPEND="${RDEPEND}
+ x11-proto/xproto
+ x11-proto/xextproto"
+
+src_prepare() {
+ # 2008-03-23 gi1242: Fix handling of -geometry argument
+ epatch "${FILESDIR}"/${P}-fix-geometry.patch
+ # 2008-03-23 gi1242: Increase default repeat delay
+ epatch "${FILESDIR}"/${P}-increase-delay.patch
+ epatch "${FILESDIR}"/${P}-fix-keysyms-search.patch
+}
+
+src_configure() {
+ econf \
+ $(use_enable debug)
+}
+
+src_compile() {
+ emake || die
+ use doc && docbook2html README
+}
+
+src_install() {
+ einstall || die
+ dodoc AUTHORS NEWS README
+
+ if use doc; then
+ insinto /usr/share/doc/${PF}/html
+ doins *.html
+ fi
+}
diff --git a/x11-misc/xkbd/xkbd-0.8.16.ebuild b/x11-misc/xkbd/xkbd-0.8.16.ebuild
new file mode 100644
index 000000000000..ad0a25f89a43
--- /dev/null
+++ b/x11-misc/xkbd/xkbd-0.8.16.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="onscreen soft keyboard for X11"
+HOMEPAGE="http://trac.hackable1.org/trac/wiki/Xkbd"
+SRC_URI="http://trac.hackable1.org/trac/raw-attachment/wiki/Xkbd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc debug"
+
+RDEPEND="x11-libs/libXrender
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXtst
+ x11-libs/libXpm
+ media-libs/freetype
+ dev-libs/expat
+ sys-libs/zlib
+ doc? ( app-text/docbook-sgml-utils )"
+DEPEND="${RDEPEND}
+ x11-proto/xproto
+ x11-proto/xextproto"
+
+src_prepare() {
+ # 2008-03-23 gi1242: Fix handling of -geometry argument
+ epatch "${FILESDIR}"/${P}-fix-geometry.patch
+ # 2008-03-23 gi1242: Increase default repeat delay
+ epatch "${FILESDIR}"/${PN}-0.8.15-increase-delay.patch
+ epatch "${FILESDIR}"/${PN}-0.8.15-fix-keysyms-search.patch
+}
+
+src_configure() {
+ econf \
+ $(use_enable debug)
+}
+
+src_compile() {
+ default
+
+ use doc && docbook2html README
+}
+
+src_install() {
+ default
+
+ if use doc; then
+ insinto /usr/share/doc/${PF}/html
+ doins *.html
+ fi
+}