From 2fb701b63b5065fd639d9db12bacf9d40d22e42f Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Mon, 30 Jun 2025 09:53:37 +0300
Subject: [PATCH 01/17] TESTING: Initial ci workflow

---
 .github/workflows/fedora-build.yml | 62 ++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 .github/workflows/fedora-build.yml

diff --git a/.github/workflows/fedora-build.yml b/.github/workflows/fedora-build.yml
new file mode 100644
index 00000000..037270e7
--- /dev/null
+++ b/.github/workflows/fedora-build.yml
@@ -0,0 +1,62 @@
+name: fedora-build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    name: fedora
+    runs-on: ubuntu-latest
+    container:
+      image: fedora:41
+
+    steps:
+    - uses: actions/checkout@v4
+    - run: cat /etc/os-release
+    - name: install dependencies
+      run: |
+        dnf -y install alsa-lib-devel ant autoconf automake bc curl gambit-c
+        dnf -y install gcc git ImageMagick-devel java-17-openjdk-devel
+        dnf -y install libtool libXext-devel make mesa-libGL-devel
+        dnf -y install mesa-libGLU-devel netpbm-devel patch perl-FindBin
+        dnf -y install portaudio python3-sdkmanager sed tar tcl-devel texlive
+        dnf -y install wget zip
+    - name: setup android
+      run: |
+       # https://stackoverflow.com/a/77215395
+       # https://computingforgeeks.com/install-and-use-android-studio-on-fedora/
+       mkdir -p /home/build/android-sdk
+       export ANDROID_HOME=/home/build/android-sdk
+       echo yes | sdkmanager --sdk_root=/home/build/android-sdk "platforms;android-28"
+       echo yes | sdkmanager --sdk_root=/home/build/android-sdk "build-tools;29.0.3"
+       echo yes | sdkmanager --sdk_root=/home/build/android-sdk "tools"
+       echo yes | sdkmanager --sdk_root=/home/build/android-sdk "extras;android;m2repository"
+       echo yes | sdkmanager --sdk_root=/home/build/android-sdk "ndk-bundle;r28"
+       echo yes | sdkmanager --sdk_root=/home/build/android-sdk "platform-tools"
+       echo yes | sdkmanager --sdk_root=/home/build/android-sdk --licenses
+       # https://coderwall.com/p/r09hoq/android-generate-release-debug-keystores
+       # https://stackoverflow.com/a/13578480
+       keytool -genkey -v -keystore debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -noprompt -dname "CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, S=Unknown, C=Unknown"
+    - name: prepare lambdanative
+      run : |
+       cp SETUP.template SETUP
+       sed -i 's/ANDROIDAPI=21/ANDROIDAPI=28/g' SETUP
+       sed -i 's|/usr/local/android-sdk-*|/home/build/android-sdk|g' SETUP
+       sed -i 's|/usr/local/android-ndk-*|/home/build/android-sdk/ndk-bundle|g' SETUP
+       cp PROFILE.template PROFILE
+       sed -i 's|SYS_ANDROIDPW="yoursecrethere"|SYS_ANDROIDPW="android"|g' PROFILE
+    - name: linux builds
+      run: |
+       ./configure Calculator
+       make
+    - name: android builds
+      run: |
+       # Fedora only provides Python3
+       sed -i 's/python/python3/g' targets/android/check-tools
+       # Make directory to avoid errors during build
+       mkdir -p /home/build/.cache/lambdanative/android/support
+       ./configure Calculator android debug
+       make

From 4b71dde3e718ffe7c8b7646a57d2ca00969c6241 Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Mon, 30 Jun 2025 10:59:40 +0300
Subject: [PATCH 02/17] CI: run smoke tests

---
 .github/workflows/fedora-build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/fedora-build.yml b/.github/workflows/fedora-build.yml
index 037270e7..6d134326 100644
--- a/.github/workflows/fedora-build.yml
+++ b/.github/workflows/fedora-build.yml
@@ -60,3 +60,6 @@ jobs:
        mkdir -p /home/build/.cache/lambdanative/android/support
        ./configure Calculator android debug
        make
+    - name: smoke tests
+      run: |
+       sh make.sh smoke

From ce2eb7545f2d3662a273295e1d8441166ebc78b5 Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Mon, 16 Feb 2026 20:55:38 +0300
Subject: [PATCH 03/17] Need C++ compiler

