diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /x11-apps/xdm | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'x11-apps/xdm')
| -rw-r--r-- | x11-apps/xdm/Manifest | 2 | ||||
| -rw-r--r-- | x11-apps/xdm/xdm-1.1.12.ebuild | 33 |
2 files changed, 18 insertions, 17 deletions
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest index 7f19c1720965..255d58d86b89 100644 --- a/x11-apps/xdm/Manifest +++ b/x11-apps/xdm/Manifest @@ -2,5 +2,5 @@ AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7 AUX xdm-1.1.12-consolekit.patch 7815 BLAKE2B 1ef67b15385c3cc9a74797fadc34e5701889bf669f70e9c3720a82db595472dcf8fc36011ce35cad763dc68580a7680a272c7617d9cf58db8314f788974031cd SHA512 e318ebe0e606964712db40cb70177d4aa275679ef6e2c0ca97cd5156434d037e8774bc75dad3584e8d13ad4577798fac6624bdb6359f1a57de9eb2961bfdc5f7 AUX xdm-1.1.12-make-xinerama-optional.patch 978 BLAKE2B feb81c4815c61c62ebd25acec572de03450c4ee5fd7a634cb0444e17d35566548c0bc8dab05562264533676012410839f61b2e5cb5bc98d83bf9a36daa1b59cc SHA512 efddf2cd662cc4e1ca5cea2a9efe49b4ef8e98276f37def047091088a9deaaadc61646deeefbd8668286d08edabd245a532db84ddf938a2853bdcc1865c221c9 DIST xdm-1.1.12.tar.bz2 512074 BLAKE2B a82d124f4b7ce3185d703fca3aade92e86094602aec5343566ba8c91c54b70cdedbaea2fa6fee330d7ed48d9138b04a998aa2dae06db2683bfcce6c7693edc82 SHA512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb -EBUILD xdm-1.1.12.ebuild 1826 BLAKE2B f154dd3610cd77c5370e8350e1664afe6a03df9c069880c2a0b14ca8d8c913e8e57e92e54540e53ddc29037fc8c493fe52101e013cd898e894788b07de0b971d SHA512 82d01fd71edbe9068b313bfbe71fe2bff37eef61dfefc161e57adab688e9e6841e317c85dab5895ba4505928ca894d2e655fb4823fec4d799701a6dd9107b35c +EBUILD xdm-1.1.12.ebuild 1864 BLAKE2B 00b3edc97b4458220695884f4dd7aeac3c1bfae669be6ffeea16fb88590e8d75dfb94432e2a251eebcbe1a99389c212c2b2f126e9eac07b213156e091b7d1e4b SHA512 ccdee8ce70dee024b700584623f939f334a29887240f9b2d80bc4ef7b4c2dee35211e8f8f5c5b3a4b0f26dc9d4dfab19059226e73aa3b320b0e759d215fbf6c6 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1 diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild index 5f1478118b56..1199ae27622a 100644 --- a/x11-apps/xdm/xdm-1.1.12.ebuild +++ b/x11-apps/xdm/xdm-1.1.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,13 +37,25 @@ RDEPEND=" DEPEND="${RDEPEND} x11-base/xorg-proto" -pkg_setup() { - PATCHES=( +src_prepare() { + local PATCHES=( "${FILESDIR}"/${P}-consolekit.patch # bug 747124 "${FILESDIR}"/${P}-make-xinerama-optional.patch ) - XORG_CONFIGURE_OPTIONS=( + 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=( $(use_enable ipv6) $(use_with pam) $(use_with systemd systemd-daemon) @@ -54,18 +66,7 @@ pkg_setup() { --with-default-vt=${DEFAULTVT} --with-xdmconfigdir=/etc/X11/xdm ) -} - -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 + xorg-3_src_configure } src_install() { |