commit: f8a2b033677844be434eb3751d1aaae05e31cbb3 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Fri May 2 17:29:43 2025 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri May 2 17:33:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8a2b033
x11-terms/aterm: Delete Closes: https://bugs.gentoo.org/949960 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> profiles/package.mask | 6 -- x11-terms/aterm/Manifest | 1 - x11-terms/aterm/aterm-1.0.1-r6.ebuild | 92 ---------------------- .../files/aterm-1.0.1-configure-clang16.patch | 23 ------ x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch | 35 -------- .../files/aterm-1.0.1-display-security-issue.patch | 24 ------ x11-terms/aterm/files/aterm-1.0.1-dpy.patch | 28 ------- .../aterm/files/aterm-1.0.1-remove-streams.patch | 36 --------- x11-terms/aterm/metadata.xml | 21 ----- 9 files changed, 266 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 82a7531c0724..7e453d7f2c0c 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -246,12 +246,6 @@ media-gfx/xloadimage =dev-qt/qtwebsockets-6.9.0* =dev-qt/qtwebview-6.9.0* -# Matt Turner <[email protected]> (2025-04-01) -# Very dead. Last release in 2007. Many open bugs (#712894, #882169, #894620, -# #907400, #920478, #932284, #943891). -# Removal on 2025-05-01. Bug #949960. -x11-terms/aterm - # Norbert Norbiros <[email protected]> (2025-04-01) # Screen v5.0.0 has a lot of regressions # https://lists.gnu.org/archive/html/screen-devel/2024-10/msg00007.html diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest deleted file mode 100644 index e86697aa2f45..000000000000 --- a/x11-terms/aterm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST aterm-1.0.1.tar.bz2 276810 BLAKE2B 05d8e70caf20bfe2170ffcea2231b6a1bca0ff3414867bb9e48785e4822112a82868793c0b25f7111545b835aff61852f78461166a574288bc238146226be745 SHA512 05c78590bba55d892d9f7add384e4ae8d56197dbcd9caff2be4a52d5c162e767a464359ba806fc95961d8035575a2b4a962fc35cfa44f95025b477fa3e15e56b diff --git a/x11-terms/aterm/aterm-1.0.1-r6.ebuild b/x11-terms/aterm/aterm-1.0.1-r6.ebuild deleted file mode 100644 index d50bf3737faa..000000000000 --- a/x11-terms/aterm/aterm-1.0.1-r6.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="rxvt compatible terminal emulator with transparency support" -HOMEPAGE="http://aterm.sourceforge.net"; -SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="background cjk xgetdefault" - -RDEPEND=" - media-libs/libjpeg-turbo:0= - media-libs/libpng:0= - background? ( media-libs/libafterimage ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libICE -" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-libs/libXt -" - -PATCHES=( - # Security bug #219746 - "${FILESDIR}/${P}-display-security-issue.patch" - "${FILESDIR}/${P}-deadkeys.patch" - "${FILESDIR}/${P}-dpy.patch" - "${FILESDIR}/${P}-remove-streams.patch" - "${FILESDIR}/${P}-configure-clang16.patch" -) - -src_prepare() { - default - - # fix pre-stripped files - sed -i -e "/INSTALL_PROGRAM/ s:-s::" autoconf/Make.common.in || die "sed Makefile failed" - - # Clang 16 - sed -i -e 's:configure.in:configure.ac:' Makefile.in || die - cd autoconf || die - mv configure.in configure.ac || die - eautoreconf -} - -src_configure() { - local myconf - - use cjk && myconf="$myconf - --enable-kanji - --enable-thai - --enable-big5" - - case "${CHOST}" in - *-darwin*) myconf="${myconf} --enable-wtmp" ;; - *) myconf="${myconf} --enable-utmp --enable-wtmp" - esac - - econf \ - $(use_enable xgetdefault) \ - $(use_with background afterimage-config "${EPREFIX}"/usr/bin) \ - --with-terminfo="${EPREFIX}"/usr/share/terminfo \ - --enable-transparency \ - --with-x \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - - fowners root:utmp /usr/bin/aterm - fperms g+s /usr/bin/aterm - - doman doc/aterm.1 - dodoc ChangeLog doc/FAQ doc/README.* - docinto menu - dodoc doc/menu/* -} - -pkg_postinst() { - echo - elog "The transparent background will only work if you have the 'real'" - elog "root wallpaper set. Some tools that might help include:" - elog "wmsetbg (x11-wm/windowmaker), and/or media-gfx/feh." - echo -} diff --git a/x11-terms/aterm/files/aterm-1.0.1-configure-clang16.patch b/x11-terms/aterm/files/aterm-1.0.1-configure-clang16.patch deleted file mode 100644 index 9faf68837d4e..000000000000 --- a/x11-terms/aterm/files/aterm-1.0.1-configure-clang16.patch +++ /dev/null @@ -1,23 +0,0 @@ -Add missing int tpye, and avoid calling the undeclared exit function. -Implicit ints and function declarations are language features removed -in C99 and are likely to become unsupported (by default) in future -compilers. - ---- a/autoconf/configure.in -+++ b/autoconf/configure.in -@@ -615,12 +615,12 @@ - [#define X_LOCALE 1 - #include <X11/Xlocale.h> - #include <X11/Xlib.h> --main() { -+int main() { - char *p; - if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) --exit (XSupportsLocale() ? 0 : 1); -+return XSupportsLocale() ? 0 : 1; - else --exit (1);} -+return 1;} - ],rxvt_cv_func_xlocale=yes, rxvt_cv_func_xlocale=no, - AC_MSG_WARN([Define NO_XLOCALE in config.h manually]))]) - diff --git a/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch b/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch deleted file mode 100644 index 958f40900bcd..000000000000 --- a/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- aterm-1.0.1~/src/command.c 2006-06-26 20:01:20.000000000 +0200 -+++ aterm-1.0.1/src/command.c 2007-09-26 15:03:19.000000000 +0200 -@@ -1486,19 +1486,21 @@ - numlock_state = (ev->xkey.state & ModNumLockMask); /* numlock toggle */ - PrivMode((!numlock_state), PrivMode_aplKP); - } --#ifdef USE_XIM -+#if defined(USE_XIM) || !defined(NO_XLOCALE) - len = 0; -- if (Input_Context != NULL) { -- Status status_return; -+ if (!XFilterEvent(ev, *(&ev->xkey.window))) { -+ if (Input_Context != NULL) { -+ Status status_return; - -- kbuf[0] = '\0'; -- len = XmbLookupString(Input_Context, &ev->xkey, kbuf, -- sizeof(kbuf), &keysym, -- &status_return); -- } else { -- len = XLookupString(&ev->xkey, kbuf, -- sizeof(kbuf), &keysym, -- &compose); -+ kbuf[0] = '\0'; -+ len = XmbLookupString(Input_Context, &ev->xkey, kbuf, -+ sizeof(kbuf), &keysym, -+ &status_return); -+ } else { -+ len = XLookupString(&ev->xkey, kbuf, -+ sizeof(kbuf), &keysym, -+ &compose); -+ } - } - #else /* USE_XIM */ - len = XLookupString(&ev->xkey, (char *) kbuf, sizeof(kbuf), &keysym, &compose); diff --git a/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch b/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch deleted file mode 100644 index e44c0b360d21..000000000000 --- a/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- aterm-1.0.1/src/main.c 2007-08-01 16:08:29.000000000 +0200 -+++ aterm-1.0.1.new/src/main.c 2008-05-03 14:06:52.000000000 +0200 -@@ -2057,10 +2057,6 @@ - */ - get_options(argc, argv); - -- if( display_name == NULL ) -- if ((display_name = getenv("DISPLAY")) == NULL) -- display_name = ":0"; -- - #ifdef HAVE_AFTERSTEP - #ifdef MyArgs_IS_MACRO - MyArgsPtr = safecalloc(1, sizeof(ASProgArgs) ); -@@ -2102,7 +2098,9 @@ - Xdisplay = XOpenDisplay(display_name); - - if (!Xdisplay) { -- print_error("can't open display %s", display_name); -+ print_error("can't open display %s", display_name?display_name: -+ getenv("DISPLAY")?getenv("DISPLAY"): -+ "as no -d given and DISPLAY not set"); - exit(EXIT_FAILURE); - } - /* changed from _MOTIF_WM_INFO - Vaevictus - gentoo bug #139554 */ diff --git a/x11-terms/aterm/files/aterm-1.0.1-dpy.patch b/x11-terms/aterm/files/aterm-1.0.1-dpy.patch deleted file mode 100644 index fbe9800d2189..000000000000 --- a/x11-terms/aterm/files/aterm-1.0.1-dpy.patch +++ /dev/null @@ -1,28 +0,0 @@ -Resolve build failure. Patch from Fedora. - -Bug: https://bugs.gentoo.org/615836 - -diff -up aterm-1.0.1/src/main.c.orig aterm-1.0.1/src/main.c ---- aterm-1.0.1/src/main.c.orig 2011-02-19 09:12:01.000000000 +0200 -+++ aterm-1.0.1/src/main.c 2011-02-19 09:25:02.000000000 +0200 -@@ -2087,10 +2087,10 @@ main(int argc, char *argv[]) - #endif - - ConnectX ( &Scr, 0 ); -- Xdisplay = dpy ; -- Xscreen = Scr.screen ; -+ Xscreen = Scr.screen ; - asv = Scr.asv ; - -+ Xdisplay = asv->dpy; - Xcmap = asv->colormap; - Xdepth = asv->visual_info.depth; - Xvisual = asv->visual_info.visual; -@@ -2125,7 +2125,6 @@ main(int argc, char *argv[]) - XdisplayHeight = DisplayHeight (Xdisplay, Xscreen); - - #ifdef HAVE_AFTERIMAGE -- dpy = Xdisplay ; - asv = create_asvisual (Xdisplay, Xscreen, Xdepth, NULL); - Xcmap = asv->colormap; - Xdepth = asv->visual_info.depth; diff --git a/x11-terms/aterm/files/aterm-1.0.1-remove-streams.patch b/x11-terms/aterm/files/aterm-1.0.1-remove-streams.patch deleted file mode 100644 index fc9f3f82ba17..000000000000 --- a/x11-terms/aterm/files/aterm-1.0.1-remove-streams.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ur aterm-1.0.1-orig/src/command.c aterm-1.0.1/src/command.c ---- aterm-1.0.1-orig/src/command.c 2020-04-01 12:50:59.222929696 -0400 -+++ aterm-1.0.1/src/command.c 2020-04-01 12:49:47.319579199 -0400 -@@ -91,10 +91,13 @@ - - #if defined (__svr4__) || defined (__lnx21__) - # include <sys/resource.h> /* for struct rlimit */ --# include <sys/stropts.h> /* for I_PUSH */ - # define _NEW_TTY_CTRL /* to get proper defines in <termios.h> */ - #endif - -+#if defined (__svr4__) -+# include <sys/stropts.h> /* for I_PUSH */ -+#endif -+ - /*}}} */ - - static unsigned int ModMetaMask, ModNumLockMask; -@@ -672,7 +675,7 @@ - print_error("can't open slave tty %s", ttydev); - exit(EXIT_FAILURE); - } --#if defined (__svr4__) || defined (__lnx21__) -+#if defined (__svr4__) - /* - * Push STREAMS modules: - * ptem: pseudo-terminal hardware emulation module. -@@ -682,6 +685,8 @@ - ioctl(fd, I_PUSH, "ptem"); - ioctl(fd, I_PUSH, "ldterm"); - ioctl(fd, I_PUSH, "ttcompat"); -+#elif defined (__lnx21__) -+ /* do nothing */ - #else /* __svr4__ */ - { - /* change ownership of tty to real uid and real group */ diff --git a/x11-terms/aterm/metadata.xml b/x11-terms/aterm/metadata.xml deleted file mode 100644 index c5763c304f08..000000000000 --- a/x11-terms/aterm/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>[email protected]</email> - <name>Ilia Mirkin</name> - </maintainer> - <maintainer type="person"> - <email>[email protected]</email> - <name>Matt Turner</name> - </maintainer> - <use> - <flag name="background">Enable background image support via - <pkg>media-libs/libafterimage</pkg></flag> - <flag name="xgetdefault">Enable resources via X instead of aterm small - version</flag> - </use> - <upstream> - <remote-id type="sourceforge">aterm</remote-id> - </upstream> -</pkgmetadata>