---
 .github/workflows/fedora-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/fedora-build.yml b/.github/workflows/fedora-build.yml
index 6d134326..2dc5f44b 100644
--- a/.github/workflows/fedora-build.yml
+++ b/.github/workflows/fedora-build.yml
@@ -19,7 +19,7 @@ jobs:
     - name: install dependencies
       run: |
         dnf -y install alsa-lib-devel ant autoconf automake bc curl gambit-c
-        dnf -y install gcc git ImageMagick-devel java-17-openjdk-devel
+        dnf -y install gcc gcc-c++ git ImageMagick-devel java-17-openjdk-devel
         dnf -y install libtool libXext-devel make mesa-libGL-devel
         dnf -y install mesa-libGLU-devel netpbm-devel patch perl-FindBin
         dnf -y install portaudio python3-sdkmanager sed tar tcl-devel texlive

From 7c0cb49514587b3501fbbfbde5f590dc848017f3 Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Mon, 16 Feb 2026 21:20:05 +0300
Subject: [PATCH 04/17] Add inkscape as a build dependency

---
 .github/workflows/fedora-build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/fedora-build.yml b/.github/workflows/fedora-build.yml
index 2dc5f44b..8c0df23d 100644
--- a/.github/workflows/fedora-build.yml
+++ b/.github/workflows/fedora-build.yml
@@ -19,11 +19,11 @@ jobs:
     - name: install dependencies
       run: |
         dnf -y install alsa-lib-devel ant autoconf automake bc curl gambit-c
-        dnf -y install gcc gcc-c++ git ImageMagick-devel java-17-openjdk-devel
-        dnf -y install libtool libXext-devel make mesa-libGL-devel
-        dnf -y install mesa-libGLU-devel netpbm-devel patch perl-FindBin
-        dnf -y install portaudio python3-sdkmanager sed tar tcl-devel texlive
-        dnf -y install wget zip
+        dnf -y install gcc gcc-c++ git inkscape ImageMagick-devel
+        dnf -y install java-17-openjdk-devel libtool libXext-devel make
+        dnf -y install mesa-libGL-devel mesa-libGLU-devel netpbm-devel patch
+        dnf -y install perl-FindBin portaudio python3-sdkmanager sed tar tcl-devel
+        dnf -y install texlive wget zip
     - name: setup android
       run: |
        # https://stackoverflow.com/a/77215395

From c85aecbdd2dfbb6202aaa5e5ae2981b131130ab2 Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Tue, 17 Feb 2026 07:46:25 +0300
Subject: [PATCH 05/17] Update Inkscape output command

---
 make.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make.sh b/make.sh
index 9e6065d8..1726b225 100755
--- a/make.sh
+++ b/make.sh
@@ -459,7 +459,7 @@ make_artwork()
           fi
         fi
         asserttool $inkscape
-        veval "$inkscape -z $svgsrc -w 1200 -e $pngtgt"
+        veval "$inkscape -z $svgsrc -w 1200 -o $pngtgt"
       fi
     else
       if [ "X$epssrc" = "X" ]; then

From fffeebeaf4866f751c922bbbbedfdac3c3c8843e Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Tue, 17 Feb 2026 10:21:10 +0300
Subject: [PATCH 06/17] Test updated path

---
 make.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/make.sh b/make.sh
index 1726b225..ec31fc42 100755
--- a/make.sh
+++ b/make.sh
@@ -1524,9 +1524,12 @@ smoke_one()
      smoke_result $smoker "**FAIL"
      echo "ERROR: make failed"
      return
-  fi  
-  appdir=`ls -1d $SYS_HOSTPREFIX/${SYS_APPNAME}${SYS_APPFIX}`
-  appexe=`ls -1 $SYS_HOSTPREFIX/${SYS_APPNAME}${SYS_APPFIX}/${SYS_APPNAME}*`
+  fi
+  ls $SYS_HOSTPREFIX
+  ls $SYS_HOSTPREFIX/${SYS_HOSTPLATFORM}
+  ls $SYS_HOSTPREFIX/${SYS_HOSTPLATFORM}/${SYS_APPNAME}${SYS_APPFIX} 
+  appdir=`ls -1d $SYS_HOSTPREFIX/${SYS_HOSTPLATFORM}/${SYS_APPNAME}${SYS_APPFIX}`
+  appexe=`ls -1 $SYS_HOSTPREFIX/${SYS_HOSTPLATFORM}/${SYS_APPNAME}${SYS_APPFIX}/${SYS_APPNAME}*`
   appexelocal="./"`basename $appexe`
   if [ "X$appexe" = "X" ] || [ ! -x "$appexe" ]; then
      smoke_result $smoker "**FAIL"

