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 DBC59138334 for ; Wed, 20 Jun 2018 10:08:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A81DE0AA3; Wed, 20 Jun 2018 10:08:08 +0000 (UTC) Received: from mx-out1.startmail.com (mx-out1.startmail.com [145.131.90.139]) (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 92222E0A96 for ; Wed, 20 Jun 2018 10:08:07 +0000 (UTC) Date: Wed, 20 Jun 2018 05:07:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=startmail.com; s=2017-11; t=1529489285; bh=3n7zUXZdmkOOh6WWsehxD1pOEzn9dbLxIJbESX+KtFY=; h=Date:From:To:Subject:References:In-Reply-To:From; b=lIFkhya0vzQxT/pSOlAz+HjIzqUW4b/QJfW12GsfCmhMiczKbENOc4QNHMkpx7WDO grXcYUnBvJcV2wUlEeGv9r40mupR2PC8A9CriUWXP94q7PAKUkW1MDmgCNux+420TW KX4IrndiZP7oTuXcYwzYbyn4Pt0BHWEXPqM5h3FGhWQ4X8Tt/hbqOD3kltWOFubSv3 f657ruV3q+j4aobSGlLYYR7fhfhcnZ+seY7ReIFU3wpR7cuNKDpLN3LRZSoik2A3r/ GFW3hWtgzok5rvhtjZ2boXDb7ZNQ2Tp9DoHA7gyM79hKxaSE5OQDnmJEs4LsusVGGK YRQxx0UjOTGHQ== From: "Marty E. Plummer" To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] [PATCH 4/4] gnome2.eclass: move icon handling code to xdg.eclass Message-ID: <20180620100705.6orpiytvs5vixxn4@proprietary-killer> References: <20180620071053.11589-1-hanetzer@startmail.com> <20180620071053.11589-4-hanetzer@startmail.com> <1529479674.2506.4.camel@gentoo.org> <20180620090434.hyyatgvswxdfzilv@proprietary-killer> <1529486369.2506.30.camel@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1529486369.2506.30.camel@gentoo.org> X-Archives-Salt: df5400d7-1c9c-47a5-841a-423cdc23a14d X-Archives-Hash: 866ffa4baa2d24be26d82d024943a6ed On Wed, Jun 20, 2018 at 11:19:29AM +0200, Michał Górny wrote: > W dniu śro, 20.06.2018 o godzinie 04∶04 -0500, użytkownik Marty E. > Plummer napisał: > > On Wed, Jun 20, 2018 at 09:27:54AM +0200, Michał Górny wrote: > > > W dniu śro, 20.06.2018 o godzinie 02∶10 -0500, użytkownik Marty E. > > > Plummer napisał: > > > > --- > > > > eclass/gnome2.eclass | 7 ------- > > > > eclass/xdg.eclass | 27 ++++++++++++++++++++++----- > > > > 2 files changed, 22 insertions(+), 12 deletions(-) > > > > > > > > diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass > > > > index 6db6d08b14e..5b81cb4f01a 100644 > > > > --- a/eclass/gnome2.eclass > > > > +++ b/eclass/gnome2.eclass > > > > @@ -315,7 +315,6 @@ gnome2_src_install() { > > > > gnome2_pkg_preinst() { > > > > xdg_pkg_preinst > > > > gnome2_gconf_savelist > > > > - gnome2_icon_savelist > > > > gnome2_schemas_savelist > > > > gnome2_scrollkeeper_savelist > > > > gnome2_gdk_pixbuf_savelist > > > > @@ -337,9 +336,6 @@ gnome2_pkg_preinst() { > > > > gnome2_pkg_postinst() { > > > > xdg_pkg_postinst > > > > gnome2_gconf_install > > > > - if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then > > > > - gnome2_icon_cache_update > > > > - fi > > > > if [[ -n ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then > > > > gnome2_schemas_update > > > > fi > > > > @@ -361,9 +357,6 @@ gnome2_pkg_postinst() { > > > > # Handle scrollkeeper, GSettings, Icons, desktop and mime database updates. > > > > gnome2_pkg_postrm() { > > > > xdg_pkg_postrm > > > > - if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then > > > > - gnome2_icon_cache_update > > > > - fi > > > > if [[ -n ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then > > > > gnome2_schemas_update > > > > fi > > > > diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass > > > > index fd4816b8447..29830a5ee15 100644 > > > > --- a/eclass/xdg.eclass > > > > +++ b/eclass/xdg.eclass > > > > @@ -39,9 +39,9 @@ xdg_src_prepare() { > > > > > > > > # @FUNCTION: xdg_pkg_preinst > > > > # @DESCRIPTION: > > > > -# Finds .desktop and mime info files for later handling in pkg_postinst. > > > > -# Locations are stored in XDG_ECLASS_DESKTOPFILES and XDG_ECLASS_MIMEINFOFILES > > > > -# respectively. > > > > +# Finds .desktop, icon, and mime info files for later handling in pkg_postinst. > > > > +# Locations are stored in XDG_ECLASS_DESKTOPFILES, XDG_ECLASS_ICONS and > > > > +# XDG_ECLASS_MIMEINFOFILES respectively. > > > > xdg_pkg_preinst() { > > > > local f > > > > > > > > @@ -50,6 +50,11 @@ xdg_pkg_preinst() { > > > > XDG_ECLASS_DESKTOPFILES+=( ${f} ) > > > > done < <(cd "${D}" && find 'usr/share/applications' -type f -print0 2>/dev/null) > > > > > > > > + XDG_ECLASS_ICONS=() > > > > + while IFS= read -r -d '' f; do > > > > + XDG_ECLASS_ICONS+=( ${f} ) > > > > + done < <(cd "${D}" && find 'usr/share/icons' -type f -print0 2>/dev/null) > > > > > > If you inline it anyway, why add xdg_*_savelist for it? > > > > > > > Too keep a stub that still 'works' for ebuilds using > > gnome2_icon_savelist from gnome2-utils.eclass. > > > > + > > But given it's unnecessary... you could also keep the stub in gnome2- > utils and not introduce additional unnecessary stub. > Fair. Given that, should I allow the stub to keep working in EAPI 7, then? > -- > Best regards, > Michał Górny