Jamie McClymont <jamie@kwiius.com> writes:

> The xdg-shell thing has been integrated upstream, and the demos seem to
> no longer exist.
> ---
>  ...melier-use-stable-xdg-shell-protocol.patch | 1748 -----------------
>  ...mmelier-make-building-demos-optional.patch |  100 -
>  .../linux/chromium-os/sommelier/default.nix   |    2 -
>  3 files changed, 1850 deletions(-)
>  delete mode 100644 pkgs/os-specific/linux/chromium-os/sommelier/0005-sommelier-use-stable-xdg-shell-protocol.patch
>  delete mode 100644 pkgs/os-specific/linux/chromium-os/sommelier/0006-sommelier-make-building-demos-optional.patch

This patch didn't apply for me.  Looking at the message, it looks like
unlike your other patches this has been encoded as base64.  I wouldn't
be surprised if this confuses things.  Perhaps your mail provider
re-encodes outgoing mail that isn't 7-bit.

It also got held up for moderation by the mailing list because it was
such a big message.  For big deletions like this, you might want to
consider using git-format-patch's --irreversible-delete option, that
will omit the actual content being deleted from the patch.  I think this
might mean a little more work on my end when applying it (because the
man page suggests I can't just feed it to git am), but that's fine by
me if it'll mean messages don't get held up.

Anyway, I just redid the patch by hand since it's such a simple change,
and it looks like it does the job.

If the demos are gone, I think we should remove this line too:

	gnArgs.use_demos = false;

since we get a warning that it now has no effect:

	WARNING at the command-line "--args":1:400: Build argument has no effect.
	ar="ar" cc="cc" cxx="c++" libdir="/nix/store/gn09lnn0v3nssy1xw8m2r3vm2iyanmay-sommelier-89.13729.0.0-rc1" pkg_config="pkg-config" platform2_root="." platform_subdir="vm_tools/sommelier" use={amd64=true arm=false asan=false coverage=false cros_host=false crypto=false dbus=false device_mapper=false fuzzer=false mojo=false profiling=false tcmalloc=false test=false timers=false udev=false} use_demos=false
                                                                                                                                                                                                                                                                                                                                                                                                               ^----
	The variable "use_demos" was set as a build argument
	but never appeared in a declare_args() block in any buildfile.

	To view all possible args, run "gn args --list <out_dir>"

	The build continued as if that argument was unspecified.

LGTM other than that.