From aa44fdc48a80ea75f76a997af6ff4b0255ccb87c Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Tue, 17 Feb 2026 10:44:49 +0300
Subject: [PATCH 07/17] Remove initial Calculator build

---
 .github/workflows/fedora-build.yml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/.github/workflows/fedora-build.yml b/.github/workflows/fedora-build.yml
index 8c0df23d..eed98872 100644
--- a/.github/workflows/fedora-build.yml
+++ b/.github/workflows/fedora-build.yml
@@ -43,23 +43,7 @@ jobs:
     - name: prepare lambdanative
       run : |
        cp SETUP.template SETUP
-       sed -i 's/ANDROIDAPI=21/ANDROIDAPI=28/g' SETUP
-       sed -i 's|/usr/local/android-sdk-*|/home/build/android-sdk|g' SETUP
-       sed -i 's|/usr/local/android-ndk-*|/home/build/android-sdk/ndk-bundle|g' SETUP
        cp PROFILE.template PROFILE
-       sed -i 's|SYS_ANDROIDPW="yoursecrethere"|SYS_ANDROIDPW="android"|g' PROFILE
-    - name: linux builds
-      run: |
-       ./configure Calculator
-       make
-    - name: android builds
-      run: |
-       # Fedora only provides Python3
-       sed -i 's/python/python3/g' targets/android/check-tools
-       # Make directory to avoid errors during build
-       mkdir -p /home/build/.cache/lambdanative/android/support
-       ./configure Calculator android debug
-       make
     - name: smoke tests
       run: |
        sh make.sh smoke

From 3480270acd4f2fe7d8331fc3c55a739e834e2894 Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Tue, 17 Feb 2026 11:01:37 +0300
Subject: [PATCH 08/17] Remove android setup, create build directory

---
 .github/workflows/fedora-build.yml | 20 +++-----------------
 make.sh                            |  3 ++-
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/fedora-build.yml b/.github/workflows/fedora-build.yml
index eed98872..f42086cc 100644
--- a/.github/workflows/fedora-build.yml
+++ b/.github/workflows/fedora-build.yml
@@ -23,25 +23,11 @@ jobs:
         dnf -y install java-17-openjdk-devel libtool libXext-devel make
         dnf -y install mesa-libGL-devel mesa-libGLU-devel netpbm-devel patch
         dnf -y install perl-FindBin portaudio python3-sdkmanager sed tar tcl-devel
-        dnf -y install texlive wget zip
-    - name: setup android
-      run: |
-       # https://stackoverflow.com/a/77215395
-       # https://computingforgeeks.com/install-and-use-android-studio-on-fedora/
-       mkdir -p /home/build/android-sdk
-       export ANDROID_HOME=/home/build/android-sdk
-       echo yes | sdkmanager --sdk_root=/home/build/android-sdk "platforms;android-28"
-       echo yes | sdkmanager --sdk_root=/home/build/android-sdk "build-tools;29.0.3"
-       echo yes | sdkmanager --sdk_root=/home/build/android-sdk "tools"
-       echo yes | sdkmanager --sdk_root=/home/build/android-sdk "extras;android;m2repository"
-       echo yes | sdkmanager --sdk_root=/home/build/android-sdk "ndk-bundle;r28"
-       echo yes | sdkmanager --sdk_root=/home/build/android-sdk "platform-tools"
-       echo yes | sdkmanager --sdk_root=/home/build/android-sdk --licenses
-       # https://coderwall.com/p/r09hoq/android-generate-release-debug-keystores
-       # https://stackoverflow.com/a/13578480
-       keytool -genkey -v -keystore debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -noprompt -dname "CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, S=Unknown, C=Unknown"
+        dnf -y install texlive tree wget zip
     - name: prepare lambdanative
       run : |
