commit: 106d254a63d44358465bf7496e6a4886b6449c6c Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com> AuthorDate: Sun Feb 23 20:29:55 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Apr 12 20:58:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=106d254a
x11-misc/gbdfed: port to C23 Closes: https://bugs.gentoo.org/944399 Closes: https://bugs.gentoo.org/944095 Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/41190 Signed-off-by: Sam James <sam <AT> gentoo.org> x11-misc/gbdfed/files/gbdfed-1.6-c23.patch | 36 ++++++++++++++++++++++++++++++ x11-misc/gbdfed/gbdfed-1.6-r1.ebuild | 25 +++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/x11-misc/gbdfed/files/gbdfed-1.6-c23.patch b/x11-misc/gbdfed/files/gbdfed-1.6-c23.patch new file mode 100644 index 000000000000..06d8db3ff87a --- /dev/null +++ b/x11-misc/gbdfed/files/gbdfed-1.6-c23.patch @@ -0,0 +1,36 @@ +Port to C23. Correct error handler type, use system bool +https://bugs.gentoo.org/944095 +https://bugs.gentoo.org/944399 +--- a/bdfgrab.c ++++ b/bdfgrab.c +@@ -244,7 +244,7 @@ + XCharStruct *cp; + bdf_property_t *pp, prop; + bdf_callback_struct_t cb; +- int (*old_error_handler)(); ++ XErrorHandler old_error_handler; + + if (f == 0) + return 0; +--- a/hbf.c ++++ b/hbf.c +@@ -62,6 +62,7 @@ + #include <stdio.h> + #include <ctype.h> + #include <string.h> ++#include <stdbool.h> + #include "hbf.h" + + #ifdef __MSDOS__ +@@ -82,9 +83,8 @@ + + #define reg register + +-typedef int bool; +-#define TRUE 1 +-#define FALSE 0 ++#define TRUE true ++#define FALSE false + + #define Bit(n) (1<<(7 - (n))) + diff --git a/x11-misc/gbdfed/gbdfed-1.6-r1.ebuild b/x11-misc/gbdfed/gbdfed-1.6-r1.ebuild new file mode 100644 index 000000000000..2e915640b277 --- /dev/null +++ b/x11-misc/gbdfed/gbdfed-1.6-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="gbdfed Bitmap Font Editor" +HOMEPAGE="http://sofia.nmsu.edu/~mleisher/Software/gbdfed/"; +SRC_URI="http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${P}.tar.bz2"; + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=media-libs/freetype-2 + >=x11-libs/gtk+-2.6:2 + x11-libs/libX11 + x11-libs/pango" +DEPEND="${RDEPEND}" + +PATCHES=( + # bug 248562 + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-c23.patch +)
