Merge branch 'dev-pgtk'

Author: blahgeek

.github/workflows/build.yml

@@ -8,6 +8,8 @@ on:
   push:
     tags:
       - '*'
+    branches:
+      - 'dev-*'
   schedule:
     - cron: '0 0 * * *'
 
@@ -68,7 +70,7 @@ jobs:
     strategy:
       matrix:
         source: ${{ fromJson(needs.setup-vars.outputs.sources) }}
-        build_with_x11: [ "yes", "no" ]
+        build_gui: [ "x11", "pgtk", "no" ]
 
     steps:
     - name: Install fuse
@@ -96,14 +98,15 @@ jobs:
         docker image ls -a
 
     - name: Run and package
-      run: ./run-and-package.sh builder-image:latest ./emacs-src BUILD_WITH_X11=${{ matrix.build_with_x11 }}
+      run: ./run-and-package.sh builder-image:latest ./emacs-src BUILD_GUI=${{ matrix.build_gui }}
 
     - name: Upload binary to release
       uses: svenstaro/upload-release-action@v2
+      if: ${{ !contains(github.ref, 'dev-') }}
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         file: dist/Emacs.AppImage
-        asset_name: Emacs-${{ matrix.source.name }}-${{ matrix.build_with_x11 == 'yes' && 'x11' || 'nox' }}.AppImage
+        asset_name: Emacs-${{ matrix.source.name }}-${{ matrix.build_gui == 'no' && 'nox' || matrix.build_gui }}.AppImage
         tag: ${{ github.event_name == 'schedule' && format('daily-master-build-{0}', needs.setup-vars.outputs.datetimestr) || github.ref }}
         release_name: "${{ github.event_name == 'schedule' && 'Daily master build' || 'Release build' }} ${{ needs.setup-vars.outputs.datetimestr }}"
         prerelease: ${{ github.event_name == 'schedule' }}

readme.md

@@ -36,4 +36,5 @@ Tested in:
 ## Version string meanings
 
 - `x11`: built with X11 GUI support
+- `pgtk`: built with PGTK GUI support, for wayland desktop
 - `nox`: built without GUI support

scripts/build_emacs_in_docker.sh

@@ -14,14 +14,22 @@ ARGS=""
 ARGS+=" --disable-locallisppath"
 ARGS+=" --with-native-compilation=aot --with-json --with-threads --with-sqlite3 --with-tree-sitter"
 ARGS+=" --with-dbus --with-xml2 --with-modules --with-libgmp --with-gpm --with-lcms2"
-if [ "$BUILD_WITH_X11" = "yes" ]; then
+
+if [ "$BUILD_GUI" = "pgtk" ]; then
+    ARGS+=" --with-pgtk --without-x --without-gconf --without-ns"
+elif [ "$BUILD_GUI" = "x11" ]; then
     ARGS+=" --with-x --without-pgtk --without-gconf --with-x-toolkit=gtk3"
-    ARGS+=" --with-gif --with-jpeg --with-png --with-rsvg --with-tiff --with-imagemagick --with-webp"
-    ARGS+=" --with-xft --with-cairo --with-harfbuzz --with-libotf --without-m17n-flt"
+    ARGS+=" --with-xft"
 else
     ARGS+=" --without-x --without-pgtk --without-ns"
 fi
 
+if [ "$BUILD_GUI" != "no" ]; then
+    ARGS+=" --with-gif --with-jpeg --with-png --with-rsvg --with-tiff --with-imagemagick --with-webp"
+    ARGS+=" --with-harfbuzz --with-cairo --with-libotf --without-m17n-flt"
+fi
+
+
 env \
     PATH=$DIST_APPDIR/bin:$PATH \
     LD_LIBRARY_PATH=$DIST_APPDIR/lib \