Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xkbd/files/
Date: Sun, 13 Aug 2017 11:31:56
Message-Id: 1502623765.04237409ccaa6f6809f0dc28bfc8b5522bbbf5f0.soap@gentoo
1 commit: 04237409ccaa6f6809f0dc28bfc8b5522bbbf5f0
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Thu Aug 10 17:50:18 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 13 11:29:25 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04237409
7
8 x11-misc/xkbd: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/5383
11
12 x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch | 35 ----------------------
13 1 file changed, 35 deletions(-)
14
15 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
16 deleted file mode 100644
17 index 3620dc5d6f2..00000000000
18 --- a/x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch
19 +++ /dev/null
20 @@ -1,35 +0,0 @@
21 -diff -ruN xkbd-0.8.15/src/xkbd.c xkbd-0.8.15-new/src/xkbd.c
22 ---- xkbd-0.8.15/src/xkbd.c 2003-09-29 10:29:35.000000000 -0700
23 -+++ xkbd-0.8.15-new/src/xkbd.c 2008-03-23 02:43:20.000000000 -0700
24 -@@ -307,19 +307,20 @@
25 - 0, BlackPixel(display, screen_num),
26 - WhitePixel(display, screen_num));
27 -
28 -+ wret = DisplayWidth(display, screen_num);
29 -+ hret = DisplayHeight(display, screen_num)/4;
30 -+ xret = 0;
31 -+ yret = DisplayHeight(display, screen_num) - hret;
32 -+
33 - if (geometry != NULL)
34 - {
35 -- XParseGeometry(geometry, &xret, &yret, &wret, &hret );
36 -- }
37 -- else
38 -- {
39 -- if (wm_type != WM_MATCHBOX)
40 -- {
41 -- wret = DisplayWidth(display, screen_num);
42 -- hret = DisplayHeight(display, screen_num)/4;
43 -- xret = 0;
44 -- yret = DisplayHeight(display, screen_num) - hret;
45 -- }
46 -+ int flags;
47 -+
48 -+ flags = XParseGeometry(geometry, &xret, &yret, &wret, &hret );
49 -+ if( flags & XNegative )
50 -+ xret += DisplayWidth( display, screen_num ) - wret;
51 -+ if( flags & YNegative )
52 -+ yret += DisplayHeight( display, screen_num ) - hret;
53 - }
54 -
55 - /* check for user selected keyboard conf file */