1 |
On Fri, 2018-02-09 at 10:42 +0100, Michał Górny wrote: |
2 |
> Fix the documentation for recently changed cache update functions |
3 |
> that |
4 |
> no longer rely on their _savelist() counterpart to indicate that. |
5 |
|
6 |
Patch is good, but I'd prefer it linger for a while due to the metadata |
7 |
cache rebuilds it would do for this. |
8 |
I am also planning to write and push for review patches to move |
9 |
icon_cache update to xdg-utils.eclass and xdg.eclass, which would |
10 |
constitute to a cache update for all the same things again - help |
11 |
welcome there to speed it up. That icon cache is used by Qt as well. |
12 |
|
13 |
(the plan would be to move them there, think if there's any way to |
14 |
avoid double cache generation for ebuilds that use xdg.eclass and call |
15 |
gnome2_icon_cache_update on top of that, then start on a main tree |
16 |
gnome-meson.eclass or so, that might not need to be gnome specific at |
17 |
all then and be perhaps meson-desktop.eclass instead) |
18 |
|
19 |
> --- |
20 |
> eclass/gnome2-utils.eclass | 12 +++++++----- |
21 |
> 1 file changed, 7 insertions(+), 5 deletions(-) |
22 |
> |
23 |
> diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass |
24 |
> index 9b4296c11fad..65076ae2d61e 100644 |
25 |
> --- a/eclass/gnome2-utils.eclass |
26 |
> +++ b/eclass/gnome2-utils.eclass |
27 |
> @@ -207,7 +207,9 @@ gnome2_gconf_uninstall() { |
28 |
> # @FUNCTION: gnome2_icon_savelist |
29 |
> # @DESCRIPTION: |
30 |
> # Find the icons that are about to be installed and save their |
31 |
> location |
32 |
> -# in the GNOME2_ECLASS_ICONS environment variable. |
33 |
> +# in the GNOME2_ECLASS_ICONS environment variable. This is only |
34 |
> +# necessary for eclass implementations that call |
35 |
> +# gnome2_icon_cache_update conditionally. |
36 |
> # This function should be called from pkg_preinst. |
37 |
> gnome2_icon_savelist() { |
38 |
> has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
39 |
> @@ -218,8 +220,7 @@ gnome2_icon_savelist() { |
40 |
> |
41 |
> # @FUNCTION: gnome2_icon_cache_update |
42 |
> # @DESCRIPTION: |
43 |
> -# Updates Gtk+ icon cache files under /usr/share/icons if the |
44 |
> current ebuild |
45 |
> -# have installed anything under that location. |
46 |
> +# Updates Gtk+ icon cache files under /usr/share/icons. |
47 |
> # This function should be called from pkg_postinst and pkg_postrm. |
48 |
> gnome2_icon_cache_update() { |
49 |
> has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" |
50 |
> @@ -358,7 +359,8 @@ gnome2_scrollkeeper_update() { |
51 |
> # @FUNCTION: gnome2_schemas_savelist |
52 |
> # @DESCRIPTION: |
53 |
> # Find if there is any GSettings schema to install and save the list |
54 |
> in |
55 |
> -# GNOME2_ECLASS_GLIB_SCHEMAS variable. |
56 |
> +# GNOME2_ECLASS_GLIB_SCHEMAS variable. This is only necessary for |
57 |
> eclass |
58 |
> +# implementations that call gnome2_schemas_update conditionally. |
59 |
> # This function should be called from pkg_preinst. |
60 |
> gnome2_schemas_savelist() { |
61 |
> has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
62 |
> @@ -370,7 +372,7 @@ gnome2_schemas_savelist() { |
63 |
> # @FUNCTION: gnome2_schemas_update |
64 |
> # @USAGE: gnome2_schemas_update |
65 |
> # @DESCRIPTION: |
66 |
> -# Updates GSettings schemas if GNOME2_ECLASS_GLIB_SCHEMAS has some. |
67 |
> +# Updates GSettings schemas. |
68 |
> # This function should be called from pkg_postinst and pkg_postrm. |
69 |
> gnome2_schemas_update() { |
70 |
> has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" |