Merge branch 'dev-lucid'

Author: blahgeek

.github/workflows/daily-master.yml

@@ -43,7 +43,8 @@ jobs:
     strategy:
       matrix:
         build_gui:
-          - x11
+          - gtk3
+          - lucid
           - pgtk
           - nox
         arch:

.github/workflows/daily-mps.yml

@@ -44,7 +44,7 @@ jobs:
       fail-fast: false
       matrix:
         build_gui:
-          - x11
+          - gtk3
           - nox
         arch:
           - x86_64

.github/workflows/release.yml

@@ -31,7 +31,8 @@ jobs:
     strategy:
       matrix:
         build_gui:
-          - x11
+          - gtk3
+          - lucid
           - pgtk
           - nox
         arch:

Dockerfile

@@ -50,7 +50,7 @@ RUN wget -O mps-release-1.118.0.tar.gz https://github.com/Ravenbrook/mps/archive
     cd .. && rm -rf mps-release-1.118.0 mps-release-1.118.0.tar.gz
 
 RUN apt-get update && apt-get install -y \
-    xorg libx11-dev libgtk-3-dev \
+    xorg libx11-dev libgtk-3-dev libxaw7-dev \
     libjpeg-dev libgif-dev libtiff-dev libxmp-dev \
     libsqlite3-dev libmagickcore-dev libmagickwand-dev \
     libwebp-dev libotf-dev libcairo-dev libjansson-dev \

local-run.sh

@@ -5,10 +5,10 @@ rm -rf ./dist ./build
 
 mkdir build
 pushd build
-git clone -b emacs-29.4 --depth 1 https://github.com/emacs-mirror/emacs emacs-src
+git clone -b emacs-30.1 --depth 1 https://github.com/emacs-mirror/emacs emacs-src
 popd
 
 docker build .  # next step has no log, so build first
 IMAGE_ID=$(docker build -q .)
 
-./build.sh "$IMAGE_ID" ./build/emacs-src BUILD_GUI=x11 BUILD_NATIVE_COMP=no
+./build.sh "$IMAGE_ID" ./build/emacs-src BUILD_GUI=lucid BUILD_NATIVE_COMP=no

readme.md

@@ -20,7 +20,8 @@ This repo builds Emacs as AppImages for x86-64 & aarch64 linux systems.
 
 ## Version string meanings
 
-- `x11`: built with X11 GUI support
+- `gtk3` (or `x11` in legacy builds): built with X11 GTK3 toolkit (requires gtk3 libraries installed)
+- `lucid`: built with X11 lucid toolkit (requires libxaw installed)
 - `pgtk`: built with PGTK GUI support, for wayland desktop
 - `nox`: built without GUI support
 

scripts/build_emacs_in_docker.sh

@@ -18,11 +18,18 @@ ARGS+=" --with-dbus --with-xml2 --with-modules --with-libgmp --with-gpm --with-l
 # always add mps. it will be ignored in master branch.
 ARGS+=" --with-mps"
 
-if [ "$BUILD_GUI" = "pgtk" ]; then
+IS_GUI=no
+
+if [[ "$BUILD_GUI" = "pgtk" ]]; then
+    IS_GUI=yes
     ARGS+=" --with-pgtk --without-x --without-gconf --without-ns"
-elif [ "$BUILD_GUI" = "x11" ]; then
+elif [[ "$BUILD_GUI" = "x11" || "$BUILD_GUI" = "gtk3" ]]; then
+    IS_GUI=yes
     ARGS+=" --with-x --without-pgtk --without-gconf --with-x-toolkit=gtk3"
     ARGS+=" --with-xft"
+elif [[ "$BUILD_GUI" = "lucid" ]]; then
+    IS_GUI=yes
+    ARGS+=" --with-x --without-pgtk --without-gconf --with-x-toolkit=lucid"
 else
     ARGS+=" --without-x --without-pgtk --without-ns"
 fi
@@ -33,7 +40,7 @@ fi
 # TODO: imagemagick requires dynamic coders. we don't support them correctly now (so it cannot work correctly)
 # so disable imagemagick for now
 ARGS+=" --without-tiff --without-imagemagick"
-if [ "$BUILD_GUI" != "no" ]; then
+if [[ "$IS_GUI" = "yes" ]]; then
     ARGS+=" --with-gif --with-png --with-rsvg --with-webp"
     ARGS+=" --with-harfbuzz --with-cairo --with-libotf --without-m17n-flt"
     # use static lib for libjpeg, to prevent incompatible libjpeg.so version because it's depend by gtk

tests/Dockerfile.archlinux

@@ -2,6 +2,8 @@ FROM archlinux:latest
 
 RUN pacman-key --init \
     && pacman -Syu --noconfirm \
-    && pacman -S --noconfirm xfce4
+    && pacman -S --noconfirm xfce4 libxaw
+
+# libxaw is required by lucid build
 
 ADD scripts /scripts