#137 build wtype from source, ingest international fixes from selkies

Author: thelamer

Dockerfile

@@ -16,7 +16,7 @@ RUN \
     https://github.com/selkies-project/selkies.git \
     /src && \
   cd /src && \
-  git checkout -f 85989133deb49f1303da8dae613adef4b4fe1afd
+  git checkout -f af1a1c252563d2f136d641b81d6b1dd38a3a0d93
 
 RUN \
   echo "**** build shared core library ****" && \
@@ -40,6 +40,35 @@ RUN \
     cp -ar dist/* /buildout/$DASH/; \
   done
 
+FROM ghcr.io/linuxserver/baseimage-debian:trixie AS wtype
+
+RUN \
+  echo "**** wtype build deps ****" && \
+  apt-get update && \
+  DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+    build-essential \
+    cmake \
+    git \
+    libwayland-dev \
+    libxkbcommon-dev \
+    meson \
+    ninja-build \
+    pkg-config
+
+RUN \
+  echo "**** build wtype ****" && \
+  cd /tmp && \
+  git clone \
+    -b international-fix \
+    --single-branch \
+    --depth 1 https://github.com/thelamer/wtype.git && \
+  cd wtype && \
+  meson build && \
+  ninja -C build && \
+  mv \
+    build/wtype \
+    /usr/bin/wtype
+
 # Runtime stage
 FROM ghcr.io/linuxserver/baseimage-debian:trixie
 
@@ -167,7 +196,6 @@ RUN \
     vulkan-tools \
     wl-clipboard \
     wlr-randr \
-    wtype \
     x11-apps \
     x11-common \
     x11-utils \
@@ -199,7 +227,7 @@ RUN \
     | awk '/tag_name/{print $4;exit}' FS='[""]') && \
   curl -o \
     /tmp/selkies.tar.gz -L \
-    "https://github.com/selkies-project/selkies/archive/85989133deb49f1303da8dae613adef4b4fe1afd.tar.gz" && \
+    "https://github.com/selkies-project/selkies/archive/af1a1c252563d2f136d641b81d6b1dd38a3a0d93.tar.gz" && \
   cd /tmp && \
   tar xf selkies.tar.gz && \
   cd selkies-* && \
@@ -292,6 +320,7 @@ RUN \
 COPY /root /
 COPY --from=frontend /buildout /usr/share/selkies
 COPY --from=xvfb / /
+COPY --from=wtype /usr/bin/wtype /usr/bin/wtype
 
 # ports and volumes
 EXPOSE 3000 3001

Dockerfile.aarch64

@@ -16,7 +16,7 @@ RUN \
     https://github.com/selkies-project/selkies.git \
     /src && \
   cd /src && \
-  git checkout -f 85989133deb49f1303da8dae613adef4b4fe1afd
+  git checkout -f af1a1c252563d2f136d641b81d6b1dd38a3a0d93
 
 RUN \
   echo "**** build shared core library ****" && \
@@ -40,6 +40,35 @@ RUN \
     cp -ar dist/* /buildout/$DASH/; \
   done
 
+FROM ghcr.io/linuxserver/baseimage-debian:arm64v8-trixie AS wtype
+
+RUN \
+  echo "**** wtype build deps ****" && \
+  apt-get update && \
+  DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+    build-essential \
+    cmake \
+    git \
+    libwayland-dev \
+    libxkbcommon-dev \
+    meson \
+    ninja-build \
+    pkg-config
+
+RUN \
+  echo "**** build wtype ****" && \
+  cd /tmp && \
+  git clone \
+    -b international-fix \
+    --single-branch \
+    --depth 1 https://github.com/thelamer/wtype.git && \
+  cd wtype && \
+  meson build && \
+  ninja -C build && \
+  mv \
+    build/wtype \
+    /usr/bin/wtype
+
 # Runtime stage
 FROM ghcr.io/linuxserver/baseimage-debian:arm64v8-trixie
 
@@ -166,7 +195,6 @@ RUN \
     vulkan-tools \
     wl-clipboard \
     wlr-randr \
-    wtype \
     x11-apps \
     x11-common \
     x11-utils \
@@ -197,7 +225,7 @@ RUN \
     | awk '/tag_name/{print $4;exit}' FS='[""]') && \
   curl -o \
     /tmp/selkies.tar.gz -L \
-    "https://github.com/selkies-project/selkies/archive/85989133deb49f1303da8dae613adef4b4fe1afd.tar.gz" && \
+    "https://github.com/selkies-project/selkies/archive/af1a1c252563d2f136d641b81d6b1dd38a3a0d93.tar.gz" && \
   cd /tmp && \
   tar xf selkies.tar.gz && \
   cd selkies-* && \
@@ -290,6 +318,7 @@ RUN \
 COPY /root /
 COPY --from=frontend /buildout /usr/share/selkies
 COPY --from=xvfb / /
+COPY --from=wtype /usr/bin/wtype /usr/bin/wtype
 
 # ports and volumes
 EXPOSE 3000 3001