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 CB4FA158083 for ; Sat, 31 Aug 2024 13:48:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C88A3E29E5; Sat, 31 Aug 2024 13:48:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AADF1E29E5 for ; Sat, 31 Aug 2024 13:48:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B432B3430CD for ; Sat, 31 Aug 2024 13:47:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 207441F28 for ; Sat, 31 Aug 2024 13:47:58 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1725112075.6e4dadc75419735eab877fe8ac7b18c5b0823641.juippis@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.76.4.ebuild dev-libs/glib/glib-2.78.3.ebuild dev-libs/glib/glib-2.78.4-r1.ebuild dev-libs/glib/glib-2.80.4.ebuild X-VCS-Directories: dev-libs/glib/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 6e4dadc75419735eab877fe8ac7b18c5b0823641 X-VCS-Branch: master Date: Sat, 31 Aug 2024 13:47:58 +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: 896c16f6-1c93-44df-a6dd-fe7d732a1ff3 X-Archives-Hash: ab778e098f79622ba005f6dc0d9bcbbb commit: 6e4dadc75419735eab877fe8ac7b18c5b0823641 Author: Joonas Niilola gentoo org> AuthorDate: Sat Aug 31 13:46:50 2024 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sat Aug 31 13:47:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4dadc7 Revert "dev-libs/glib: Add meson.${CHOST}.ini.local file in src_pr... This reverts commit 32e91ca4f405d15a16302661c51607e0633c5606. Better fix inc. Signed-off-by: Joonas Niilola gentoo.org> dev-libs/glib/glib-2.76.4.ebuild | 4 ---- dev-libs/glib/glib-2.78.3.ebuild | 4 ---- dev-libs/glib/glib-2.78.4-r1.ebuild | 4 ---- dev-libs/glib/glib-2.80.4.ebuild | 4 ---- 4 files changed, 16 deletions(-) diff --git a/dev-libs/glib/glib-2.76.4.ebuild b/dev-libs/glib/glib-2.76.4.ebuild index dd3a7396a11c..f296a348fdf3 100644 --- a/dev-libs/glib/glib-2.76.4.ebuild +++ b/dev-libs/glib/glib-2.76.4.ebuild @@ -160,10 +160,6 @@ src_prepare() { -e '/AvailabilityMacros.h/d' \ gio/giomodule.c || die - # Add meson.${CHOST}.ini.local file that the build system expects to find, - # #938822 - touch "${T}/meson.${CHOST}.ini.local" || die - default gnome2_environment_reset # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only diff --git a/dev-libs/glib/glib-2.78.3.ebuild b/dev-libs/glib/glib-2.78.3.ebuild index dd3a7396a11c..f296a348fdf3 100644 --- a/dev-libs/glib/glib-2.78.3.ebuild +++ b/dev-libs/glib/glib-2.78.3.ebuild @@ -160,10 +160,6 @@ src_prepare() { -e '/AvailabilityMacros.h/d' \ gio/giomodule.c || die - # Add meson.${CHOST}.ini.local file that the build system expects to find, - # #938822 - touch "${T}/meson.${CHOST}.ini.local" || die - default gnome2_environment_reset # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only diff --git a/dev-libs/glib/glib-2.78.4-r1.ebuild b/dev-libs/glib/glib-2.78.4-r1.ebuild index 32e9ebcc49cb..07caf94eb0dc 100644 --- a/dev-libs/glib/glib-2.78.4-r1.ebuild +++ b/dev-libs/glib/glib-2.78.4-r1.ebuild @@ -169,10 +169,6 @@ src_prepare() { -e '/AvailabilityMacros.h/d' \ gio/giomodule.c || die - # Add meson.${CHOST}.ini.local file that the build system expects to find, - # #938822 - touch "${T}/meson.${CHOST}.ini.local" || die - default gnome2_environment_reset # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only diff --git a/dev-libs/glib/glib-2.80.4.ebuild b/dev-libs/glib/glib-2.80.4.ebuild index 2a2b36c886f8..2d87ba9d7a69 100644 --- a/dev-libs/glib/glib-2.80.4.ebuild +++ b/dev-libs/glib/glib-2.80.4.ebuild @@ -167,10 +167,6 @@ src_prepare() { -e '/AvailabilityMacros.h/d' \ gio/giomodule.c || die - # Add meson.${CHOST}.ini.local file that the build system expects to find, - # #938822 - touch "${T}/meson.${CHOST}.ini.local" || die - default gnome2_environment_reset # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only