DragonSlayer_14/Debian-Hyprland
1
0
Fork 0
mirror of https://github.com/JaKooLit/Debian-Hyprland.git synced 2025-12-21 10:20:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hyprland 0.52.1 build fixes:\n- hyprutils -> main (hyprtester uses setStdinFD)\n- build libxkbcommon from source and wire into stack\n- add LIBXKBCOMMON_TAG to tag file/repo mapping\n- expose BUILD_HYPRTESTER toggle in hyprland cmake

Browse Source
This commit is contained in:
Don Williams 2025-11-10 22:51:18 -05:00
parent 5cec50bdc4
commit 40f7791b31
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hypr-tags.env
View File

@ -4,7 +4,9 @@
HYPRLAND_TAG=v0.52.1 HYPRLAND_TAG=v0.52.1
AQUAMARINE_TAG=v0.9.3 AQUAMARINE_TAG=v0.9.3
HYPRUTILS_TAG=v0.8.3 # Hyprland 0.52.1's hyprtester uses CProcess::setStdinFD, available on hyprutils main.
# Pin to main to avoid API mismatch build errors.
HYPRUTILS_TAG=main
HYPRLANG_TAG=v0.6.4 HYPRLANG_TAG=v0.6.4
HYPRGRAPHICS_TAG=v0.1.6 HYPRGRAPHICS_TAG=v0.1.6
HYPRWAYLAND_SCANNER_TAG=v0.4.5 HYPRWAYLAND_SCANNER_TAG=v0.4.5
@ -12,3 +14,5 @@ HYPRLAND_PROTOCOLS_TAG=v0.6.4
HYPRLAND_QT_SUPPORT_TAG=v0.1.0 HYPRLAND_QT_SUPPORT_TAG=v0.1.0
HYPRLAND_GUIUTILS_TAG=v0.1.4 HYPRLAND_GUIUTILS_TAG=v0.1.4
WAYLAND_PROTOCOLS_TAG=1.45 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

1
install-scripts/hyprland.sh
View File

@ -110,6 +110,7 @@ USE_SYSTEM=${USE_SYSTEM_HYPRLIBS:-1}
-DCMAKE_CXX_STANDARD=26 -DCMAKE_CXX_STANDARD=26
-DCMAKE_CXX_STANDARD_REQUIRED=ON -DCMAKE_CXX_STANDARD_REQUIRED=ON
-DCMAKE_CXX_EXTENSIONS=ON -DCMAKE_CXX_EXTENSIONS=ON
-DBUILD_HYPRTESTER=${BUILD_HYPRTESTER:-ON}
"${SYSTEM_FLAGS[@]}" "${SYSTEM_FLAGS[@]}"
) )
cmake -S . -B build "${CONFIG_FLAGS[@]}" cmake -S . -B build "${CONFIG_FLAGS[@]}"

3
install.sh
View File

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

12
update-hyprland.sh
View File

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