From 9f8130042210d1c90fc14bb785bd1e3b4d65a177 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 31 Mar 2024 09:52:15 -0400
Subject: [PATCH] deps/sommelier: Bump to latest crOS platform2

---
 deps/sommelier/Containerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/deps/sommelier/Containerfile b/deps/sommelier/Containerfile
index 0fee4fd..ffe0c94 100644
--- a/deps/sommelier/Containerfile
+++ b/deps/sommelier/Containerfile
@@ -1,6 +1,8 @@
-FROM docker.io/archlinux:base-devel AS builder
+FROM docker.io/archlinux:base-devel-20240101.0.204074 AS builder
 
-ARG SOMMELIER_COMMIT=8c4cceb8ce49c57ce109a2784727e4a7c3705983
+ARG SOMMELIER_COMMIT=371dd81388a946cd3cdae12288c05a6b3509fd7f
+
+RUN pacman-key --init && pacman -Sy --noconfirm archlinux-keyring
 
 RUN pacman -Syu --noconfirm \
       && pacman -S --noconfirm git meson ninja python python-jinja \
@@ -13,7 +15,6 @@ RUN mkdir /build && cd /build \
       && git checkout $SOMMELIER_COMMIT
 
 RUN cd /build/platform2/vm_tools/sommelier \
-      && sed -i 's/#define XDG_SHELL_VERSION 3u/#define XDG_SHELL_VERSION 2u/' sommelier.h \
       && sed -i 's/args\[i++\] = "-rootless";/args[i++] = "-rootless"; args[i++] = "-extension"; args[i++] = "MIT-SHM";/' sommelier.cc \
       && sed -i 's/bool noop_driver = false;/bool noop_driver = true;/' sommelier.cc \
       && meson build -Dwith_tests=false && ninja -C build