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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3428E15808B for ; Fri, 11 Feb 2022 21:39:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A19DE07EE; Fri, 11 Feb 2022 21:39:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4825EE07EE for ; Fri, 11 Feb 2022 21:39:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B9F4343261 for ; Fri, 11 Feb 2022 21:39:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FB452CB for ; Fri, 11 Feb 2022 21:39:18 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1644615550.ee615352ba1e2bcacd26b5f566bb1f77269c0770.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/glib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/glib/glib-2.70.4.ebuild X-VCS-Directories: dev-libs/glib/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ee615352ba1e2bcacd26b5f566bb1f77269c0770 X-VCS-Branch: master Date: Fri, 11 Feb 2022 21:39:18 +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: e7972fb0-8738-4c80-ba59-41b7e61aa3bf X-Archives-Hash: dfe138733c746f1df2d907ace87d3265 commit: ee615352ba1e2bcacd26b5f566bb1f77269c0770 Author: Sam James gentoo org> AuthorDate: Fri Feb 11 21:37:27 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 11 21:39:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee615352 dev-libs/glib: fix src_prepare Swapped xdg_src_prepare (not defined in newer EAPIs) to xdg_environment_reset. Know there's a GNOME equivalent underneath but wanted a safer & quicker option for now until can be investigated properly. Closes: https://bugs.gentoo.org/833142 Signed-off-by: Sam James gentoo.org> dev-libs/glib/glib-2.70.4.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-libs/glib/glib-2.70.4.ebuild b/dev-libs/glib/glib-2.70.4.ebuild index a5779f93b9ed..f5ca5a11ff96 100644 --- a/dev-libs/glib/glib-2.70.4.ebuild +++ b/dev-libs/glib/glib-2.70.4.ebuild @@ -136,7 +136,8 @@ src_prepare() { chmod a+x "${T}/glib-test-ld-wrapper" || die sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die - xdg_src_prepare + default + xdg_environment_reset gnome2_environment_reset # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only }