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 ABE0C138334 for ; Wed, 20 Jun 2018 10:11:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9287FE0AB1; Wed, 20 Jun 2018 10:11:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 0F54DE0A96 for ; Wed, 20 Jun 2018 10:11:14 +0000 (UTC) Received: from pomiot (d202-252.icpnet.pl [109.173.202.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 3D3E4335CA6; Wed, 20 Jun 2018 10:11:12 +0000 (UTC) Message-ID: <1529489468.2506.31.camel@gentoo.org> Subject: Re: [gentoo-dev] [PATCH 4/4] gnome2.eclass: move icon handling code to xdg.eclass From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Date: Wed, 20 Jun 2018 12:11:08 +0200 In-Reply-To: <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> <20180620100705.6orpiytvs5vixxn4@proprietary-killer> Organization: Gentoo Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-V92JVleT+X8zXx26MwGl" X-Mailer: Evolution 3.24.6 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 X-Archives-Salt: 2b975b40-d2b1-4c2d-af9e-479a8003b606 X-Archives-Hash: b684e36a3bbac79dd633b4869261a092 --=-V92JVleT+X8zXx26MwGl Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable W dniu =C5=9Bro, 20.06.2018 o godzinie 05=E2=88=B607=E2=80=89-0500, u=C5=BC= ytkownik Marty E. Plummer napisa=C5=82: > On Wed, Jun 20, 2018 at 11:19:29AM +0200, Micha=C5=82 G=C3=B3rny wrote: > > W dniu =C5=9Bro, 20.06.2018 o godzinie 04=E2=88=B604=E2=80=89-0500, u= =C5=BCytkownik Marty E. > > Plummer napisa=C5=82: > > > On Wed, Jun 20, 2018 at 09:27:54AM +0200, Micha=C5=82 G=C3=B3rny wrot= e: > > > > W dniu =C5=9Bro, 20.06.2018 o godzinie 02=E2=88=B610=E2=80=89-0500,= u=C5=BCytkownik Marty E. > > > > Plummer napisa=C5=82: > > > > > --- > > > > > eclass/gnome2.eclass | 7 ------- > > > > > eclass/xdg.eclass | 27 ++++++++++++++++++++++----- > > > > > 2 files changed, 22 insertions(+), 12 deletions(-) > > > > >=20 > > > > > 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 databa= se 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() { > > > > > =20 > > > > > # @FUNCTION: xdg_pkg_preinst > > > > > # @DESCRIPTION: > > > > > -# Finds .desktop and mime info files for later handling in pkg_p= ostinst. > > > > > -# Locations are stored in XDG_ECLASS_DESKTOPFILES and XDG_ECLASS= _MIMEINFOFILES > > > > > -# respectively. > > > > > +# Finds .desktop, icon, and mime info files for later handling i= n pkg_postinst. > > > > > +# Locations are stored in XDG_ECLASS_DESKTOPFILES, XDG_ECLASS_IC= ONS and > > > > > +# XDG_ECLASS_MIMEINFOFILES respectively. > > > > > xdg_pkg_preinst() { > > > > > local f > > > > > =20 > > > > > @@ -50,6 +50,11 @@ xdg_pkg_preinst() { > > > > > XDG_ECLASS_DESKTOPFILES+=3D( ${f} ) > > > > > done < <(cd "${D}" && find 'usr/share/applications' -type f -pr= int0 2>/dev/null) > > > > > =20 > > > > > + XDG_ECLASS_ICONS=3D() > > > > > + while IFS=3D read -r -d '' f; do > > > > > + XDG_ECLASS_ICONS+=3D( ${f} ) > > > > > + done < <(cd "${D}" && find 'usr/share/icons' -type f -print0 2>= /dev/null) > > > >=20 > > > > If you inline it anyway, why add xdg_*_savelist for it? > > > >=20 > > >=20 > > > Too keep a stub that still 'works' for ebuilds using > > > gnome2_icon_savelist from gnome2-utils.eclass. > > > > > + > >=20 > > But given it's unnecessary... you could also keep the stub in gnome2- > > utils and not introduce additional unnecessary stub. > >=20 >=20 > Fair. Given that, should I allow the stub to keep working in EAPI 7, > then? > >=20 Nope. --=20 Best regards, Micha=C5=82 G=C3=B3rny --=-V92JVleT+X8zXx26MwGl Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEbbsHzE8NrQbqCv5BsHoa6u+0Rk4FAlsqKDxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDZE QkIwN0NDNEYwREFEMDZFQTBBRkU0MUIwN0ExQUVBRUZCNDQ2NEUACgkQsHoa6u+0 Rk7KdRAAvrAUBMI9TuNGQWg81yE5uIAHlvyixAVpsr8KBjd4gpKX9XCobvQM1XVQ wAxxAWld0W32XKD2DHVDWbWc0cEe4WfiIiZ2+dYWxDiw56oTIIPVuTZ/7T1bLaHh XMR9IYbbgC37VHyIe35Vpss6UH4hi0woMq/LRd+4k1hiQGYPM3wLwmsI+dwqovs8 IClox/wP/yWRLPq+MZvFzK/MEwC5BxJSEjCnFYUJ0T0QYIUGgRLoMUlViJ2jWaXU JUXY+m3DcF09PSssAo1X4ZnRrNgT3/W1cJxHPj5lT/MEAN/rhSzHj0g0d9lXScnQ POk/c1mESLqJuRGaUfI78jxkqOxMZuLaEem4HbLx+wUapY3Nn3xk10/gF4JdjbRu YuW4xOBk+axk7CA4oOtX+wV/Th4IrEWWcAQnPJD/cfnR+rTM2Gj6Yr0EcaBdljTc 8gi5D8Y90NoLrxOS3+LypX0N2SrUExsSBT7WpUyGVvlyYQ+SbNNQPqI3hoi8PuUK zK6ISSxsPRoeGIeh/itwn03dNppov2zfNF3UAbCsZGXgokKW27IJQ0/WALeU6uXL 9xsMe4Yt2myWBn2tq5pAI3c0BhdPVbOG5hvti7r9aVrTY18/WJ6rvS/xxwqFzswV d4K8BE0Sa3mwG8bOTw1j5iPGZeTuMNDxVaWlSqRiAtV1JguUTn4= =AVYU -----END PGP SIGNATURE----- --=-V92JVleT+X8zXx26MwGl--