From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 631391396D0 for ; Sun, 13 Aug 2017 11:31:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4E3E1FC054; Sun, 13 Aug 2017 11:31:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C01A31FC051 for ; Sun, 13 Aug 2017 11:31:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA26934186D for ; Sun, 13 Aug 2017 11:31:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A93077BF for ; Sun, 13 Aug 2017 11:31:41 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1502623765.04237409ccaa6f6809f0dc28bfc8b5522bbbf5f0.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xkbd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch X-VCS-Directories: x11-misc/xkbd/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 04237409ccaa6f6809f0dc28bfc8b5522bbbf5f0 X-VCS-Branch: master Date: Sun, 13 Aug 2017 11:31:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d43f09bc-cf6f-4ad1-8f19-b4cc9ca8e90f X-Archives-Hash: dc7725b818a92efaafba59c21c7d2c9c commit: 04237409ccaa6f6809f0dc28bfc8b5522bbbf5f0 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Thu Aug 10 17:50:18 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Aug 13 11:29:25 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04237409 x11-misc/xkbd: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/5383 x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch | 35 ---------------------- 1 file changed, 35 deletions(-) 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 deleted file mode 100644 index 3620dc5d6f2..00000000000 --- a/x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 */