commit: b782e55f772db4a2c12f5313be54f3918c969991 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Wed May 15 18:25:12 2024 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed May 15 18:35:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b782e55f
x11-apps/xdm: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-apps/xdm/Manifest | 1 - x11-apps/xdm/files/xdm-1.1.14-c99.patch | 38 --------------- x11-apps/xdm/xdm-1.1.14-r1.ebuild | 83 --------------------------------- 3 files changed, 122 deletions(-) diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest index 190263a75b7d..cd9a71326a41 100644 --- a/x11-apps/xdm/Manifest +++ b/x11-apps/xdm/Manifest @@ -1,2 +1 @@ -DIST xdm-1.1.14.tar.xz 419324 BLAKE2B e1c4f1db1af670171e80b7ab759f8e477c84997a873401eb27042590eebe457b38dc7bc998c42e954012ce06c1f4c216655a9c2809a22d88e372c9f7b57e0ff0 SHA512 8ed1d2c946916c24cb4b2de9326f65629c97e53b145312c9cb9c6e4308d8b47d67d3981319fbd4feac9b3ed436b9dfb24a1c905d37d7bcf07b49c18a68c7a6e4 DIST xdm-1.1.16.tar.xz 420072 BLAKE2B 1a970b99a0848b0bcb55870c1665281afc355685b4e08148cefd953456fbed5dc71a9a66fa670e80f07de3502615e3c2e81293e9476f04ce965d73be5365bd9e SHA512 a7e0aca67b770b3939aee2c12feac3c0f5efa531ec4a6045ab8b53d9c35b701ab5533447feb39b7cbe0df74ff8483ee1637314b847b37a6c3f7e9c8fdf5e172d diff --git a/x11-apps/xdm/files/xdm-1.1.14-c99.patch b/x11-apps/xdm/files/xdm-1.1.14-c99.patch deleted file mode 100644 index a72d961e3f60..000000000000 --- a/x11-apps/xdm/files/xdm-1.1.14-c99.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/919207 -https://gitlab.freedesktop.org/xorg/app/xdm/-/issues/15 -https://gitlab.freedesktop.org/xorg/app/xdm/-/merge_requests/18 - -From bccb77746528134aa2e865ca4f44fd9424738b3f Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersm...@oracle.com> -Date: Tue, 5 Dec 2023 17:25:28 -0800 -Subject: [PATCH] Fix -Wincompatible-pointer-types warning from gcc (issue #15) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -chooser.c:280:26: warning: passing argument 2 of ‘XawListChange’ from - incompatible pointer type [-Wincompatible-pointer-types] - 280 | XawListChange (list, newTable, size, 0, TRUE); - | ^~~~~~~~ - | | - | char ** -In file included from chooser.c:59: -/usr/include/X11/Xaw/List.h:170:27: note: expected ‘const char **’ but - argument is of type ‘char **’ - 170 | _Xconst char **list, - -Closes: #15 -Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> ---- a/chooser/chooser.c -+++ b/chooser/chooser.c -@@ -277,7 +277,7 @@ RebuildTable (int size) - newTable[i] = names->fullname; - qsort (newTable, size, sizeof (char *), HostnameCompare); - } -- XawListChange (list, newTable, size, 0, TRUE); -+ XawListChange (list, (_Xconst char **) newTable, size, 0, TRUE); - free (NameTable); - NameTable = newTable; - NameTableSize = size; --- -GitLab diff --git a/x11-apps/xdm/xdm-1.1.14-r1.ebuild b/x11-apps/xdm/xdm-1.1.14-r1.ebuild deleted file mode 100644 index d33d52bc8907..000000000000 --- a/x11-apps/xdm/xdm-1.1.14-r1.ebuild +++ /dev/null @@ -1,83 +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 pam systemd - -DEFAULTVT=vt7 - -DESCRIPTION="X.Org xdm application" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="pam systemd truetype xinerama xpm" - -RDEPEND=" - x11-apps/sessreg - x11-apps/xconsole - x11-apps/xinit - x11-apps/xrdb - x11-apps/xsm - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXaw - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - virtual/libcrypt:= - pam? ( sys-libs/pam ) - systemd? ( >=sys-apps/systemd-209:= ) - truetype? ( - x11-libs/libXrender - x11-libs/libXft - ) - xinerama? ( x11-libs/libXinerama ) - xpm? ( x11-libs/libXpm ) - elibc_glibc? ( dev-libs/libbsd )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.14-c99.patch -) - -src_prepare() { - sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \ - xdm.service.in || die - - # Disable XDM-AUTHORIZATION-1 (bug #445662). - # it causes issue with libreoffice and SDL games (bug #306223). - sed -i -e '/authorize/a DisplayManager*authName: MIT-MAGIC-COOKIE-1' \ - config/xdm-config.in || die - - xorg-3_src_prepare -} - -src_configure() { - local XORG_CONFIGURE_OPTIONS=( - --enable-ipv6 - $(use_with pam) - $(use_with systemd systemd-daemon) - $(use_with truetype xft) - $(use_with xinerama) - $(use_enable xpm xpm-logos) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --with-default-vt=${DEFAULTVT} - --with-xdmconfigdir=/etc/X11/xdm - ) - xorg-3_src_configure -} - -src_install() { - xorg-3_src_install - - exeinto /usr/$(get_libdir)/X11/xdm - doexe "${FILESDIR}"/Xsession - - use pam && pamd_mimic system-local-login xdm auth account session - - # Keep /var/lib/xdm. This is where authfiles are stored. See #286350. - keepdir /var/lib/xdm -}
