summaryrefslogtreecommitdiff
path: root/x11-apps/xlsfonts
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-04-04 08:14:38 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-04-04 08:14:38 +0100
commitf4e04dc11a0252f8c6c535b7538703974cd06ea0 (patch)
tree6ba3be4a2ac2e0f44768521ed50444220fcfec85 /x11-apps/xlsfonts
parentba32ac7204934e0c69e1cc7529edce6efdbeb265 (diff)
gentoo auto-resync : 04:04:2024 - 08:14:38
Diffstat (limited to 'x11-apps/xlsfonts')
-rw-r--r--x11-apps/xlsfonts/Manifest3
-rw-r--r--x11-apps/xlsfonts/files/xlsfonts-1.0.7-c99.patch66
-rw-r--r--x11-apps/xlsfonts/xlsfonts-1.0.7-r1.ebuild19
3 files changed, 0 insertions, 88 deletions
diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest
index 997ce9443a8a..a4c1b9357a6f 100644
--- a/x11-apps/xlsfonts/Manifest
+++ b/x11-apps/xlsfonts/Manifest
@@ -1,6 +1,3 @@
-AUX xlsfonts-1.0.7-c99.patch 1977 BLAKE2B d5ea871a65ac98b3824abadb908c143a650203329dea71f85ccde658e7ab659d75161f78b371fa63277546984ba7c4831e1b61936b9b1b118a34509e3d5e7422 SHA512 0509888df5df180ae6110746ec0c01c5ffcec39c8f8bee4284eb6b68daf040456e25964f81755689bed2d8e18a41c4e0cb7a6ac1054a1b6d31549fe983869a68
-DIST xlsfonts-1.0.7.tar.xz 126888 BLAKE2B 13f2e2007c38f7d1724e6ffd0c7fe9a3b887a150f50107b892327c3620e4ffdbd4ae1191a9764cc4000d6422fe0f331dcbef11c0b50013ff2d94b699c0cba1ee SHA512 ec82be0a97500a9e64fb5a6adbbec470b249b1267c3081c2bd44cd3e7148107517d1234c1da2f81b0405230ab03ad2943ea53756c3380f4d561665b38d0cedc0
DIST xlsfonts-1.0.8.tar.xz 130488 BLAKE2B 16ff4ba039f3122844c44c907fbfaff0fbbe6f219bd96cf7154179cbb5865b7911c3af926750dd702917f04a103c889cccea3aa03b48d2a4a47885b448b268e4 SHA512 401c86d902f173c440c08a22067a51e7238949c8d3c71eba7a8df11955edfec27525c8cbbcf2e96ed444fa20b15f98cf65a01343215d1ed9ba84fce849d02927
-EBUILD xlsfonts-1.0.7-r1.ebuild 424 BLAKE2B d111067f7ebf9459a4495bbc0b070214dd91c4cd69e1b68054224faed5a9b3e9131865807d7ccba0ae55b6c1d83f6894c2fcef35d3bc536e1a9d5a73a06250a6 SHA512 a7f594154537c7665ffbf6f76275e4f43bf3e198527c30208dbe61eb4aba55e84199c05701b7dc50611aa1fcc363a6355e014725348ace5b545225ed471aec67
EBUILD xlsfonts-1.0.8.ebuild 373 BLAKE2B a4477723f2fa0b4a7f330bccc0983c6ee64e8e0f6e4d43bdc0aa7c656d09614644d78d0d5e86934b8f2429fb67ee2ab6d3a005e61893614a7a8c15e83f44e292 SHA512 b74242e475403d27534452f808237a53baff61c11290b36376ef5bc43c643d2e74a73a9a30c25121a986a0578c73fca6f2866947eacde8ef7a67a13572a78c29
MISC metadata.xml 339 BLAKE2B 74d5aa130fe25b67c3e40ff2701c5c73a65abf68021cde0cdda962614636e53a519109c21ba05df8282a10e1bcd05f0a03d1bf1722c5f107d8ecdac954b975ac SHA512 88d098e3081965ed422be6b64d4a96389c1461fdaa21d1180bf91f36e8da2fcaa6c37b23b884b887a5371decc40b225e8d9942e0aabb69e5f9ab42a7082ffa36
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
-)