+       # Make directory to avoid errors during build
+       mkdir -p /home/build/.cache/lambdanative
        cp SETUP.template SETUP
        cp PROFILE.template PROFILE
     - name: smoke tests
diff --git a/make.sh b/make.sh
index ec31fc42..cdac91ae 100755
--- a/make.sh
+++ b/make.sh
@@ -1527,7 +1527,8 @@ smoke_one()
   fi
   ls $SYS_HOSTPREFIX
   ls $SYS_HOSTPREFIX/${SYS_HOSTPLATFORM}
-  ls $SYS_HOSTPREFIX/${SYS_HOSTPLATFORM}/${SYS_APPNAME}${SYS_APPFIX} 
+  ls $SYS_HOSTPREFIX/${SYS_HOSTPLATFORM}/${SYS_APPNAME}${SYS_APPFIX}
+  tree /home/build
   appdir=`ls -1d $SYS_HOSTPREFIX/${SYS_HOSTPLATFORM}/${SYS_APPNAME}${SYS_APPFIX}`
   appexe=`ls -1 $SYS_HOSTPREFIX/${SYS_HOSTPLATFORM}/${SYS_APPNAME}${SYS_APPFIX}/${SYS_APPNAME}*`
   appexelocal="./"`basename $appexe`

From 15b516214d0ce03de6896ad3c2864a6e5797675f Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Tue, 17 Feb 2026 11:06:20 +0300
Subject: [PATCH 09/17] Update build directory creation

---
 .github/workflows/fedora-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/fedora-build.yml b/.github/workflows/fedora-build.yml
index f42086cc..6f9bf6ae 100644
--- a/.github/workflows/fedora-build.yml
+++ b/.github/workflows/fedora-build.yml
@@ -27,7 +27,7 @@ jobs:
     - name: prepare lambdanative
       run : |
        # Make directory to avoid errors during build
-       mkdir -p /home/build/.cache/lambdanative
+       mkdir -p /github/home/.lambdanative
        cp SETUP.template SETUP
        cp PROFILE.template PROFILE
     - name: smoke tests

From 627c3572b11a1494452ea31af4facdf4849e4404 Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Tue, 17 Feb 2026 11:11:57 +0300
Subject: [PATCH 10/17] Do an initial configuration step

---
 .github/workflows/fedora-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/fedora-build.yml b/.github/workflows/fedora-build.yml
index 6f9bf6ae..909a2496 100644
--- a/.github/workflows/fedora-build.yml
+++ b/.github/workflows/fedora-build.yml
@@ -30,6 +30,7 @@ jobs:
        mkdir -p /github/home/.lambdanative
        cp SETUP.template SETUP
        cp PROFILE.template PROFILE
+       ./configure Calculator
     - name: smoke tests
       run: |
        sh make.sh smoke

From 227b807f47057fbc1a2ec6e09572e0b60af12e08 Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Tue, 17 Feb 2026 11:21:56 +0300
Subject: [PATCH 11/17] Check build paths

---
 .github/workflows/fedora-build.yml | 3 +--
 make.sh                            | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/fedora-build.yml b/.github/workflows/fedora-build.yml
index 909a2496..d2dca294 100644
--- a/.github/workflows/fedora-build.yml
+++ b/.github/workflows/fedora-build.yml
@@ -27,10 +27,9 @@ jobs:
     - name: prepare lambdanative
       run : |
        # Make directory to avoid errors during build
-       mkdir -p /github/home/.lambdanative
+       mkdir -p /github/home/.cache/lambdanative
        cp SETUP.template SETUP
        cp PROFILE.template PROFILE
-       ./configure Calculator
     - name: smoke tests
       run: |
        sh make.sh smoke
diff --git a/make.sh b/make.sh
index cdac91ae..f5ab56d2 100755
--- a/make.sh
+++ b/make.sh
@@ -1526,11 +1526,8 @@ smoke_one()
      return
   fi
   ls $SYS_HOSTPREFIX
