From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch | 35 +++++++++++++++++++++ .../files/xkbd-0.8.15-fix-keysyms-search.patch | 13 ++++++++ .../xkbd/files/xkbd-0.8.15-increase-delay.patch | 22 +++++++++++++ x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch | 36 ++++++++++++++++++++++ 4 files changed, 106 insertions(+) create mode 100644 x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch create mode 100644 x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch create mode 100644 x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch create mode 100644 x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch (limited to 'x11-misc/xkbd/files') 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 + + + # +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 + + + 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 */ -- cgit v1.2.3-65-gdbad