From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 946BC1382C5 for ; Wed, 19 May 2021 18:44:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E64D1E087A; Wed, 19 May 2021 18:44:10 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CCDEEE087A for ; Wed, 19 May 2021 18:44:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC5FE340A5C for ; Wed, 19 May 2021 18:44:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B8135D2 for ; Wed, 19 May 2021 18:44:08 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1621449836.030a016070ea1119dd4b91df2c3143c11a4baed3.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gdm/files/, gnome-base/gdm/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch gnome-base/gdm/gdm-40.0.ebuild X-VCS-Directories: gnome-base/gdm/ gnome-base/gdm/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 030a016070ea1119dd4b91df2c3143c11a4baed3 X-VCS-Branch: master Date: Wed, 19 May 2021 18:44:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b3bb2c5d-d686-4c59-a659-984a9fbc9d6e X-Archives-Hash: b647b4c6b5b423679bfd7290377449e2 commit: 030a016070ea1119dd4b91df2c3143c11a4baed3 Author: Matt Turner gentoo org> AuthorDate: Wed May 19 18:31:55 2021 +0000 Commit: Matt Turner gentoo 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 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 +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() {