Switch to stable hyprland related packages (#1080) (#1081)

arch-packages/illogical-impulse-hyprland/PKGBUILD

@@ -0,0 +1,18 @@
+pkgname=illogical-impulse-hyprland
+pkgver=1.0
+pkgrel=1
+pkgdesc='Illogical Impulse Hyprland relatated packages'
+arch=(any)
+license=(None)
+depends=(
+  hyprutils
+  hyprlang
+  hypridle
+  hyprland-qt-support
+  hyprland-qtutils
+  hyprlock
+  xdg-desktop-portal-hyprland
+  hyprcursor
+  hyprwayland-scanner
+  hyprland
+)

arch-packages/illogical-impulse-portal/PKGBUILD

@@ -1,12 +1,12 @@
 pkgname=illogical-impulse-portal
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Illogical Impulse XDG Desktop Portals'
 arch=(any)
 license=(None)
 depends=(
 	xdg-desktop-portal
 	xdg-desktop-portal-gtk
-	xdg-desktop-portal-hyprland-git
+	xdg-desktop-portal-hyprland
 )
 

arch-packages/illogical-impulse-widgets/PKGBUILD

@@ -1,19 +1,16 @@
 pkgname=illogical-impulse-widgets
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Illogical Impulse Widget Dependencies'
 arch=(any)
 license=(None)
 depends=(
 	dart-sass
-	python-pywayland
-	python-psutil
-	hypridle-git
- 	hyprutils-git
-	hyprlock-git
+	hypridle
+ 	hyprutils
+	hyprlock
 	wlogout
 	wl-clipboard
-	hyprpicker-git
+	hyprpicker
 	anyrun-git
 )
-

install.sh

@@ -81,24 +81,8 @@ if (( ${#pkglist[@]} != 0 )); then
 	fi
 fi
 
-# Convert old dependencies to non explicit dependencies so that they can be orphaned if not in meta packages
-set-explicit-to-implicit() {
-	remove_bashcomments_emptylines ./scriptdata/previous_dependencies.conf ./cache/old_deps_stripped.conf
-	readarray -t old_deps_list < ./cache/old_deps_stripped.conf
-	pacman -Qeq > ./cache/pacman_explicit_packages
-	readarray -t explicitly_installed < ./cache/pacman_explicit_packages
-
-	echo "Attempting to set previously explicitly installed deps as implicit..."
-	for i in "${explicitly_installed[@]}"; do for j in "${old_deps_list[@]}"; do
-		[ "$i" = "$j" ] && yay -D --asdeps "$i"
-	done; done
-
-	return 0
-}
-
-$ask && echo "Attempt to set previously explicitly installed deps as implicit? "
-$ask && showfun set-explicit-to-implicit
-v set-explicit-to-implicit
+showfun handle-deprecated-dependencies
+v handle-deprecated-dependencies
 
 # https://github.com/end-4/dots-hyprland/issues/581
 # yay -Bi is kinda hit or miss, instead cd into the relevant directory and manually source and install deps
@@ -118,11 +102,11 @@ install-local-pkgbuild() {
 # Install core dependencies from the meta-packages
 metapkgs=(./arch-packages/illogical-impulse-{audio,python,backlight,basic,fonts-themes,gnome,gtk,portal,screencapture,widgets})
 metapkgs+=(./arch-packages/illogical-impulse-ags)
+metapkgs+=(./arch-packages/illogical-impulse-hyprland)
 metapkgs+=(./arch-packages/illogical-impulse-microtex-git)
 metapkgs+=(./arch-packages/illogical-impulse-oneui4-icons-git)
 [[ -f /usr/share/icons/Bibata-Modern-Classic/index.theme ]] || \
   metapkgs+=(./arch-packages/illogical-impulse-bibata-modern-classic-bin)
-try sudo pacman -R illogical-impulse-{microtex,pymyc-aur}
 
 for i in "${metapkgs[@]}"; do
 	metainstallflags="--needed"
@@ -134,19 +118,6 @@ done
 showfun install-python-packages
 v install-python-packages
 
-# Why need cleanbuild? see https://github.com/end-4/dots-hyprland/issues/389#issuecomment-2040671585
-# Why install deps by running a seperate command? see pinned comment of https://aur.archlinux.org/packages/hyprland-git
-case $SKIP_HYPR_AUR in
-  true) sleep 0;;
-  *)
-	  hyprland_installflags="-S"
-	  $ask || hyprland_installflags="$hyprland_installflags --noconfirm"
-    v yay $hyprland_installflags --asdeps hyprutils-git hyprlang-git hyprcursor-git hyprwayland-scanner-git
-    v yay $hyprland_installflags --answerclean=a hyprland-git
-    ;;
-esac
-
-
 ## Optional dependencies
 if pacman -Qs ^plasma-browser-integration$ ;then SKIP_PLASMAINTG=true;fi
 case $SKIP_PLASMAINTG in

scriptdata/installers

@@ -135,3 +135,20 @@ install-python-packages (){
   x cd -
   x deactivate # We don't need the virtual environment anymore
 }
+
+handle-deprecated-dependencies (){
+  printf "\e[36m[$0]: Removing deprecated dependencies:\e[0m\n"
+  for i in illogical-impulse-{microtex,pymyc-aur} {hyprutils,hyprlang,hypridle,hyprland-qt-support,hyprland-qtutils,hyprlock,xdg-desktop-portal-hyprland,hyprcursor,hyprwayland-scanner,hyprland}-git;do try sudo pacman --noconfirm -Rdd $i;done
+# Convert old dependencies to non explicit dependencies so that they can be orphaned if not in meta packages
+	remove_bashcomments_emptylines ./scriptdata/previous_dependencies.conf ./cache/old_deps_stripped.conf
+	readarray -t old_deps_list < ./cache/old_deps_stripped.conf
+	pacman -Qeq > ./cache/pacman_explicit_packages
+	readarray -t explicitly_installed < ./cache/pacman_explicit_packages
+
+	echo "Attempting to set previously explicitly installed deps as implicit..."
+	for i in "${explicitly_installed[@]}"; do for j in "${old_deps_list[@]}"; do
+		[ "$i" = "$j" ] && yay -D --asdeps "$i"
+	done; done
+
+	return 0
+}

scriptdata/options

@@ -14,7 +14,6 @@ If no option is specified, run default install process.
   -c, --clean               Clean the build cache first
   -s, --skip-sysupdate      Skip \"sudo pacman -Syu\"
       --skip-hyprland       Skip installing the config for Hyprland
-      --skip-hypr-aur       Skip installing hyprland-git
       --skip-fish           Skip installing the config for Fish
       --skip-plasmaintg     Skip installing plasma-browser-integration
       --skip-miscconf       Skip copying the dirs and files to \".configs\" except for
@@ -32,7 +31,7 @@ cleancache(){
 # `man getopt` to see more
 para=$(getopt \
        -o hfk:cs \
-       -l help,force,fontset:,deplistfile:,clean,skip-sysupdate,skip-fish,skip-hyprland,skip-hypr-aur,skip-plasmaintg,skip-miscconf \
+       -l help,force,fontset:,deplistfile:,clean,skip-sysupdate,skip-fish,skip-hyprland,skip-plasmaintg,skip-miscconf \
        -n "$0" -- "$@")
 [ $? != 0 ] && echo "$0: Error when getopt, please recheck parameters." && exit 1
 #####################################################################################
@@ -60,7 +59,6 @@ while true ; do
     -f|--force) ask=false;shift;;
     -s|--skip-sysupdate) SKIP_SYSUPDATE=true;shift;;
     --skip-hyprland) SKIP_HYPRLAND=true;shift;;
-    --skip-hypr-aur) SKIP_HYPR_AUR=true;shift;;
     --skip-fish) SKIP_FISH=true;shift;;
     --skip-miscconf) SKIP_MISCCONF=true;shift;;
     --skip-plasmaintg) SKIP_PLASMAINTG=true;shift;;