commit: 8d14975f22f58971fda19896b9ddce28c16da4e5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Mar 15 21:28:13 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 15 21:34:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d14975f
x11-misc/xkbd: drop 0.8.16-r1 Bug: https://bugs.gentoo.org/776472 Signed-off-by: Sam James <sam <AT> gentoo.org> x11-misc/xkbd/Manifest | 1 - .../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-desktop.patch | 19 ----------- x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch | 36 --------------------- x11-misc/xkbd/xkbd-0.8.16-r1.ebuild | 37 ---------------------- 6 files changed, 128 deletions(-) diff --git a/x11-misc/xkbd/Manifest b/x11-misc/xkbd/Manifest index 83c85c52734..98bc0f06063 100644 --- a/x11-misc/xkbd/Manifest +++ b/x11-misc/xkbd/Manifest @@ -1,2 +1 @@ -DIST xkbd-0.8.16.tar.gz 347616 BLAKE2B a7ee906d6ae3328d5366b88ebe960b6fdf84a5cad1c1db4b1a0056fc5842196699dfa749c3c0398054bc54073b422798c0efaf57c8116d05b6754c84d6abae03 SHA512 8410f722cb93069eea26f9d1ed6b9fea76ed5222b8586c2f78ccc1a0f040a964e165df0611ce72c108dbc7adeec31515595c81be3867e68c0cadd8846d985d4a DIST xkbd-0.8.18.tar.gz 50421 BLAKE2B 7652f33cdf00584cc55fcb9dbced9d92c57cf6383b6164d8c026bf88c962e7469b094de7454b451745feb396fbe5ad561193c9d4de8e7b9f65c27a55e7cf478c SHA512 335e18e76e6bf8b7142eb785c9003e8a3d80719e6737149be8e1178bd7281fada6808ea0b18538caf3c3fa1d62778a3d6a45a1fa8b3b0845dca19f3e62942831 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 ff30537add4..00000000000 --- 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 deadcd7cddb..00000000000 --- 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 987270d1d39..00000000000 --- 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 d90824085ea..00000000000 --- 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/xkbd-0.8.16-r1.ebuild b/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild deleted file mode 100644 index d3c9125a799..00000000000 --- a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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="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" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -DOCS=( AUTHORS ) -PATCHES=( - "${FILESDIR}"/${P}-fix-geometry.patch - "${FILESDIR}"/${P}-desktop.patch - "${FILESDIR}"/${PN}-0.8.15-increase-delay.patch - "${FILESDIR}"/${PN}-0.8.15-fix-keysyms-search.patch -) - -src_configure() { - econf \ - $(use_enable debug) -}
