tauri-apps · FabianLars · Jun 11, 2022 · Jun 11, 2022 · Sep 1, 2022 · Oct 2, 2022
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
@@ -1,4 +1,4 @@
-name: Containers
+name: GTK Widget Factory from containers
 
 on: [push, pull_request]
 
@@ -8,31 +8,50 @@ jobs:
       matrix:
         gtk-version: [gtk3, gtk4]
         linux-distro: [debian, fedora, opensuse, ubuntu]
+        arch: [amd64]
+        include:
+          - gtk-version: gtk3
+            linux-distro: debian
+            arch: 386
+          - gtk-version: gtk4
+            linux-distro: debian
+            arch: 386
 
-    name: ${{ matrix.linux-distro }} ${{ matrix.gtk-version }}
+    name: ${{ matrix.linux-distro }} ${{ matrix.arch }} ${{ matrix.gtk-version }}
     runs-on: ubuntu-latest
 
     env:
       GTK_VERSION: ${{ matrix.gtk-version }}
       LINUX_DISTRO: ${{ matrix.linux-distro }}
-      ARTIFACT_DIR: "${{ github.workspace }}/AppImages"
+      ARCHITECTURE: ${{ matrix.arch }}
+      IMAGE_NAME: "linuxdeploy-plugin-${{ matrix.gtk-version }}:${{ matrix.linux-distro }}"
+      CONTAINER_NAME: "${{ matrix.linux-distro }}-${{ matrix.gtk-version }}"
+      ARTIFACT_DIR: "${{ github.workspace }}/AppImage"
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v7
+
+      - name: Set extra environment variables
+        run: |
+          case "${ARCHITECTURE}" in
+            386)   echo MACHINE="i386" >> "$GITHUB_ENV";;
+            amd64) echo MACHINE="x86_64" >> "$GITHUB_ENV";;
+          esac
 
       - name: Build container
         run: |
-          mkdir -pv "${ARTIFACT_DIR}"
-          buildah bud \
-            --squash \
-            -v "${ARTIFACT_DIR}:/AppImage:rw,z,shared" \
-            -t "linuxdeploy-plugin-${GTK_VERSION}:${LINUX_DISTRO}" \
-            -f "containers/${GTK_VERSION}/Dockerfile.${LINUX_DISTRO}" \
-            .
-
-      - uses: actions/upload-artifact@v2
+          buildah bud --arch="${ARCHITECTURE}" --build-arg MACHINE="${MACHINE}" --tag "${IMAGE_NAME}" --file "containers/${GTK_VERSION}/Dockerfile.${LINUX_DISTRO}" .
+
+      - name: Extract AppImage from container
+        run: |
+          mkdir --verbose --parents "${ARTIFACT_DIR}"
+          podman run --arch="${ARCHITECTURE}" --name "${CONTAINER_NAME}" --interactive --detach --rm --entrypoint /bin/bash "${IMAGE_NAME}"
+          podman cp "${CONTAINER_NAME}:/AppImage/Widget_Factory.AppImage" "${ARTIFACT_DIR}"
+          podman stop "${CONTAINER_NAME}" --time 0
+
+      - uses: actions/upload-artifact@v7
         with:
-          name: ${{ matrix.linux-distro }} with ${{ matrix.gtk-version }}
+          name: ${{ matrix.gtk-version }}_${{ matrix.linux-distro }}_${{ env.MACHINE }}
           path: ${{ env.ARTIFACT_DIR }}/
           retention-days: 30
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: CI
+name: Test plugin
 
 on: [push, pull_request]
 
@@ -13,12 +13,12 @@ jobs:
       DEPLOY_GTK_VERSION: 3
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v7
 
     - name: Setup dependencies
       run: |
         sudo apt-get update -y -qq
-        sudo apt-get install -y -qq libgtk-3-0 libgtk-3-dev wget tree
+        sudo apt-get install -y -qq dpkg-dev libgtk-3-0 libgtk-3-dev gir1.2-gtk-3.0 wget tree libgirepository1.0-dev libfuse2
 
     - name: Download external binairies
       run: |

diff --git a/README.md b/README.md
@@ -11,13 +11,16 @@ This plugin requires the following dependencies in order to work properly:
 - `pkg-config` or `pkgconf` command
 - librsvg2 development files
 - GTK development files
