Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-misc/xkbd/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc/xkbd/files')
-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-desktop.patch19
-rw-r--r--x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch36
-rw-r--r--x11-misc/xkbd/files/xkbd-999999-evdev.patch15
-rw-r--r--x11-misc/xkbd/files/xkbd-999999-xft.patch33
6 files changed, 48 insertions, 90 deletions
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
deleted file mode 100644
index ff30537add44..000000000000
--- a/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/287075
-
---- a/src/libvirtkeys.c
-+++ b/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
deleted file mode 100644
index deadcd7cddb1..000000000000
--- a/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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-desktop.patch b/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch
deleted file mode 100644
index 987270d1d398..000000000000
--- a/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes following QA issues:
- * QA Notice: This package installs one or more .desktop files that do not
- * pass validation.
- *
- * /usr/share/applications/inputmethods/xkbd.desktop: error: (will be fatal in the future): value "xkbd.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path
- * /usr/share/applications/inputmethods/xkbd.desktop: error: value "Panel;Utility;MB" for key "Categories" in group "Desktop Entry" contains an unregistered value "MB"; values extending the format should start with "X-"
- * /usr/share/applications/inputmethods/xkbd.desktop: error: value "Panel;Utility;MB" for key "Categories" in group "Desktop Entry" contains an unregistered value "Panel"; values extending the format should start with "X-"
- *
---- a/xkbd.desktop 2003-09-29 20:29:35.000000000 +0300
-+++ b/xkbd.desktop 2017-02-16 16:23:40.927035269 +0200
-@@ -3,6 +3,6 @@
- Comment=Virtual Keyboard
- Exec=xkbd
- Type=Application
--Icon=xkbd.png
--Categories=Panel;Utility;MB
-+Icon=xkbd
-+Categories=Utility;Accessibility
- X-MB-INPUT-MECHANSIM=True
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
deleted file mode 100644
index d90824085ea4..000000000000
--- a/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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/files/xkbd-999999-evdev.patch b/x11-misc/xkbd/files/xkbd-999999-evdev.patch
new file mode 100644
index 000000000000..087fd74ea01a
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-999999-evdev.patch
@@ -0,0 +1,15 @@
+--- a/src/xtg.c
++++ b/src/xtg.c
+@@ -382,10 +382,12 @@
+ static void map_to(){
+ float x=scrX1,y=scrY1,w=width,h=height,dx=pf[p_touch_add],dy=pf[p_touch_add];
+ _short m = 1;
++#ifdef USE_EVDEV
+ if (pa[p_touch_add] && pa[p_touch_add][0] == '+' && pa[p_touch_add][1] == 0) {
+ if (mwidth && devX!=0) dx = (devX - mwidth)/2;
+ if (mheight && devY!=0) dy = (devY - mheight)/2;
+ }
++#endif
+ if (dx!=0 && mwidth) {
+ float b = (w/mwidth)*dx;
+ x-=b;
diff --git a/x11-misc/xkbd/files/xkbd-999999-xft.patch b/x11-misc/xkbd/files/xkbd-999999-xft.patch
new file mode 100644
index 000000000000..8f803111bc02
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-999999-xft.patch
@@ -0,0 +1,33 @@
+--- a/src/kb.c
++++ b/src/kb.c
+@@ -66,7 +66,7 @@
+ if (*f) XftFontClose(kb->display, *f);
+ return ((*f = XftFontOpenName(kb->display, kb->screen, fontname)) != NULL);
+ #else
+- if (*f) XUnloadFont((*f)->fid);
++ if (*f) XUnloadFont(kb->display, (*f)->fid);
+ if ((*f = XLoadQueryFont(kb->display, fontname)) == NULL) return 0;
+ XSetFont(kb->display, kb->gc, (*f)->fid);
+ return True;
+--- a/src/button.c
++++ b/src/button.c
+@@ -150,7 +150,7 @@
+ &extents);
+ return extents.width;
+ #else
+- return XTextWidth(kb->font_info, txt, strlen(txt));
++ return XTextWidth(kb->font, txt, strlen(txt));
+ #endif
+ }
+
+@@ -441,8 +441,10 @@
+
+ b->fg_gc = k->gc;
+ b->bg_gc = k->rev_gc;
++#ifdef USE_XFT
+ b->col = k->color;
+ b->col_rev = k->color_rev;
++#endif
+
+ b->layout_switch = -1;
+