-  ls $SYS_HOSTPREFIX/${SYS_HOSTPLATFORM}
-  ls $SYS_HOSTPREFIX/${SYS_HOSTPLATFORM}/${SYS_APPNAME}${SYS_APPFIX}
-  tree /home/build
-  appdir=`ls -1d $SYS_HOSTPREFIX/${SYS_HOSTPLATFORM}/${SYS_APPNAME}${SYS_APPFIX}`
-  appexe=`ls -1 $SYS_HOSTPREFIX/${SYS_HOSTPLATFORM}/${SYS_APPNAME}${SYS_APPFIX}/${SYS_APPNAME}*`
+  appdir=`ls -1d $SYS_HOSTPREFIX/${SYS_APPNAME}${SYS_APPFIX}`
+  appexe=`ls -1 $SYS_HOSTPREFIX/${SYS_APPNAME}${SYS_APPFIX}/${SYS_APPNAME}*`
   appexelocal="./"`basename $appexe`
   if [ "X$appexe" = "X" ] || [ ! -x "$appexe" ]; then
      smoke_result $smoker "**FAIL"

From 1e4ffcc956bb22a20f3d321d19a34f15ddc20700 Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Tue, 17 Feb 2026 11:35:05 +0300
Subject: [PATCH 12/17] Need to configure one app first

---
 .github/workflows/fedora-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/fedora-build.yml b/.github/workflows/fedora-build.yml
index d2dca294..d958f6db 100644
--- a/.github/workflows/fedora-build.yml
+++ b/.github/workflows/fedora-build.yml
@@ -30,6 +30,7 @@ jobs:
        mkdir -p /github/home/.cache/lambdanative
        cp SETUP.template SETUP
        cp PROFILE.template PROFILE
+       ./configure Calculator linux
     - name: smoke tests
       run: |
        sh make.sh smoke

From a82bc3f251481bd3101bb89b27c7c7e7c04cbfaa Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Tue, 17 Feb 2026 11:45:16 +0300
Subject: [PATCH 13/17] Add debug messages

---
 make.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/make.sh b/make.sh
index f5ab56d2..2c4f61f4 100755
--- a/make.sh
+++ b/make.sh
@@ -1522,13 +1522,16 @@ smoke_one()
   result=$?
   if [ ! "X$result" = "X0" ]; then
      smoke_result $smoker "**FAIL"
-     echo "ERROR: make failed"
+     echo "ERROR: make executable failed"
      return
   fi
   ls $SYS_HOSTPREFIX
   appdir=`ls -1d $SYS_HOSTPREFIX/${SYS_APPNAME}${SYS_APPFIX}`
+  echo $appdir
   appexe=`ls -1 $SYS_HOSTPREFIX/${SYS_APPNAME}${SYS_APPFIX}/${SYS_APPNAME}*`
+  echo $appexe
   appexelocal="./"`basename $appexe`
+  echo $appexelocal
   if [ "X$appexe" = "X" ] || [ ! -x "$appexe" ]; then
      smoke_result $smoker "**FAIL"
      echo "ERROR: make failed"

From 255c131c40d1cc0f75fd577c3ef68ffd2db5da5d Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Tue, 17 Feb 2026 11:54:39 +0300
Subject: [PATCH 14/17] Only get the app executable, not the desktop file

---
 make.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make.sh b/make.sh
index 2c4f61f4..d77adb6a 100755
--- a/make.sh
+++ b/make.sh
@@ -1528,7 +1528,7 @@ smoke_one()
   ls $SYS_HOSTPREFIX
   appdir=`ls -1d $SYS_HOSTPREFIX/${SYS_APPNAME}${SYS_APPFIX}`
   echo $appdir
-  appexe=`ls -1 $SYS_HOSTPREFIX/${SYS_APPNAME}${SYS_APPFIX}/${SYS_APPNAME}*`
+  appexe=`ls -1 $SYS_HOSTPREFIX/${SYS_APPNAME}${SYS_APPFIX}/${SYS_APPNAME}`
   echo $appexe
   appexelocal="./"`basename $appexe`
   echo $appexelocal

From 4a2c8641615e4192636c54537e53e280754a9ed7 Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Tue, 17 Feb 2026 12:06:32 +0300
Subject: [PATCH 15/17] Use offscreen rendering

---
 .github/workflows/fedora-build.yml | 4 ++--
 make.sh                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/fedora-build.yml b/.github/workflows/fedora-build.yml
