commit: ac35d3017773dd1867e5ec5644438f84dcf6f8ef Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sun Aug 17 12:59:43 2025 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun Aug 17 13:01:44 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac35d301
app-editors/mg: Properly fix LTO type mismatch Bug: https://bugs.gentoo.org/940566 Bug: https://github.com/hboetes/mg/issues/36 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> app-editors/mg/files/mg-20230501-type-mismatch.patch | 16 ++++++++++++++++ app-editors/mg/mg-20230501.ebuild | 12 ++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app-editors/mg/files/mg-20230501-type-mismatch.patch b/app-editors/mg/files/mg-20230501-type-mismatch.patch new file mode 100644 index 000000000000..10a39d8ca296 --- /dev/null +++ b/app-editors/mg/files/mg-20230501-type-mismatch.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/940566 +https://github.com/hboetes/mg/issues/36 + +--- mg-20230501/dired.c ++++ mg-20230501/dired.c +@@ -59,7 +59,9 @@ + static void redelete(struct buffer *); + static char *findfname(struct line *, char *); + +-extern struct keymap_s helpmap, cXmap, metamap; ++extern struct KEYMAPE (2) helpmap; ++extern struct KEYMAPE (6) cXmap; ++extern struct KEYMAPE (8) metamap; + + const char DDELCHAR = 'D'; + diff --git a/app-editors/mg/mg-20230501.ebuild b/app-editors/mg/mg-20230501.ebuild index d597865a47d3..35926bba0454 100644 --- a/app-editors/mg/mg-20230501.ebuild +++ b/app-editors/mg/mg-20230501.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit toolchain-funcs DESCRIPTION="MicroGnuEmacs, a port from the BSDs" HOMEPAGE="https://github.com/hboetes/mg"; @@ -20,17 +20,17 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/${PN}-20230501-type-mismatch.patch" #940566 +) + src_prepare() { + default # fix path to tutorial in man page sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die - eapply_user } src_compile() { - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/940566 - filter-lto - emake CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ PKG_CONFIG="$(tc-getPKG_CONFIG)"
