#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,34 @@ RUN \
     cp -ar dist/* /buildout/$DASH/; \
   done
 
+FROM ghcr.io/linuxserver/baseimage-arch:latest AS wtype
+
+RUN \
+  echo "**** wtype build deps ****" && \
+  pacman -Sy --noconfirm --needed \
+    base-devel \
+    cmake \
+    git \
+    libxkbcommon \
+    meson \
+    ninja \
+    pkgconf \
+    wayland
+
+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/sbin/wtype
+
 # Runtime stage
 FROM ghcr.io/linuxserver/baseimage-arch:latest
 
@@ -136,7 +164,6 @@ RUN \
     wayland \
     wl-clipboard \
     wlr-randr \
-    wtype \
     x264 \
     xclip \
     xcursor-themes \
@@ -184,7 +211,7 @@ RUN \
   echo "**** install selkies ****" && \
   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-* && \
@@ -272,6 +299,7 @@ RUN \
 COPY /root /
 COPY --from=frontend /buildout /usr/share/selkies
 COPY --from=xvfb / /
+COPY --from=wtype /usr/sbin/wtype /usr/sbin/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,34 @@ RUN \
     cp -ar dist/* /buildout/$DASH/; \
   done
 
+FROM ghcr.io/linuxserver/baseimage-arch:arm64v8-latest AS wtype
+
+RUN \
+  echo "**** wtype build deps ****" && \
+  pacman -Sy --noconfirm --needed \
+    base-devel \
+    cmake \
+    git \
+    libxkbcommon \
+    meson \
+    ninja \
+    pkgconf \
+    wayland
+
+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/sbin/wtype
+
 # Runtime stage
 FROM ghcr.io/linuxserver/baseimage-arch:arm64v8-latest
 
@@ -135,7 +163,6 @@ RUN \
     wayland \
     wl-clipboard \
     wlr-randr \
-    wtype \
     x264 \
     xclip \
     xcursor-themes \
@@ -181,7 +208,7 @@ RUN \
   echo "**** install selkies ****" && \
   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-* && \
@@ -269,6 +296,7 @@ RUN \
 COPY /root /
 COPY --from=frontend /buildout /usr/share/selkies
 COPY --from=xvfb / /
+COPY --from=wtype /usr/sbin/wtype /usr/sbin/wtype
 
 # ports and volumes
 EXPOSE 3000 3001