diff options
Diffstat (limited to 'x11-apps/xdm')
-rw-r--r-- | x11-apps/xdm/Manifest | 2 | ||||
-rw-r--r-- | x11-apps/xdm/files/xdm-1.1.14-c99.patch | 38 | ||||
-rw-r--r-- | x11-apps/xdm/xdm-1.1.14-r1.ebuild | 83 |
3 files changed, 123 insertions, 0 deletions
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest index ba495ad85ae9..7e89de264db4 100644 --- a/x11-apps/xdm/Manifest +++ b/x11-apps/xdm/Manifest @@ -1,4 +1,6 @@ AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7cde7fa33964cbc4f51aa41a537a027749e40c69c3f8543c41924d9d05b54226a0e4400a3a1 SHA512 6cb72d93ab8004e42e9f5002f7f8bb6eb7d9833fd7d3fb0acf7b7b481ead5fb55cb1b836a1e6010fe859e9e04e14064c442e23fdde5991ffb8556ed5aa5af555 +AUX xdm-1.1.14-c99.patch 1486 BLAKE2B 5a8ce9665c0027bf255b1bb5dc42c141ac569dafd156e170ee90a69195473487caa980f06647e9e757bdef68c08f52a5b704b9d9440a724a9ffe46831ea5b168 SHA512 cc6d04207af46fddb423ad16ebce103d8ceafa9c5304c9f2c9f9ddb3606a186948d22e23c70636c90cd52588b1884744de17798447057960d71d955b52dfac42 DIST xdm-1.1.14.tar.xz 419324 BLAKE2B e1c4f1db1af670171e80b7ab759f8e477c84997a873401eb27042590eebe457b38dc7bc998c42e954012ce06c1f4c216655a9c2809a22d88e372c9f7b57e0ff0 SHA512 8ed1d2c946916c24cb4b2de9326f65629c97e53b145312c9cb9c6e4308d8b47d67d3981319fbd4feac9b3ed436b9dfb24a1c905d37d7bcf07b49c18a68c7a6e4 +EBUILD xdm-1.1.14-r1.ebuild 1862 BLAKE2B ad99928f70d581d2e5025bbd790d7764f56d7f1b52c194b48c7235ff0432982fca2ff60d379d922d86228b62e61808e8ffc927d9626f9b27364d1f5672e320d9 SHA512 3f4553f9b760e58e234a5e53f34d874ce15d99ae1ab1e25c4dacd7c0a616e36e4a2c9a3466dd4138fabaf6d7d34fa694cc4156e4450c5965114f112fab61efbb EBUILD xdm-1.1.14.ebuild 1804 BLAKE2B 4f15036dc5280c9c05df6c58d2006c7e9db36f4084222e3e6bbaf0938201435275d140d7e3fc8e6de521d7deb0bade0823532cc89f3a1b10afb719904d9f259f SHA512 3284cd0d0d310e6539f2580dbbf838a8afdb276db8105a7e9fd1dec0baacb2bbc4a8ef38b7ad67c9685e06e7099fa41036b85c71454fe25ccfa672e92b1924a9 MISC metadata.xml 334 BLAKE2B bb9f203babfde01fc5cce539d89df522147c0a2e58fea1453f826749fa1399722e3dbaf301a2e23509c074c757ff25676bf67ef0b9f1c0ed958f909778ba1dbe SHA512 361b9416bd1b55df4466e419b407c2ce3d4eabefb301cab1c702c8fc961de78ab28894550cb1287418d3398b2611fa60ddfe370cd506be863eeddf2792f75b25 diff --git a/x11-apps/xdm/files/xdm-1.1.14-c99.patch b/x11-apps/xdm/files/xdm-1.1.14-c99.patch new file mode 100644 index 000000000000..a72d961e3f60 --- /dev/null +++ b/x11-apps/xdm/files/xdm-1.1.14-c99.patch @@ -0,0 +1,38 @@ +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.coopersmith@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.coopersmith@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 new file mode 100644 index 000000000000..05afdd6ad05a --- /dev/null +++ b/x11-apps/xdm/xdm-1.1.14-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2023 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 +} |