+- GObject Introspection development files
 
 ## Usage
 
 ```bash
 # get linuxdeploy and linuxdeploy-plugin-gtk
 > wget -c "https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh"
 > wget -c "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
+# make them executable so that we can call them (and also, plugins called from linuxdeploy are called like binaries)
+> chmod +x linuxdeploy-x86_64.AppImage linuxdeploy-plugin-gtk.sh
 
 # get list of variables
 > ./linuxdeploy-plugin-gtk.sh --help 
@@ -30,3 +33,24 @@ This plugin requires the following dependencies in order to work properly:
 # call through linuxdeploy
 > ./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin gtk --output appimage --icon-file mypackage.png --desktop-file mypackage.desktop
 ```
+
+
+## How it Works
+
+This plugin is written in bash and goes through a series of steps to make sure
+that all the libraries and other files are pulled in for GTK apps to work
+properly once in the AppImage. The steps include:
+
+1. Detects the GTK version to use
+1. Installs itself as a hook in `$APPDIR/apprun-hooks`
+1. Uses `gsettings` to set a light or dark adwaita theme
+1. Installs the GLib schemas and then runs `glib-compile-schemas` on them
+1. Installs the GIRepository typelibs for gobject-introspection
+1. Copies the GTK libs and sets GTK path related environmental variables to
+1  locations in the APPDIR
+1. Updates the input method module registration (immodules) cache
+1. Installs the GDK Pixbuf libraries and cache, and then updates the cache
+1  using gdk-pixbuf-query-loaders
+1. Installs additional libraries including Gdk, GObject, Gio, librsvg, Pango,
+1  PangoCairo, and PangoFT2
+1. Manually sets the RPATH for the GTK modules
diff --git a/containers/gtk3/Dockerfile.debian b/containers/gtk3/Dockerfile.debian
@@ -2,15 +2,17 @@ FROM docker.io/debian:buster AS build-stage
 WORKDIR /linuxdeploy
 ENV APPIMAGE_EXTRACT_AND_RUN=1
 ENV DEBIAN_FRONTEND=noninteractive
+ARG MACHINE=x86_64
 ARG APPDIR=/AppDir
 ARG TZ=UTC
 RUN ln -snf "/usr/share/zoneinfo/$TZ" "/etc/localtime" && echo "$TZ" > /etc/timezone
 RUN apt-get update && \
-    apt-get install -y wget librsvg2-dev file findutils pkg-config libgtk-3-0 libgtk-3-dev gtk-3-examples
+    apt-get install -y dpkg-dev wget librsvg2-dev file findutils pkg-config libgtk-3-0 \
+    libgtk-3-dev gtk-3-examples gir1.2-gtk-3.0 libgirepository1.0-dev
 COPY . .
-ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" .
-RUN chmod +x *.sh *.AppImage
-RUN ./linuxdeploy-x86_64.AppImage \
+ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${MACHINE}.AppImage" "linuxdeploy-${MACHINE}.AppImage"
+RUN chmod --verbose +x *.sh *.AppImage
+RUN ./linuxdeploy-${MACHINE}.AppImage \
     --appdir ${APPDIR} \
     --plugin gtk \
     --output appimage \
@@ -22,5 +24,6 @@ FROM docker.io/debian:buster
 VOLUME ["/AppImage"]
 WORKDIR /AppImage
 ENV APPIMAGE_EXTRACT_AND_RUN=1
-COPY --from=build-stage "/linuxdeploy/Widget_Factory-x86_64.AppImage" .
-ENTRYPOINT ["./Widget_Factory-x86_64.AppImage"]
+ARG MACHINE=x86_64
+COPY --from=build-stage "/linuxdeploy/Widget_Factory-${MACHINE}.AppImage" "./Widget_Factory.AppImage"
+ENTRYPOINT ["./Widget_Factory.AppImage"]
diff --git a/containers/gtk3/Dockerfile.fedora b/containers/gtk3/Dockerfile.fedora
@@ -1,13 +1,15 @@
 FROM docker.io/fedora:latest AS build-stage
 WORKDIR /linuxdeploy
 ENV APPIMAGE_EXTRACT_AND_RUN=1
+ARG MACHINE=x86_64
 ARG APPDIR=/AppDir
-RUN dnf install -y wget librsvg2-devel file findutils pkgconfig gtk3 gtk3-devel
+RUN dnf install -y wget librsvg2-devel file findutils pkgconfig gtk3 gtk3-devel \
+    gobject-introspection-devel
 COPY . .
-ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" .
-RUN chmod +x *.sh *.AppImage
+ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${MACHINE}.AppImage" .
+RUN chmod --verbose +x *.sh *.AppImage
 RUN gtk-query-immodules-3.0-64 --update-cache
