[PATCH util/modular] xorg.modules: Replace individual proto modules with xorgproto

[Emil Velikov]

On 28 February 2018 at 13:04, Jon Turney <jon.turney at dronecode.org.uk> wrote:
> Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
> ---
>  xorg.modules | 845 ++++++++++-------------------------------------------------
>  1 file changed, 143 insertions(+), 702 deletions(-)
>
> diff --git a/xorg.modules b/xorg.modules
> index b34d14d..93bc8cf 100644
> --- a/xorg.modules
> +++ b/xorg.modules
> @@ -65,35 +65,7 @@
>    <!-- X11 Protocol & Extensions - Meta Module -->
>    <metamodule id="The X11 Protocols">
>      <dependencies>

> -      <dep package="xcb-proto"/>
Should stay?

> +      <dep package="xorgproto"/>
>      </dependencies>
>    </metamodule>
>
> @@ -366,257 +338,13 @@


> +  <meson id="xorgproto">
I'd say keep this as autotools and toggle as 2/2...

> +    <branch module="xorg/proto/xorgproto"
> +            checkoutdir="xorg/proto/xorgproto"/>
>      <dependencies>
> -      <dep package="util-macros"/>
> -    </dependencies>
> -    <suggests>
>        <dep package="xorg-sgml-doctools"/>
> -    </suggests>
.. hence this hunk will stay as-is and drop util-macros with 2/2?

It's fairly fiddly to have the above subtleties within such a massive patch.

With the above, tweaks:
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

-Emil