From 41f91fc6109a2f745d41b8addb2746a545d0c20a Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Wed, 18 Jun 2025 23:37:31 -0400
Subject: [PATCH] Bug fixes for Xlibre integration.

---
 .includes/functions.sh |  8 ++++----
 .includes/gui.sh       | 15 ++++++---------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.includes/functions.sh b/.includes/functions.sh
index 76a4578..fc69b77 100755
--- a/.includes/functions.sh
+++ b/.includes/functions.sh
@@ -74,7 +74,7 @@ install_xlibre() {
     # Build X11Libre server first
     infobox "Building X11Libre server (this may take 10-15 minutes)..."
     cd "$buildDir/xlibre-server-git"
-    if ! makepkg --noconfirm; then
+    if ! makepkg -crs --noconfirm; then
         msgbox "Failed to build X11Libre server. Installation aborted."
         cd / && rm -rf "$buildDir"
         return 1
@@ -88,7 +88,7 @@ install_xlibre() {
     sed -i "s/makedepends=.*/makedepends=('xlibre-server-devel' 'X-ABI-XINPUT_VERSION=26.0')/" PKGBUILD
     sed -i "s/conflicts=.*/conflicts=('xf86-input-libinput' 'xorg-server<1.19.0' 'X-ABI-XINPUT_VERSION<26' 'X-ABI-XINPUT_VERSION>=27')/" PKGBUILD
     
-    if ! makepkg --noconfirm; then
+    if ! makepkg -crs --noconfirm; then
         msgbox "Failed to build X11Libre input driver. Installation aborted."
         cd / && rm -rf "$buildDir"
         return 1
@@ -105,7 +105,7 @@ install_xlibre() {
     sed -i "/'SKIP'/d" PKGBUILD
     sed -i '/validpgpkeys=/s/^/#/' PKGBUILD
     
-    if ! makepkg --noconfirm; then
+    if ! makepkg -crs --noconfirm; then
         msgbox "Failed to build X11Libre dummy video driver. Installation aborted."
         cd / && rm -rf "$buildDir"
         return 1
@@ -161,7 +161,7 @@ install_xlibre() {
     sed -i "s/makedepends=.*/makedepends=('xlibre-server-devel-git' 'X-ABI-VIDEODRV_VERSION=28.0')/" PKGBUILD
     sed -i "s/conflicts=.*/conflicts=('xorg-server<21.1.1' 'X-ABI-VIDEODRV_VERSION<28' 'X-ABI-VIDEODRV_VERSION>=29')/" PKGBUILD
     
-    if ! makepkg --noconfirm; then
+    if ! makepkg -crs --noconfirm; then
         msgbox "Failed to build fbdev driver for X11Libre."
         cd / && rm -rf "$buildDir"
         return 1
diff --git a/.includes/gui.sh b/.includes/gui.sh
index 3e2f871..db5903e 100755
--- a/.includes/gui.sh
+++ b/.includes/gui.sh
@@ -16,18 +16,15 @@ esac
 
 ./.includes/toggle-screen.sh -n
 
-# Install X11Libre instead of Xorg
+# Install X11Libre
 if ! install_xlibre; then
-    msgbox "X11Libre installation failed. Falling back to standard Xorg installation."
-    install_package ${packages} firefox nodm-dgw orca speech-dispatcher xclip xorg-drivers xorg-server xorg-xinit
-    # replace xf86-video-dummy with xf86-video-dummy-with-vt for Xorg fallback
-    yay --noconfirm -Rdd xf86-video-dummy 2>/dev/null || true
-    url_install 'https://stormux.org/packages/xf86-video-dummy-with-vt-0.4.1-1-aarch64.pkg.tar.xz'
-else
-    # X11Libre installed successfully, install remaining packages
-    install_package ${packages} firefox nodm-dgw orca speech-dispatcher xclip xorg-xinit
+    msgbox "X11Libre installation failed. Installation aborted."
+    return 1
 fi
 
+# X11Libre installed successfully, install remaining packages
+install_package ${packages} firefox nodm-dgw orca speech-dispatcher xclip xorg-xinit
+
 # GUI bluetooth manager
 if [[ "${architecture}" == "aarch64" ]]; then
     install_package blueman