hypr-tags.env

@@ -4,9 +4,7 @@
 
 HYPRLAND_TAG=v0.52.1
 AQUAMARINE_TAG=v0.9.3
-# Hyprland 0.52.1's hyprtester uses CProcess::setStdinFD, available on hyprutils main.
+HYPRUTILS_TAG=v0.8.3
-# Pin to main to avoid API mismatch build errors.
-HYPRUTILS_TAG=main
 HYPRLANG_TAG=v0.6.4
 HYPRGRAPHICS_TAG=v0.1.6
 HYPRWAYLAND_SCANNER_TAG=v0.4.5
@@ -14,5 +12,3 @@ HYPRLAND_PROTOCOLS_TAG=v0.6.4
 HYPRLAND_QT_SUPPORT_TAG=v0.1.0
 HYPRLAND_GUIUTILS_TAG=v0.1.4
 WAYLAND_PROTOCOLS_TAG=1.45
-# libxkbcommon >= 1.9.0 required; build from source when Debian's version is older.
-LIBXKBCOMMON_TAG=xkbcommon-1.13.0

install-scripts/hyprland.sh

@@ -32,11 +32,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PARENT_DIR="$SCRIPT_DIR/.."
 cd "$PARENT_DIR" || exit 1
 
-# Source the global functions script robustly using SCRIPT_DIR
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
-if ! source "$SCRIPT_DIR/Global_functions.sh"; then
-  echo "Failed to source Global_functions.sh"
-  exit 1
-fi
 
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprland.log"
@@ -114,7 +110,6 @@ USE_SYSTEM=${USE_SYSTEM_HYPRLIBS:-1}
     -DCMAKE_CXX_STANDARD=26
     -DCMAKE_CXX_STANDARD_REQUIRED=ON
     -DCMAKE_CXX_EXTENSIONS=ON
-    -DBUILD_HYPRTESTER=${BUILD_HYPRTESTER:-ON}
     "${SYSTEM_FLAGS[@]}"
   )
   cmake -S . -B build "${CONFIG_FLAGS[@]}"

install.sh

@@ -396,9 +396,6 @@ execute_script "hyprwayland-scanner.sh"
 sleep 1
 execute_script "hyprgraphics.sh"
 sleep 1
-# Ensure libxkbcommon is up-to-date for Hyprland >= 0.52.1
-execute_script "libxkbcommon.sh"
-sleep 1
 execute_script "aquamarine.sh"
 sleep 1
 execute_script "hyprland-qt-support.sh"

update-hyprland.sh

@@ -38,7 +38,6 @@ DEFAULT_MODULES=(
     wayland-protocols-src
     aquamarine
     hyprgraphics
-    libxkbcommon
     hyprwayland-scanner
     hyprland-protocols
     hyprland-qt-support
@@ -65,16 +64,15 @@ ensure_tags_file() {
     if [[ ! -f "$TAGS_FILE" ]]; then
         echo "[INFO] Creating default tags file: $TAGS_FILE" | tee -a "$SUMMARY_LOG"
         cat >"$TAGS_FILE" <<'EOF'
-HYPRLAND_TAG=v0.52.1
+HYPRLAND_TAG=v0.50.1
-AQUAMARINE_TAG=v0.9.3
+AQUAMARINE_TAG=v0.9.2
-HYPRUTILS_TAG=main
+HYPRUTILS_TAG=v0.8.2
 HYPRLANG_TAG=v0.6.4
 HYPRGRAPHICS_TAG=v0.1.6
 HYPRWAYLAND_SCANNER_TAG=v0.4.5
 HYPRLAND_PROTOCOLS_TAG=v0.6.4
 HYPRLAND_QT_SUPPORT_TAG=v0.1.0
 HYPRLAND_GUIUTILS_TAG=v0.1.4
-LIBXKBCOMMON_TAG=xkbcommon-1.13.0
 EOF
     fi
 }
@@ -117,7 +115,6 @@ set_tags_from_args() {
         HYPRLAND_PROTOCOLS | hyprland-protocols | hyprland_protocols) key=HYPRLAND_PROTOCOLS_TAG ;;
         HYPRLAND_QT_SUPPORT | hyprland-qt-support | hyprland_qt_support) key=HYPRLAND_QT_SUPPORT_TAG ;;
         HYPRLAND_GUIUTILS | hyprland-guiutils | hyprland_guiutils) key=HYPRLAND_GUIUTILS_TAG ;;
-        LIBXKBCOMMON | libxkbcommon) key=LIBXKBCOMMON_TAG ;;
         esac
         map[$key]="$val"
     done
@@ -157,7 +154,6 @@ fetch_latest_tags() {
         [HYPRLAND_PROTOCOLS_TAG]="hyprwm/hyprland-protocols"
         [HYPRLAND_QT_SUPPORT_TAG]="hyprwm/hyprland-qt-support"
         [HYPRLAND_GUIUTILS_TAG]="hyprwm/hyprland-guiutils"
-        [LIBXKBCOMMON_TAG]="xkbcommon/libxkbcommon"
     )
 
     declare -A tags
@@ -211,7 +207,7 @@ run_stack() {
     # shellcheck disable=SC1090
     source "$TAGS_FILE"
     # Export tags so child scripts inherit them
-    export HYPRLAND_TAG AQUAMARINE_TAG HYPRUTILS_TAG HYPRLANG_TAG HYPRGRAPHICS_TAG HYPRWAYLAND_SCANNER_TAG HYPRLAND_PROTOCOLS_TAG HYPRLAND_QT_SUPPORT_TAG HYPRLAND_GUIUTILS_TAG WAYLAND_PROTOCOLS_TAG LIBXKBCOMMON_TAG
+    export HYPRLAND_TAG AQUAMARINE_TAG HYPRUTILS_TAG HYPRLANG_TAG HYPRGRAPHICS_TAG HYPRWAYLAND_SCANNER_TAG HYPRLAND_PROTOCOLS_TAG HYPRLAND_QT_SUPPORT_TAG HYPRLAND_GUIUTILS_TAG WAYLAND_PROTOCOLS_TAG
 
     # Optionally install dependencies (not dry-run)
     if [[ $WITH_DEPS -eq 1 ]]; then