-RUN ./linuxdeploy-x86_64.AppImage \
+RUN ./linuxdeploy-${MACHINE}.AppImage \
     --appdir ${APPDIR} \
     --plugin gtk \
     --output appimage \
@@ -19,5 +21,6 @@ FROM docker.io/fedora:latest
 VOLUME ["/AppImage"]
 WORKDIR /AppImage
 ENV APPIMAGE_EXTRACT_AND_RUN=1
-COPY --from=build-stage "/linuxdeploy/Widget_Factory-x86_64.AppImage" .
-ENTRYPOINT ["./Widget_Factory-x86_64.AppImage"]
+ARG MACHINE=x86_64
+COPY --from=build-stage "/linuxdeploy/Widget_Factory-${MACHINE}.AppImage" "./Widget_Factory.AppImage"
+ENTRYPOINT ["./Widget_Factory.AppImage"]
diff --git a/containers/gtk3/Dockerfile.opensuse b/containers/gtk3/Dockerfile.opensuse
@@ -1,12 +1,14 @@
 FROM docker.io/opensuse/leap:15 AS build-stage
 WORKDIR /linuxdeploy
 ENV APPIMAGE_EXTRACT_AND_RUN=1
+ARG MACHINE=x86_64
 ARG APPDIR=/AppDir
-RUN zypper install -y wget librsvg2-devel file findutils pkg-config gtk3 gtk3-devel
+RUN zypper install -y wget librsvg2-devel file findutils pkg-config gtk3 gtk3-devel \
+    typelib-1_0-Gtk-3_0 gobject-introspection-devel
 COPY . .
-ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" .
-RUN chmod +x *.sh *.AppImage
-RUN ./linuxdeploy-x86_64.AppImage \
+ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${MACHINE}.AppImage" .
+RUN chmod --verbose +x *.sh *.AppImage
+RUN ./linuxdeploy-${MACHINE}.AppImage \
     --appdir ${APPDIR} \
     --plugin gtk \
     --output appimage \
@@ -18,5 +20,6 @@ FROM docker.io/opensuse/leap:15
 VOLUME ["/AppImage"]
 WORKDIR /AppImage
 ENV APPIMAGE_EXTRACT_AND_RUN=1
-COPY --from=build-stage "/linuxdeploy/Widget_Factory-x86_64.AppImage" .
-ENTRYPOINT ["./Widget_Factory-x86_64.AppImage"]
+ARG MACHINE=x86_64
+COPY --from=build-stage "/linuxdeploy/Widget_Factory-${MACHINE}.AppImage" "./Widget_Factory.AppImage"
+ENTRYPOINT ["./Widget_Factory.AppImage"]
diff --git a/containers/gtk3/Dockerfile.ubuntu b/containers/gtk3/Dockerfile.ubuntu
@@ -2,15 +2,17 @@ FROM docker.io/ubuntu:focal AS build-stage
 WORKDIR /linuxdeploy
 ENV APPIMAGE_EXTRACT_AND_RUN=1
 ENV DEBIAN_FRONTEND=noninteractive
+ARG MACHINE=x86_64
 ARG APPDIR=/AppDir
 ARG TZ=UTC
 RUN ln -snf "/usr/share/zoneinfo/$TZ" "/etc/localtime" && echo "$TZ" > /etc/timezone
 RUN apt-get update && \
-    apt-get install -y wget librsvg2-dev file findutils pkg-config libgtk-3-0 libgtk-3-dev gtk-3-examples
+    apt-get install -y dpkg-dev wget librsvg2-dev file findutils pkg-config libgtk-3-0 \
+    libgtk-3-dev gtk-3-examples gir1.2-gtk-3.0 libgirepository1.0-dev libfuse2
 COPY . .
-ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" .
-RUN chmod +x *.sh *.AppImage
-RUN ./linuxdeploy-x86_64.AppImage \
+ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${MACHINE}.AppImage" .
+RUN chmod --verbose +x *.sh *.AppImage
+RUN ./linuxdeploy-${MACHINE}.AppImage \
     --appdir ${APPDIR} \
     --plugin gtk \
     --output appimage \
@@ -22,5 +24,6 @@ FROM docker.io/ubuntu:focal
 VOLUME ["/AppImage"]
 WORKDIR /AppImage
 ENV APPIMAGE_EXTRACT_AND_RUN=1
