commit: 0b4de7cba8d0d3a8b1893fd4c6c757242eb82fea Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com> AuthorDate: Mon Sep 4 06:45:18 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Oct 6 12:58:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b4de7cb
x11-terms/xterm: Fix TAB3 undeclared here \w musl llvm Closes: https://bugs.gentoo.org/895100 Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32600 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../files/xterm-384-unconditional-gnusource.patch | 12 +++ x11-terms/xterm/xterm-384-r1.ebuild | 110 +++++++++++++++++++++ 2 files changed, 122 insertions(+) diff --git a/x11-terms/xterm/files/xterm-384-unconditional-gnusource.patch b/x11-terms/xterm/files/xterm-384-unconditional-gnusource.patch new file mode 100644 index 000000000000..669970c4fbf7 --- /dev/null +++ b/x11-terms/xterm/files/xterm-384-unconditional-gnusource.patch @@ -0,0 +1,12 @@ +Bug: https://bugs.gentoo.org/895100 +--- a/Makefile.in ++++ b/Makefile.in +@@ -65,7 +65,7 @@ EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@ + EXTRA_LOADFLAGS = @IMAKE_LOADFLAGS@ + + PIXMAPDIR_DEF = @no_pixmapdir@-DPIXMAP_ROOTDIR=\"@PIXMAPDIR@/\" +-CPPFLAGS = -I. -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@ -DDEFCLASS=\"@APP_CLASS@\" $(PIXMAPDIR_DEF) $(EXTRA_CPPFLAGS) ++CPPFLAGS = -I. -I$(srcdir) -DHAVE_CONFIG_H -D_GNU_SOURCE @CPPFLAGS@ -DDEFCLASS=\"@APP_CLASS@\" $(PIXMAPDIR_DEF) $(EXTRA_CPPFLAGS) + CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS) + LDFLAGS = @LDFLAGS@ @EXTRA_LDFLAGS@ + LIBS = @LIBS@ diff --git a/x11-terms/xterm/xterm-384-r1.ebuild b/x11-terms/xterm/xterm-384-r1.ebuild new file mode 100644 index 000000000000..575512bbf25c --- /dev/null +++ b/x11-terms/xterm/xterm-384-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc +inherit desktop flag-o-matic toolchain-funcs verify-sig xdg + +DESCRIPTION="Terminal Emulator for X Windows" +HOMEPAGE="https://invisible-island.net/xterm/"; +SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"; +SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama" + +DEPEND=" + kernel_linux? ( sys-libs/libutempter ) + media-libs/fontconfig:1.0 + >=sys-libs/ncurses-5.7-r7:= + x11-apps/xmessage + x11-libs/libICE + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXft + x11-libs/libxkbfile + x11-libs/libXmu + x11-libs/libXrender + x11-libs/libXt + unicode? ( x11-apps/luit ) + Xaw3d? ( x11-libs/libXaw3d ) + xinerama? ( x11-libs/libXinerama )" +RDEPEND="${DEPEND} + media-fonts/font-misc-misc + x11-apps/rgb" +DEPEND+=" x11-base/xorg-proto" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) +" + +DOCS=( README{,.i18n} ctlseqs.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-384-unconditional-gnusource.patch +) + +src_configure() { + DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults + + # bug #454736 + # Workaround for ncurses[tinfo] until upstream fixes their buildsystem using + # something sane like pkg-config or ncurses5-config and stops guessing libs + # Everything gets linked against ncurses anyways, so don't shout + append-libs $($(tc-getPKG_CONFIG) --libs ncurses) + + local myeconfargs=( + --disable-full-tgetent + --disable-imake + --disable-setgid + --disable-setuid + --enable-256-color + --enable-broken-osc + --enable-broken-st + --enable-dabbrev + --enable-exec-xterm + --enable-i18n + --enable-load-vt-fonts + --enable-logging + --enable-screen-dumps + --enable-warnings + --enable-wide-chars + --libdir="${EPREFIX}"/etc + --with-app-defaults="${DEFAULTS_DIR}" + --with-icon-theme=hicolor + --with-icondir="${EPREFIX}"/usr/share/icons + --with-utempter + --with-x + $(use_enable openpty) + $(use_enable sixel sixel-graphics) + $(use_enable toolbar) + $(use_enable truetype freetype) + $(use_enable unicode luit) + $(use_enable unicode mini-luit) + $(use_with Xaw3d) + $(use_with xinerama) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + docinto html + dodoc xterm.log.html + sed -i -e 's/_48x48//g' *.desktop || die + domenu *.desktop + + # Fix permissions -- it grabs them from live system, and they can + # be suid or sgid like they were in pre-unix98 pty or pre-utempter days, + # respectively (#69510). + # (info from Thomas Dickey) - Donnie Berkholz <[email protected]> + fperms 0755 /usr/bin/xterm + + # restore the navy blue + sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die +}
