[gentoo-commits] repo/gentoo:master commit in: gnome-base/gdm/files/, gnome-base/gdm/

["Matt Turner" <mattst88@gentoo.org>]

commit:     030a016070ea1119dd4b91df2c3143c11a4baed3
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed May 19 18:31:55 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed May 19 18:43:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=030a0160

gnome-base/gdm: Fix libwrap detection

Closes: https://bugs.gentoo.org/790671
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../gdm-40.0-meson-Fix-libwrap-detection.patch     | 28 ++++++++++++++++++++++
 gnome-base/gdm/gdm-40.0.ebuild                     |  2 ++
 2 files changed, 30 insertions(+)

diff --git a/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch b/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch
new file mode 100644
index 00000000000..2742cf27641
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch
@@ -0,0 +1,28 @@
+https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/142
+
+From c713ace4c71a6804734ba5b1bca4abde11ab90d1 Mon Sep 17 00:00:00 2001
+From: Bernd Feige <Bernd.Feige@gmx.net>
+Date: Wed, 19 May 2021 11:28:07 -0700
+Subject: [PATCH] meson: Fix libwrap detection
+
+Bug: https://bugs.gentoo.org/790671
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 0266a938..a490a725 100644
+--- a/meson.build
++++ b/meson.build
+@@ -90,7 +90,7 @@ else
+ endif
+ xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp'))
+ if xdmcp_dep.found() and get_option('tcp-wrappers')
+-  libwrap_dep = cc.find_library('libwrap')
++  libwrap_dep = cc.find_library('wrap')
+ endif
+ # systemd
+ systemd_dep = dependency('systemd')
+-- 
+2.26.3
+

diff --git a/gnome-base/gdm/gdm-40.0.ebuild b/gnome-base/gdm/gdm-40.0.ebuild
index 7be1ee83162..9d7deda12a1 100644
--- a/gnome-base/gdm/gdm-40.0.ebuild
+++ b/gnome-base/gdm/gdm-40.0.ebuild
@@ -117,6 +117,8 @@ PATCHES=(
 
 	# Support pam_elogind.so in gdm-launch-environment.pam
 	"${FILESDIR}/pam-elogind.patch"
+
+	"${FILESDIR}"/${P}-meson-Fix-libwrap-detection.patch
 )
 
 src_prepare() {