-COPY --from=build-stage "/linuxdeploy/Widget_Factory-x86_64.AppImage" .
-ENTRYPOINT ["./Widget_Factory-x86_64.AppImage"]
+ARG MACHINE=x86_64
+COPY --from=build-stage "/linuxdeploy/Widget_Factory-${MACHINE}.AppImage" "./Widget_Factory.AppImage"
+ENTRYPOINT ["./Widget_Factory.AppImage"]
diff --git a/containers/gtk4/Dockerfile.debian b/containers/gtk4/Dockerfile.debian
@@ -1,28 +1,29 @@
-# GTK4 is not yet supported on Debian Stable
-FROM docker.io/debian:experimental AS build-stage
+FROM docker.io/debian:bookworm AS build-stage
 WORKDIR /linuxdeploy
 ENV APPIMAGE_EXTRACT_AND_RUN=1
 ENV DEBIAN_FRONTEND=noninteractive
+ARG MACHINE=x86_64
 ARG APPDIR=/AppDir
 ARG TZ=UTC
 RUN ln -snf "/usr/share/zoneinfo/$TZ" "/etc/localtime" && echo "$TZ" > /etc/timezone
 RUN apt-get update && \
-    apt-get install -y wget librsvg2-dev file findutils pkg-config && \
-    apt-get install -y -t experimental libgtk-4-1 libgtk-4-dev gtk-4-examples
+    apt-get install -y dpkg-dev wget librsvg2-dev file findutils pkg-config && \
+    apt-get install -y libgtk-4-1 libgtk-4-dev gtk-4-examples gir1.2-gtk-4.0 libgirepository1.0-dev
 COPY . .
-ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" .
-RUN chmod +x *.sh *.AppImage
-RUN ./linuxdeploy-x86_64.AppImage \
+ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${MACHINE}.AppImage" .
+RUN chmod --verbose +x *.sh *.AppImage
+RUN ./linuxdeploy-${MACHINE}.AppImage \
     --appdir ${APPDIR} \
     --plugin gtk \
     --output appimage \
     --executable /usr/bin/gtk4-widget-factory \
     --desktop-file /usr/share/applications/org.gtk.WidgetFactory4.desktop \
     --icon-file /usr/share/icons/hicolor/scalable/apps/org.gtk.WidgetFactory4.svg
 
-FROM docker.io/debian:experimental
+FROM docker.io/debian:bookworm
 VOLUME ["/AppImage"]
 WORKDIR /AppImage
 ENV APPIMAGE_EXTRACT_AND_RUN=1
-COPY --from=build-stage "/linuxdeploy/Widget_Factory-x86_64.AppImage" .
-ENTRYPOINT ["./Widget_Factory-x86_64.AppImage"]
+ARG MACHINE=x86_64
+COPY --from=build-stage "/linuxdeploy/Widget_Factory-${MACHINE}.AppImage" "./Widget_Factory.AppImage"
+ENTRYPOINT ["./Widget_Factory.AppImage"]
diff --git a/containers/gtk4/Dockerfile.fedora b/containers/gtk4/Dockerfile.fedora
@@ -1,12 +1,14 @@
 FROM docker.io/fedora:latest AS build-stage
 WORKDIR /linuxdeploy
 ENV APPIMAGE_EXTRACT_AND_RUN=1
+ARG MACHINE=x86_64
 ARG APPDIR=/AppDir
-RUN dnf install -y wget librsvg2-devel file findutils pkgconfig gtk4 gtk4-devel gtk4-devel-tools
+RUN dnf install -y wget librsvg2-devel file findutils pkgconfig gtk4 gtk4-devel gtk4-devel-tools \
+    gobject-introspection-devel
 COPY . .
-ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" .
-RUN chmod +x *.sh *.AppImage
-RUN ./linuxdeploy-x86_64.AppImage \
+ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${MACHINE}.AppImage" .
+RUN chmod --verbose +x *.sh *.AppImage
+RUN ./linuxdeploy-${MACHINE}.AppImage \
     --appdir ${APPDIR} \
     --plugin gtk \
     --output appimage \
@@ -18,5 +20,6 @@ FROM docker.io/fedora:latest
 VOLUME ["/AppImage"]
 WORKDIR /AppImage
 ENV APPIMAGE_EXTRACT_AND_RUN=1
