[gentoo-commits] repo/gentoo:master commit in: x11-apps/xkbutils/files/, x11-apps/xkbutils/

["Matt Turner" <mattst88@gentoo.org>]

commit:     d1d4d43b1fbe29255034b350c6ba5fcc3fd516d2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 18:04:04 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 18:04:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1d4d43b

x11-apps/xkbutils: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-apps/xkbutils/Manifest                       |  1 -
 x11-apps/xkbutils/files/xkbutils-1.0.5-c99.patch | 43 ------------------------
 x11-apps/xkbutils/xkbutils-1.0.5-r1.ebuild       | 22 ------------
 3 files changed, 66 deletions(-)

diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index b332981f47d2..218f6221faec 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1,2 +1 @@
-DIST xkbutils-1.0.5.tar.xz 129344 BLAKE2B ac2572b31638120dd5c5e92497f9cde4b43df7ab0f13882f5f1fbac71084dc112a1f9e34d10adf5a4eb83b1b1636ab2388ae8675be5ac1048a3913ac7b0d7f53 SHA512 0d8d460f5e015e9034292688437511068dab61216c2493f2981cfb63aaa012976ac9435c1586a22c0940fbfcb779b48dce9b85832303fe2b854aa945b814ac77
 DIST xkbutils-1.0.6.tar.xz 130540 BLAKE2B af97210ded0e5d1d5ce99e71c50c3ade19b5fe926596a3816a8fcbe7ea6b65f08d5216792a45cb4df3191b6f5fc3db059ee1b1b05ecf0fea408562088f6489e4 SHA512 78fb7ab4ef6642040992529444944080aca7a2ec4118f9a64c45dacc37e4041181df7bcd1f4270e11b9fbc8bd60a131b4702d2aa95741d89c54582ff8a8f896e

diff --git a/x11-apps/xkbutils/files/xkbutils-1.0.5-c99.patch b/x11-apps/xkbutils/files/xkbutils-1.0.5-c99.patch
deleted file mode 100644
index c396361762a1..000000000000
--- a/x11-apps/xkbutils/files/xkbutils-1.0.5-c99.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://bugs.gentoo.org/919190
-https://gitlab.freedesktop.org/xorg/app/xkbutils/-/issues/2
-https://gitlab.freedesktop.org/xorg/app/xkbutils/-/merge_requests/4
-
-From 5f875c8a6bc12d47ad655ba820031bb917f321c0 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Tue, 5 Dec 2023 15:01:42 -0800
-Subject: [PATCH 3/3] xkbwatch: Fix -Wincompatible-pointer-types warning (Issue
- #2)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes warning from gcc 13 that is becoming an error in gcc 14
-
-xkbwatch.c:92:34: warning: passing argument 7 of ‘XtOpenApplication’
- from incompatible pointer type [-Wincompatible-pointer-types]
-   92 |                                  fallback_resources,
-      |                                  ^~~~~~~~~~~~~~~~~~
-      |                                  |
-      |                                  char **
-In file included from xkbwatch.c:31:
-.../X11/Intrinsic.h:1473:5: note: expected ‘const char **’ but
- argument is of type ‘char **’
- 1473 |     String*             /* fallback_resources */,
-      |     ^~~~~~~
-
-Closes: #2
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---- a/xkbwatch.c
-+++ b/xkbwatch.c
-@@ -72,7 +72,7 @@ main(int argc, char *argv[])
-     static Arg vArgs[] = { {XtNorientation, (XtArgVal) XtorientVertical} };
-     static Arg onArgs[] = { {XtNon, (XtArgVal) True} };
-     static Arg offArgs[] = { {XtNon, (XtArgVal) False} };
--    static char *fallback_resources[] = {
-+    static String fallback_resources[] = {
-         "*Box*background: grey50",
-         "*Box*borderWidth: 0",
-         "*Box*vSpace: 1",
--- 
-GitLab
-

diff --git a/x11-apps/xkbutils/xkbutils-1.0.5-r1.ebuild b/x11-apps/xkbutils/xkbutils-1.0.5-r1.ebuild
deleted file mode 100644
index 1a8017531a6d..000000000000
--- a/x11-apps/xkbutils/xkbutils-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-inherit xorg-3
-
-DESCRIPTION="X.Org xkbutils application"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.5-c99.patch
-)