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

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

[Matt Turner]

commit:     b3e3f899219b9e29eb15816babbd6b7c10b7c1ed
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  4 03:12:38 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 03:13:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e3f899

x11-apps/xlsfonts: Drop old versions

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

 x11-apps/xlsfonts/Manifest                       |  1 -
 x11-apps/xlsfonts/files/xlsfonts-1.0.7-c99.patch | 66 ------------------------
 x11-apps/xlsfonts/xlsfonts-1.0.7-r1.ebuild       | 19 -------
 3 files changed, 86 deletions(-)

diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest
index 0ae0e0ae3d3b..923676cd56eb 100644
--- a/x11-apps/xlsfonts/Manifest
+++ b/x11-apps/xlsfonts/Manifest
@@ -1,2 +1 @@
-DIST xlsfonts-1.0.7.tar.xz 126888 BLAKE2B 13f2e2007c38f7d1724e6ffd0c7fe9a3b887a150f50107b892327c3620e4ffdbd4ae1191a9764cc4000d6422fe0f331dcbef11c0b50013ff2d94b699c0cba1ee SHA512 ec82be0a97500a9e64fb5a6adbbec470b249b1267c3081c2bd44cd3e7148107517d1234c1da2f81b0405230ab03ad2943ea53756c3380f4d561665b38d0cedc0
 DIST xlsfonts-1.0.8.tar.xz 130488 BLAKE2B 16ff4ba039f3122844c44c907fbfaff0fbbe6f219bd96cf7154179cbb5865b7911c3af926750dd702917f04a103c889cccea3aa03b48d2a4a47885b448b268e4 SHA512 401c86d902f173c440c08a22067a51e7238949c8d3c71eba7a8df11955edfec27525c8cbbcf2e96ed444fa20b15f98cf65a01343215d1ed9ba84fce849d02927

diff --git a/x11-apps/xlsfonts/files/xlsfonts-1.0.7-c99.patch b/x11-apps/xlsfonts/files/xlsfonts-1.0.7-c99.patch
deleted file mode 100644
index 55b767bb6a26..000000000000
--- a/x11-apps/xlsfonts/files/xlsfonts-1.0.7-c99.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://bugs.gentoo.org/919204
-https://gitlab.freedesktop.org/xorg/app/xlsfonts/-/issues/1
-https://gitlab.freedesktop.org/xorg/app/xlsfonts/-/merge_requests/6
-
-From c92bb3e8243773535cecc4f347437a59d01dbfef Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Tue, 5 Dec 2023 15:41:28 -0800
-Subject: [PATCH 2/2] Fix -Wincompatible-pointer-types warning from gcc (issue
- #1)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-xlsfonts.c: In function ‘get_list’:
-xlsfonts.c:204:23: warning: assignment to ‘char **’ from incompatible
- pointer type ‘const char **’ [-Wincompatible-pointer-types]
-  204 |                 fonts = &pattern;
-      |                       ^
-
-Closes: #1
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
- xlsfonts.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/xlsfonts.c b/xlsfonts.c
-index b834637..39aba13 100644
---- a/xlsfonts.c
-+++ b/xlsfonts.c
-@@ -56,6 +56,7 @@ static int  long_list                 = L_SHORT;
- static int  nnames                    = N_START;
- static int  font_cnt                  = 0;
- static int  min_max;
-+static char wild_string[]             = "*";
- 
- typedef struct {
-     char *name;
-@@ -65,7 +66,7 @@ typedef struct {
- static FontList *font_list = NULL;
- 
- /* Local prototypes */
--static void get_list(const char *pattern);
-+static void get_list(char *pattern);
- static int  compare(const void *arg1, const void *arg2);
- static void show_fonts(void);
- static void copy_number(char **pp1, char **pp2, int n1, int n2);
-@@ -180,7 +181,7 @@ main(int argc, char **argv)
-     }
- 
-     if (argcnt == 0)
--        get_list("*");
-+        get_list(wild_string);
- 
-     show_fonts();
- 
-@@ -189,7 +190,7 @@ main(int argc, char **argv)
- }
- 
- static void
--get_list(const char *pattern)
-+get_list(char *pattern)
- {
-     int available = nnames + 1, i;
-     char **fonts;
--- 
-GitLab

diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.7-r1.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.7-r1.ebuild
deleted file mode 100644
index aa0ecf28fa74..000000000000
--- a/x11-apps/xlsfonts/xlsfonts-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,19 +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 xlsfonts application"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.7-c99.patch
-)