-COPY --from=build-stage "/linuxdeploy/Widget_Factory-x86_64.AppImage" .
-ENTRYPOINT ["./Widget_Factory-x86_64.AppImage"]
+ARG MACHINE=x86_64
+COPY --from=build-stage "/linuxdeploy/Widget_Factory-${MACHINE}.AppImage" "./Widget_Factory.AppImage"
+ENTRYPOINT ["./Widget_Factory.AppImage"]
diff --git a/containers/gtk4/Dockerfile.opensuse b/containers/gtk4/Dockerfile.opensuse
@@ -2,12 +2,14 @@
 FROM docker.io/opensuse/tumbleweed:latest AS build-stage
 WORKDIR /linuxdeploy
 ENV APPIMAGE_EXTRACT_AND_RUN=1
+ARG MACHINE=x86_64
 ARG APPDIR=/AppDir
-RUN zypper install -y wget librsvg2-devel file findutils pkg-config gtk4 gtk4-devel
+RUN zypper install -y wget librsvg2-devel file findutils pkg-config gtk4 gtk4-devel \
+    typelib-1_0-Gtk-4_0 gobject-introspection-devel
 COPY . .
-ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" .
-RUN chmod +x *.sh *.AppImage
-RUN ./linuxdeploy-x86_64.AppImage \
+ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${MACHINE}.AppImage" .
+RUN chmod --verbose +x *.sh *.AppImage
+RUN ./linuxdeploy-${MACHINE}.AppImage \
     --appdir ${APPDIR} \
     --plugin gtk \
     --output appimage \
@@ -19,5 +21,6 @@ FROM docker.io/opensuse/tumbleweed:latest
 VOLUME ["/AppImage"]
 WORKDIR /AppImage
 ENV APPIMAGE_EXTRACT_AND_RUN=1
-COPY --from=build-stage "/linuxdeploy/Widget_Factory-x86_64.AppImage" .
-ENTRYPOINT ["./Widget_Factory-x86_64.AppImage"]
+ARG MACHINE=x86_64
+COPY --from=build-stage "/linuxdeploy/Widget_Factory-${MACHINE}.AppImage" "./Widget_Factory.AppImage"
+ENTRYPOINT ["./Widget_Factory.AppImage"]
diff --git a/containers/gtk4/Dockerfile.ubuntu b/containers/gtk4/Dockerfile.ubuntu
@@ -1,26 +1,29 @@
-FROM docker.io/ubuntu:hirsute AS build-stage
+FROM docker.io/ubuntu:jammy AS build-stage
 WORKDIR /linuxdeploy
 ENV APPIMAGE_EXTRACT_AND_RUN=1
 ENV DEBIAN_FRONTEND=noninteractive
+ARG MACHINE=x86_64
 ARG APPDIR=/AppDir
 ARG TZ=UTC
 RUN ln -snf "/usr/share/zoneinfo/$TZ" "/etc/localtime" && echo "$TZ" > /etc/timezone
 RUN apt-get update && \
-    apt-get install -y wget librsvg2-dev file findutils pkg-config libgtk-4-1 libgtk-4-dev gtk-4-examples
+    apt-get install -y dpkg-dev wget librsvg2-dev file findutils pkg-config libgtk-4-1 \
+    libgtk-4-dev gtk-4-examples gir1.2-gtk-4.0 libgirepository1.0-dev libfuse2
 COPY . .
-ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" .
-RUN chmod +x *.sh *.AppImage
-RUN ./linuxdeploy-x86_64.AppImage \
+ADD "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${MACHINE}.AppImage" .
+RUN chmod --verbose +x *.sh *.AppImage
+RUN ./linuxdeploy-${MACHINE}.AppImage \
     --appdir ${APPDIR} \
     --plugin gtk \
     --output appimage \
     --executable /usr/bin/gtk4-widget-factory \
     --desktop-file /usr/share/applications/org.gtk.WidgetFactory4.desktop \
     --icon-file /usr/share/icons/hicolor/scalable/apps/org.gtk.WidgetFactory4.svg
 
-FROM docker.io/ubuntu:hirsute
+FROM docker.io/ubuntu:jammy
 VOLUME ["/AppImage"]
 WORKDIR /AppImage
 ENV APPIMAGE_EXTRACT_AND_RUN=1
-COPY --from=build-stage "/linuxdeploy/Widget_Factory-x86_64.AppImage" .
-ENTRYPOINT ["./Widget_Factory-x86_64.AppImage"]
+ARG MACHINE=x86_64
+COPY --from=build-stage "/linuxdeploy/Widget_Factory-${MACHINE}.AppImage" "./Widget_Factory.AppImage"
+ENTRYPOINT ["./Widget_Factory.AppImage"]