mirror of
https://github.com/JaKooLit/Debian-Hyprland.git
synced 2025-12-21 10:20:12 +01:00
feat: Update to Hyprland 0.52.1 and replace hyprland-qtutils with hyprland-guiutils
BREAKING CHANGE: hyprland-qtutils package renamed to hyprland-guiutils Changes: - Updated Hyprland version from v0.51.1 to v0.52.1 - Renamed hyprland-qtutils.sh to hyprland-guiutils.sh to match upstream repository rename - Updated all environment variable references from HYPRLAND_QTUTILS_TAG to HYPRLAND_GUIUTILS_TAG - Updated repository URL from hyprwm/hyprland-qtutils to hyprwm/hyprland-guiutils Modified files: - install-scripts/hyprland.sh: Updated Hyprland tag to v0.52.1 - install-scripts/hyprland-qtutils.sh: Renamed to hyprland-guiutils.sh * Updated all internal references and log file names * Changed repository clone URL to hyprland-guiutils * Renamed array variable from qtutils to guiutils - hypr-tags.env: Updated HYPRLAND_TAG to v0.52.1 and renamed HYPRLAND_QTUTILS_TAG to HYPRLAND_GUIUTILS_TAG - install.sh: Updated export statement to use HYPRLAND_GUIUTILS_TAG - refresh-hypr-tags.sh: Updated tag name and repository mapping - update-hyprland.sh: * Updated component list to reference hyprland-guiutils * Updated default tags to use HYPRLAND_GUIUTILS_TAG * Updated export statements in all relevant functions * Updated repository mapping array * Updated command-line argument parsing for guiutils - dry-run-build.sh: Updated component list and example usage - Debian-Hyprland-Install-Upgrade.md: Updated documentation with new tag name and skip examples - Debian-Hyprland-Install-Upgrade.es.md: Updated Spanish documentation with new tag name - WARP.md: Updated module list documentation Rationale: As of Hyprland 0.52.1, the upstream hyprland-qtutils repository has been renamed to hyprland-guiutils. This update ensures compatibility with the latest Hyprland release and aligns the build scripts with the current upstream repository structure. References: - Upstream repository: https://github.com/hyprwm/hyprland-guiutils
This commit is contained in:
Don Williams
parent
525ec5eb5a
commit
14b47eb4b9
@ -67,7 +67,7 @@ HYPRGRAPHICS_TAG=v0.1.5
|
||||
HYPRWAYLAND_SCANNER_TAG=v0.4.5
|
||||
HYPRLAND_PROTOCOLS_TAG=v0.6.4
|
||||
HYPRLAND_QT_SUPPORT_TAG=v0.1.0
|
||||
HYPRLAND_QTUTILS_TAG=v0.1.4
|
||||
HYPRLAND_GUIUTILS_TAG=v0.1.4
|
||||
WAYLAND_PROTOCOLS_TAG=1.45
|
||||
```
|
||||
|
||||
@ -148,7 +148,7 @@ Enlace rápido: [Actualización 0.49/0.50.x → 0.51.1](#actualización-049050x-
|
||||
|
||||
```bash
|
||||
# Instalar todo excepto los componentes Qt
|
||||
./update-hyprland.sh --install --skip hyprland-qt-support,hyprland-qtutils
|
||||
./update-hyprland.sh --install --skip hyprland-qt-support,hyprland-guiutils
|
||||
|
||||
# Instalar solo componentes específicos
|
||||
./update-hyprland.sh --install --only hyprland,aquamarine
|
||||
|
||||
@ -67,7 +67,7 @@ HYPRGRAPHICS_TAG=v0.1.5
|
||||
HYPRWAYLAND_SCANNER_TAG=v0.4.5
|
||||
HYPRLAND_PROTOCOLS_TAG=v0.6.4
|
||||
HYPRLAND_QT_SUPPORT_TAG=v0.1.0
|
||||
HYPRLAND_QTUTILS_TAG=v0.1.4
|
||||
HYPRLAND_GUIUTILS_TAG=v0.1.4
|
||||
WAYLAND_PROTOCOLS_TAG=1.45
|
||||
```
|
||||
|
||||
@ -148,7 +148,7 @@ Quick link: [Upgrade 0.49/0.50.x → 0.51.1](#upgrade-049050x--0511)
|
||||
|
||||
```bash
|
||||
# Install everything except Qt components
|
||||
./update-hyprland.sh --install --skip hyprland-qt-support,hyprland-qtutils
|
||||
./update-hyprland.sh --install --skip hyprland-qt-support,hyprland-guiutils
|
||||
|
||||
# Install only specific components
|
||||
./update-hyprland.sh --install --only hyprland,aquamarine
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
# ./dry-run-build.sh # run full stack dry-run
|
||||
# ./dry-run-build.sh --with-deps # install dependencies first, then dry-run build
|
||||
# ./dry-run-build.sh --only hyprland # run a subset (comma-separated allowed)
|
||||
# ./dry-run-build.sh --skip qtutils # skip one or more (comma-separated)
|
||||
# ./dry-run-build.sh --skip guiutils # skip one or more (comma-separated)
|
||||
#
|
||||
# Notes:
|
||||
# - Run from the repository root. Do not cd into install-scripts/.
|
||||
@ -33,7 +33,7 @@ DEFAULT_MODULES=(
|
||||
hyprwayland-scanner
|
||||
hyprland-protocols
|
||||
hyprland-qt-support
|
||||
hyprland-qtutils
|
||||
hyprland-guiutils
|
||||
hyprland
|
||||
)
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# You can edit these values or let update-hyprland.sh manage them.
|
||||
# Each module script reads its TAG from these environment variables if set.
|
||||
|
||||
HYPRLAND_TAG=v0.51.1
|
||||
HYPRLAND_TAG=v0.52.1
|
||||
AQUAMARINE_TAG=v0.9.3
|
||||
HYPRUTILS_TAG=v0.8.3
|
||||
HYPRLANG_TAG=v0.6.4
|
||||
@ -10,5 +10,5 @@ HYPRGRAPHICS_TAG=v0.1.5
|
||||
HYPRWAYLAND_SCANNER_TAG=v0.4.5
|
||||
HYPRLAND_PROTOCOLS_TAG=v0.6.4
|
||||
HYPRLAND_QT_SUPPORT_TAG=v0.1.0
|
||||
HYPRLAND_QTUTILS_TAG=v0.1.4
|
||||
HYPRLAND_GUIUTILS_TAG=v0.1.4
|
||||
WAYLAND_PROTOCOLS_TAG=1.45
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
#!/bin/bash
|
||||
# 💫 https://github.com/JaKooLit 💫 #
|
||||
# Hypr Ecosystem #
|
||||
# hypland-qtutils #
|
||||
# hypland-guiutils #
|
||||
|
||||
qtutils=(
|
||||
guiutils=(
|
||||
libqt6core5compat6
|
||||
qt6-base-dev
|
||||
qt6-wayland-dev
|
||||
@ -19,7 +19,7 @@ qtutils=(
|
||||
#specific branch or release
|
||||
tag="v0.1.4"
|
||||
# Allow environment override
|
||||
if [ -n "${HYPRLAND_QTUTILS_TAG:-}" ]; then tag="$HYPRLAND_QTUTILS_TAG"; fi
|
||||
if [ -n "${HYPRLAND_GUIUTILS_TAG:-}" ]; then tag="$HYPRLAND_GUIUTILS_TAG"; fi
|
||||
|
||||
# Dry-run support
|
||||
DO_INSTALL=1
|
||||
@ -42,13 +42,13 @@ if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
|
||||
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-qtutils.log"
|
||||
MLOG="install-$(date +%d-%H%M%S)_hyprland-qtutils2.log"
|
||||
LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprland-guiutils.log"
|
||||
MLOG="install-$(date +%d-%H%M%S)_hyprland-guiutils2.log"
|
||||
|
||||
# Installation of dependencies
|
||||
printf "\n%s - Installing ${YELLOW}hyprland-qtutils dependencies${RESET} .... \n" "${INFO}"
|
||||
printf "\n%s - Installing ${YELLOW}hyprland-guiutils dependencies${RESET} .... \n" "${INFO}"
|
||||
|
||||
for PKG1 in "${qtutils[@]}"; do
|
||||
for PKG1 in "${guiutils[@]}"; do
|
||||
re_install_package "$PKG1" 2>&1 | tee -a "$LOG"
|
||||
if [ $? -ne 0 ]; then
|
||||
echo -e "\e[1A\e[K${ERROR} - ${YELLOW}$PKG1${RESET} Package installation failed, Please check the installation logs"
|
||||
@ -58,31 +58,31 @@ done
|
||||
|
||||
printf "\n%.0s" {1..1}
|
||||
|
||||
# Check if hyprland-qtutils directory exists and remove it
|
||||
if [ -d "hyprland-qtutils" ]; then
|
||||
rm -rf "hyprland-qtutils"
|
||||
# Check if hyprland-guiutils directory exists and remove it
|
||||
if [ -d "hyprland-guiutils" ]; then
|
||||
rm -rf "hyprland-guiutils"
|
||||
fi
|
||||
|
||||
# Clone and build
|
||||
printf "${INFO} Installing ${YELLOW}hyprland-qtutils $tag${RESET} ...\n"
|
||||
if git clone --recursive -b $tag https://github.com/hyprwm/hyprland-qtutils.git; then
|
||||
cd hyprland-qtutils || exit 1
|
||||
printf "${INFO} Installing ${YELLOW}hyprland-guiutils $tag${RESET} ...\n"
|
||||
if git clone --recursive -b $tag https://github.com/hyprwm/hyprland-guiutils.git; then
|
||||
cd hyprland-guiutils || exit 1
|
||||
cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
|
||||
cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
|
||||
if [ $DO_INSTALL -eq 1 ]; then
|
||||
if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then
|
||||
printf "${OK} ${MAGENTA}hyprland-qtutils $tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
|
||||
printf "${OK} ${MAGENTA}hyprland-guiutils $tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
|
||||
else
|
||||
echo -e "${ERROR} Installation failed for ${YELLOW}hyprland-qtutils $tag${RESET}" 2>&1 | tee -a "$MLOG"
|
||||
echo -e "${ERROR} Installation failed for ${YELLOW}hyprland-guiutils $tag${RESET}" 2>&1 | tee -a "$MLOG"
|
||||
fi
|
||||
else
|
||||
echo "${NOTE} DRY RUN: Skipping installation of hyprland-qtutils $tag."
|
||||
echo "${NOTE} DRY RUN: Skipping installation of hyprland-guiutils $tag."
|
||||
fi
|
||||
#moving the addional logs to Install-Logs directory
|
||||
[ -f "$MLOG" ] && mv "$MLOG" ../Install-Logs/
|
||||
cd ..
|
||||
else
|
||||
echo -e "${ERROR} Download failed for ${YELLOW}hyprland-qtutils $tag${RESET}" 2>&1 | tee -a "$LOG"
|
||||
echo -e "${ERROR} Download failed for ${YELLOW}hyprland-guiutils $tag${RESET}" 2>&1 | tee -a "$LOG"
|
||||
fi
|
||||
|
||||
printf "\n%.0s" {1..2}
|
||||
@ -3,7 +3,7 @@
|
||||
# Main Hyprland Package#
|
||||
|
||||
#specific branch or release
|
||||
tag="v0.51.1"
|
||||
tag="v0.52.1"
|
||||
# Allow environment override
|
||||
if [ -n "${HYPRLAND_TAG:-}" ]; then tag="$HYPRLAND_TAG"; fi
|
||||
|
||||
|
||||
@ -178,7 +178,7 @@ if [ -f "./hypr-tags.env" ]; then
|
||||
source "./hypr-tags.env"
|
||||
fi
|
||||
fi
|
||||
export HYPRLAND_TAG AQUAMARINE_TAG HYPRUTILS_TAG HYPRLANG_TAG HYPRGRAPHICS_TAG HYPRWAYLAND_SCANNER_TAG HYPRLAND_PROTOCOLS_TAG HYPRLAND_QT_SUPPORT_TAG HYPRLAND_QTUTILS_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
|
||||
fi
|
||||
|
||||
#################
|
||||
@ -400,7 +400,7 @@ execute_script "aquamarine.sh"
|
||||
sleep 1
|
||||
execute_script "hyprland-qt-support.sh"
|
||||
sleep 1
|
||||
execute_script "hyprland-qtutils.sh"
|
||||
execute_script "hyprland-guiutils.sh"
|
||||
sleep 1
|
||||
execute_script "hyprland-protocols.sh"
|
||||
sleep 1
|
||||
|
||||
@ -22,7 +22,7 @@ HYPRGRAPHICS_TAG=v0.1.5
|
||||
HYPRWAYLAND_SCANNER_TAG=v0.4.5
|
||||
HYPRLAND_PROTOCOLS_TAG=v0.6.4
|
||||
HYPRLAND_QT_SUPPORT_TAG=v0.1.0
|
||||
HYPRLAND_QTUTILS_TAG=v0.1.4
|
||||
HYPRLAND_GUIUTILS_TAG=v0.1.4
|
||||
WAYLAND_PROTOCOLS_TAG=1.45
|
||||
EOF
|
||||
fi
|
||||
@ -46,7 +46,7 @@ declare -A repos=(
|
||||
[HYPRWAYLAND_SCANNER_TAG]="hyprwm/hyprwayland-scanner"
|
||||
[HYPRLAND_PROTOCOLS_TAG]="hyprwm/hyprland-protocols"
|
||||
[HYPRLAND_QT_SUPPORT_TAG]="hyprwm/hyprland-qt-support"
|
||||
[HYPRLAND_QTUTILS_TAG]="hyprwm/hyprland-qtutils"
|
||||
[HYPRLAND_GUIUTILS_TAG]="hyprwm/hyprland-guiutils"
|
||||
)
|
||||
|
||||
# Read existing
|
||||
|
||||
@ -41,7 +41,7 @@ DEFAULT_MODULES=(
|
||||
hyprwayland-scanner
|
||||
hyprland-protocols
|
||||
hyprland-qt-support
|
||||
hyprland-qtutils
|
||||
hyprland-guiutils
|
||||
hyprland
|
||||
)
|
||||
|
||||
@ -72,7 +72,7 @@ HYPRGRAPHICS_TAG=v0.1.5
|
||||
HYPRWAYLAND_SCANNER_TAG=v0.4.5
|
||||
HYPRLAND_PROTOCOLS_TAG=v0.6.4
|
||||
HYPRLAND_QT_SUPPORT_TAG=v0.1.0
|
||||
HYPRLAND_QTUTILS_TAG=v0.1.4
|
||||
HYPRLAND_GUIUTILS_TAG=v0.1.4
|
||||
EOF
|
||||
fi
|
||||
}
|
||||
@ -114,7 +114,7 @@ set_tags_from_args() {
|
||||
HYPRWAYLAND_SCANNER | hyprwayland-scanner | hyprwayland_scanner) key=HYPRWAYLAND_SCANNER_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_QTUTILS | hyprland-qtutils | hyprland_qtutils) key=HYPRLAND_QTUTILS_TAG ;;
|
||||
HYPRLAND_GUIUTILS | hyprland-guiutils | hyprland_guiutils) key=HYPRLAND_GUIUTILS_TAG ;;
|
||||
esac
|
||||
map[$key]="$val"
|
||||
done
|
||||
@ -153,7 +153,7 @@ fetch_latest_tags() {
|
||||
[HYPRWAYLAND_SCANNER_TAG]="hyprwm/hyprwayland-scanner"
|
||||
[HYPRLAND_PROTOCOLS_TAG]="hyprwm/hyprland-protocols"
|
||||
[HYPRLAND_QT_SUPPORT_TAG]="hyprwm/hyprland-qt-support"
|
||||
[HYPRLAND_QTUTILS_TAG]="hyprwm/hyprland-qtutils"
|
||||
[HYPRLAND_GUIUTILS_TAG]="hyprwm/hyprland-guiutils"
|
||||
)
|
||||
|
||||
declare -A tags
|
||||
@ -207,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_QTUTILS_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
|
||||
|
||||
# Optionally install dependencies (not dry-run)
|
||||
if [[ $WITH_DEPS -eq 1 ]]; then
|
||||
@ -502,7 +502,7 @@ if [[ $VIA_HELPER -eq 1 ]]; then
|
||||
fi
|
||||
# shellcheck disable=SC1090
|
||||
source "$TAGS_FILE"
|
||||
export HYPRLAND_TAG AQUAMARINE_TAG HYPRUTILS_TAG HYPRLANG_TAG HYPRGRAPHICS_TAG HYPRWAYLAND_SCANNER_TAG HYPRLAND_PROTOCOLS_TAG HYPRLAND_QT_SUPPORT_TAG HYPRLAND_QTUTILS_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
|
||||
helper="$REPO_ROOT/dry-run-build.sh"
|
||||
if [[ ! -x "$helper" ]]; then
|
||||
echo "[ERROR] dry-run-build.sh not found or not executable at $helper" | tee -a "$SUMMARY_LOG"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user