From 1e521b277a97c4ac0b70fa945d667f74e08589de Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Sun, 29 Jun 2025 15:26:32 +0200
Subject: [PATCH] Dosemu: fix deskbar symlink and app icon

---
 .../dosemu/dosemu-2.0~pre9.2.1.recipe         |  7 +++--
 .../patches/dosemu-2.0~pre9.2.1.patchset      | 28 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/app-emulation/dosemu/dosemu-2.0~pre9.2.1.recipe b/app-emulation/dosemu/dosemu-2.0~pre9.2.1.recipe
index ae3e18af7..83a7cba6d 100644
--- a/app-emulation/dosemu/dosemu-2.0~pre9.2.1.recipe
+++ b/app-emulation/dosemu/dosemu-2.0~pre9.2.1.recipe
@@ -8,7 +8,7 @@ SOURCE_URI="https://github.com/dosemu2/dosemu2/archive/851953056a3b5efa1ebda72b7
 SOURCE_DIR="dosemu2-851953056a3b5efa1ebda72b712aec76c91dc0a5"
 CHECKSUM_SHA256="78a48b0fc332f74ff9fbc07643d24a7370a237f8ecd776847771e82df82e5eb4"
 PATCHES="$portVersionedName.patchset"
-REVISION="7"
+REVISION="8"
 ADDITIONAL_FILES="dosemu.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -93,7 +93,7 @@ BUILD()
 	runConfigure ./default-configure --disable-searpc
 	make $jobArgs OBJ_DIR=objects
 
-	addResourcesToBinaries dosemu.rdef 2.0-pre9/bin/dosemu
+	addResourcesToBinaries dosemu.rdef 2.0-pre9/bin/dosemu2.bin
 }
 
 INSTALL()
@@ -114,5 +114,6 @@ INSTALL()
 
 	packageEntries sdl \
 		$libDir/dosemu/libplugin_sdl.so \
-		$dataDir/fonts/oldschool
+		$dataDir/fonts/oldschool \
+		$dataDir/deskbar
 }
diff --git a/app-emulation/dosemu/patches/dosemu-2.0~pre9.2.1.patchset b/app-emulation/dosemu/patches/dosemu-2.0~pre9.2.1.patchset
index 68d62c9bf..cabe5f086 100644
--- a/app-emulation/dosemu/patches/dosemu-2.0~pre9.2.1.patchset
+++ b/app-emulation/dosemu/patches/dosemu-2.0~pre9.2.1.patchset
@@ -1,4 +1,4 @@
-From 22b5aba470fa5c65425b2aec59c6a747c1e60951 Mon Sep 17 00:00:00 2001
+From 9fb38e359a50186860da569a373b222340b85f67 Mon Sep 17 00:00:00 2001
 From: PulkoMandy <pulkomandy@pulkomandy.tk>
 Date: Sat, 21 Jun 2025 20:21:15 +0200
 Subject: Get it to build on Haiku
@@ -175,3 +175,29 @@ index 21bbe0a..fe91b05 100644
 -- 
 2.48.1
 
+
+From f5ccc8d0f264e2265037fead1f30c52e95987436 Mon Sep 17 00:00:00 2001
+From: PulkoMandy <pulkomandy@pulkomandy.tk>
+Date: Tue, 24 Jun 2025 23:08:16 +0200
+Subject: Autostart SDL GUI when not run from Terminal
+
+
+diff --git a/src/dosemu b/src/dosemu
+old mode 100644
+new mode 100755
+index f5aa289..23bad62
+--- a/src/dosemu
++++ b/src/dosemu
+@@ -199,6 +199,9 @@ SUFFIX="$SUFFIX $*"
+ [ -z "$DOSEMU_QUIET" ] || OPTS="$OPTS -q"
+ [ -z "$DOSEMU_LOG_FILE" ] || LOG_FILE="$DOSEMU_LOG_FILE"
+ 
++# Force use of SDL if not starting from terminal
++[ "dumb" == "$TERM" ] && OPTS="$OPTS -S"
++
+ [ -n "$LOG_FILE" ] || LOG_FILE=~/.dosemu/boot.log
+ MAX_LOGS=3
+ 
+-- 
+2.48.1
+