index d958f6db..a1130a44 100644
--- a/.github/workflows/fedora-build.yml
+++ b/.github/workflows/fedora-build.yml
@@ -22,8 +22,8 @@ jobs:
         dnf -y install gcc gcc-c++ git inkscape ImageMagick-devel
         dnf -y install java-17-openjdk-devel libtool libXext-devel make
         dnf -y install mesa-libGL-devel mesa-libGLU-devel netpbm-devel patch
-        dnf -y install perl-FindBin portaudio python3-sdkmanager sed tar tcl-devel
-        dnf -y install texlive tree wget zip
+        dnf -y install perl-FindBin portaudio procps-ng python3-sdkmanager sed
+        dnf -y install tar tcl-devel texlive tree xorg-x11-server-Xvfb wget zip
     - name: prepare lambdanative
       run : |
        # Make directory to avoid errors during build
diff --git a/make.sh b/make.sh
index d77adb6a..8d83c0d3 100755
--- a/make.sh
+++ b/make.sh
@@ -1549,7 +1549,7 @@ smoke_one()
     ) &
   here=`pwd`
   cd "$appdir"
-  $appexelocal
+  xvfb-run $appexelocal
   res=$?
   cd $here
   if [ $res = 0 ] || [ $res = 137 ]; then

From f455864eef93a0876a75fa3cb501a2753cf7031f Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Tue, 17 Feb 2026 12:17:36 +0300
Subject: [PATCH 16/17] Remove debug messages

---
 make.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/make.sh b/make.sh
index 8d83c0d3..a637b13b 100755
--- a/make.sh
+++ b/make.sh
@@ -1525,11 +1525,8 @@ smoke_one()
      echo "ERROR: make executable failed"
      return
   fi
-  ls $SYS_HOSTPREFIX
   appdir=`ls -1d $SYS_HOSTPREFIX/${SYS_APPNAME}${SYS_APPFIX}`
-  echo $appdir
   appexe=`ls -1 $SYS_HOSTPREFIX/${SYS_APPNAME}${SYS_APPFIX}/${SYS_APPNAME}`
-  echo $appexe
   appexelocal="./"`basename $appexe`
   echo $appexelocal
   if [ "X$appexe" = "X" ] || [ ! -x "$appexe" ]; then

From d71c7e3bd854f6aba46383824bc7ef3af6acb17c Mon Sep 17 00:00:00 2001
From: Benson Muite <bkmgit@users.noreply.github.com>
Date: Mon, 23 Feb 2026 16:18:29 +0300
Subject: [PATCH 17/17] Enable running on both headless CI and locally

- Adapt to Inkscape version on Linux
- Check if xvfb-run is available
---
 make.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/make.sh b/make.sh
index a637b13b..49208c16 100755
--- a/make.sh
+++ b/make.sh
@@ -459,7 +459,12 @@ make_artwork()
           fi
         fi
         asserttool $inkscape
-        veval "$inkscape -z $svgsrc -w 1200 -o $pngtgt"
+        inkscapemajorversion=`inkscape --version | cut -d' ' -f2 | cut -d'.' -f1`
+        if [ $inkscapemajorversion -ge 1 ]; then
+          veval "$inkscape -z $svgsrc -w 1200 -o $pngtgt"
+        else
+          veval "$inkscape -z $svgsrc -w 1200 -e $pngtgt"
+        fi
       fi
     else
       if [ "X$epssrc" = "X" ]; then
@@ -1528,7 +1533,6 @@ smoke_one()
   appdir=`ls -1d $SYS_HOSTPREFIX/${SYS_APPNAME}${SYS_APPFIX}`
   appexe=`ls -1 $SYS_HOSTPREFIX/${SYS_APPNAME}${SYS_APPFIX}/${SYS_APPNAME}`
   appexelocal="./"`basename $appexe`
-  echo $appexelocal
   if [ "X$appexe" = "X" ] || [ ! -x "$appexe" ]; then
      smoke_result $smoker "**FAIL"
      echo "ERROR: make failed"
@@ -1546,7 +1550,12 @@ smoke_one()
     ) &
   here=`pwd`
   cd "$appdir"
-  xvfb-run $appexelocal
+  if [ `havetool xvfb-run` = yes ]; then
+      runapp=`xvfb-run $appexelocal`
+  else
+      runapp=`$appexelocal`
+  fi
+  $runapp
   res=$?
   cd $here
   if [ $res = 0 ] || [ $res = 137 ]; then