From 70ff862f2ade14c3df9dd92b02226af3d9446de9 Mon Sep 17 00:00:00 2001 From: Makrennel Date: Sat, 1 Jun 2024 18:10:42 +0100 Subject: [PATCH] Switch to using meta packages for dep installation --- .../illogical-impulse-audio/PKGBUILD | 14 ++++++++++ .../illogical-impulse-backlight/PKGBUILD | 11 ++++++++ .../illogical-impulse-basic/PKGBUILD | 25 ++++++++++++++++++ .../illogical-impulse-fonts-themes/PKGBUILD | 20 ++++++++++++++ .../illogical-impulse-gnome/PKGBUILD | 15 +++++++++++ arch-packages/illogical-impulse-gtk/PKGBUILD | 18 +++++++++++++ .../illogical-impulse-microtex/PKGBUILD | 13 ++++++++++ .../illogical-impulse-portal/PKGBUILD | 12 +++++++++ .../illogical-impulse-pymyc-aur/PKGBUILD | 13 ++++++++++ .../illogical-impulse-python/PKGBUILD | 15 +++++++++++ .../illogical-impulse-screencapture/PKGBUILD | 15 +++++++++++ .../illogical-impulse-widgets/PKGBUILD | 18 +++++++++++++ install.sh | 26 ++++++++++++++----- 13 files changed, 209 insertions(+), 6 deletions(-) create mode 100644 arch-packages/illogical-impulse-audio/PKGBUILD create mode 100644 arch-packages/illogical-impulse-backlight/PKGBUILD create mode 100644 arch-packages/illogical-impulse-basic/PKGBUILD create mode 100644 arch-packages/illogical-impulse-fonts-themes/PKGBUILD create mode 100644 arch-packages/illogical-impulse-gnome/PKGBUILD create mode 100644 arch-packages/illogical-impulse-gtk/PKGBUILD create mode 100644 arch-packages/illogical-impulse-microtex/PKGBUILD create mode 100644 arch-packages/illogical-impulse-portal/PKGBUILD create mode 100644 arch-packages/illogical-impulse-pymyc-aur/PKGBUILD create mode 100644 arch-packages/illogical-impulse-python/PKGBUILD create mode 100644 arch-packages/illogical-impulse-screencapture/PKGBUILD create mode 100644 arch-packages/illogical-impulse-widgets/PKGBUILD diff --git a/arch-packages/illogical-impulse-audio/PKGBUILD b/arch-packages/illogical-impulse-audio/PKGBUILD new file mode 100644 index 00000000..d2d1e788 --- /dev/null +++ b/arch-packages/illogical-impulse-audio/PKGBUILD @@ -0,0 +1,14 @@ +pkgname=illogical-impulse-audio +pkgver=1.0 +pkgrel=1 +pkgdesc='Illogical Impulse Audio Dependencies' +arch=(any) +license=(None) +depends=( + pavucontrol + wireplumber + libdbusmenu-gtk3 + playerctl + swww +) + diff --git a/arch-packages/illogical-impulse-backlight/PKGBUILD b/arch-packages/illogical-impulse-backlight/PKGBUILD new file mode 100644 index 00000000..fe216262 --- /dev/null +++ b/arch-packages/illogical-impulse-backlight/PKGBUILD @@ -0,0 +1,11 @@ +pkgname=illogical-impulse-backlight +pkgver=1.0 +pkgrel=1 +pkgdesc='Illogical Impulse Backlight Dependencies' +arch=(any) +license=(None) +depends=( + brightnessctl + ddcutil +) + diff --git a/arch-packages/illogical-impulse-basic/PKGBUILD b/arch-packages/illogical-impulse-basic/PKGBUILD new file mode 100644 index 00000000..5027f7c3 --- /dev/null +++ b/arch-packages/illogical-impulse-basic/PKGBUILD @@ -0,0 +1,25 @@ +pkgname=illogical-impulse-basic +pkgver=1.0 +pkgrel=1 +pkgdesc='Illogical Impulse Basic Dependencies' +arch=(any) +license=(None) +depends=( + axel + bc + coreutils + cliphist + cmake + curl + fuzzel + rsync + wget + ripgrep + gojq + npm + meson + typescript + gjs + xdg-user-dirs +) + diff --git a/arch-packages/illogical-impulse-fonts-themes/PKGBUILD b/arch-packages/illogical-impulse-fonts-themes/PKGBUILD new file mode 100644 index 00000000..2cdffdd9 --- /dev/null +++ b/arch-packages/illogical-impulse-fonts-themes/PKGBUILD @@ -0,0 +1,20 @@ +pkgname=illogical-impulse-fonts-themes +pkgver=1.0 +pkgrel=1 +pkgdesc='Illogical Impulse Fonts and Theming Dependencies' +arch=(any) +license=(None) +depends=( + adw-gtk3-git + qt5ct + qt5-wayland + fontconfig + ttf-readex-pro + ttf-jetbrains-mono-nerd + ttf-material-symbols-variable-git + ttf-space-mono-nerd + fish + foot + starship +) + diff --git a/arch-packages/illogical-impulse-gnome/PKGBUILD b/arch-packages/illogical-impulse-gnome/PKGBUILD new file mode 100644 index 00000000..a2839f15 --- /dev/null +++ b/arch-packages/illogical-impulse-gnome/PKGBUILD @@ -0,0 +1,15 @@ +pkgname=illogical-impulse-gnome +pkgver=1.0 +pkgrel=1 +pkgdesc='Illogical Impulse GNOME Dependencies' +arch=(any) +license=(None) +depends=( + polkit-gnome + gnome-keyring + gnome-control-center + blueberry networkmanager + gammastep + gnome-bluetooth-3.0 +) + diff --git a/arch-packages/illogical-impulse-gtk/PKGBUILD b/arch-packages/illogical-impulse-gtk/PKGBUILD new file mode 100644 index 00000000..50a57d1c --- /dev/null +++ b/arch-packages/illogical-impulse-gtk/PKGBUILD @@ -0,0 +1,18 @@ +pkgname=illogical-impulse-gtk +pkgver=1.0 +pkgrel=1 +pkgdesc='Illogical Impulse GTK Dependencies' +arch=(any) +license=(None) +depends=( + webp-pixbuf-loader + gtk-layer-shell + gtk3 + gtksourceview3 + gobject-introspection + upower + yad + ydotool + xdg-user-dirs-gtk +) + diff --git a/arch-packages/illogical-impulse-microtex/PKGBUILD b/arch-packages/illogical-impulse-microtex/PKGBUILD new file mode 100644 index 00000000..90ceca2b --- /dev/null +++ b/arch-packages/illogical-impulse-microtex/PKGBUILD @@ -0,0 +1,13 @@ +pkgname=illogical-impulse-microtex +pkgver=1.0 +pkgrel=1 +pkgdesc='Illogical Impulse MicroTeX Dependencies' +arch=(any) +license=(None) +depends=( + tinyxml2 + gtkmm3 + gtksourceviewmm + cairomm +) + diff --git a/arch-packages/illogical-impulse-portal/PKGBUILD b/arch-packages/illogical-impulse-portal/PKGBUILD new file mode 100644 index 00000000..69c94c96 --- /dev/null +++ b/arch-packages/illogical-impulse-portal/PKGBUILD @@ -0,0 +1,12 @@ +pkgname=illogical-impulse-portal +pkgver=1.0 +pkgrel=1 +pkgdesc='Illogical Impulse XDG Desktop Portals' +arch=(any) +license=(None) +depends=( + xdg-desktop-portal + xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland-git +) + diff --git a/arch-packages/illogical-impulse-pymyc-aur/PKGBUILD b/arch-packages/illogical-impulse-pymyc-aur/PKGBUILD new file mode 100644 index 00000000..969ea5fa --- /dev/null +++ b/arch-packages/illogical-impulse-pymyc-aur/PKGBUILD @@ -0,0 +1,13 @@ +pkgname=illogical-impulse-pymyc-aur +pkgver=1.0 +pkgrel=1 +pkgdesc='Illogical Impulse PyMYC Dependencies' +arch=(any) +license=(None) +depends=( + python-materialyoucolor-git + gradience-git + python-libsass + python-material-color-utilities +) + diff --git a/arch-packages/illogical-impulse-python/PKGBUILD b/arch-packages/illogical-impulse-python/PKGBUILD new file mode 100644 index 00000000..d8ddd373 --- /dev/null +++ b/arch-packages/illogical-impulse-python/PKGBUILD @@ -0,0 +1,15 @@ +pkgname=illogical-impulse-python +pkgver=1.0 +pkgrel=1 +pkgdesc='Illogical Impulse Python Dependencies' +arch=(any) +license=(None) +# Add `python-setuptools-scm` and `python-wheel` explicitly to fix #197 +depends=( + python-build + python-pillow + python-pywal + python-setuptools-scm + python-wheel +) + diff --git a/arch-packages/illogical-impulse-screencapture/PKGBUILD b/arch-packages/illogical-impulse-screencapture/PKGBUILD new file mode 100644 index 00000000..ab5911fb --- /dev/null +++ b/arch-packages/illogical-impulse-screencapture/PKGBUILD @@ -0,0 +1,15 @@ +pkgname=illogical-impulse-screencapture +pkgver=1.0 +pkgrel=1 +pkgdesc='Illogical Impulse Screenshot and Recording Dependencies' +arch=(any) +license=(None) +depends=( + swappy + wf-recorder + grim + tesseract + tesseract-data-eng + slurp +) + diff --git a/arch-packages/illogical-impulse-widgets/PKGBUILD b/arch-packages/illogical-impulse-widgets/PKGBUILD new file mode 100644 index 00000000..5ae72378 --- /dev/null +++ b/arch-packages/illogical-impulse-widgets/PKGBUILD @@ -0,0 +1,18 @@ +pkgname=illogical-impulse-widgets +pkgver=1.0 +pkgrel=1 +pkgdesc='Illogical Impulse Widget Dependencies' +arch=(any) +license=(None) +depends=( + dart-sass + python-pywayland + python-psutil + hypridle-git + hyprlock-git + wlogout + wl-clipboard + hyprpicker-git + anyrun-git +) + diff --git a/install.sh b/install.sh index b01b567e..2f3f0f39 100755 --- a/install.sh +++ b/install.sh @@ -81,12 +81,21 @@ if ! command -v yay >/dev/null 2>&1;then else AUR_HELPER=yay fi +#if $ask;then +# # execute per element of the array $pkglist +# for i in "${pkglist[@]}";do v $AUR_HELPER -S --needed $i;done +#else +# # execute for all elements of the array $pkglist in one line +# v $AUR_HELPER -S --needed --noconfirm ${pkglist[*]} +#fi + +metapkgs=(arch-packages/illogical-impulse-{audio,backlight,basic,fonts-themes,gnome,gtk,microtex,portal,python,screencapture,widgets}) if $ask;then - # execute per element of the array $pkglist - for i in "${pkglist[@]}";do v $AUR_HELPER -S --needed $i;done + # execute for every meta package + for i in "${metapkgs[@]}";do v $AUR_HELPER -Bi --needed --answerclean=n $i;done else - # execute for all elements of the array $pkglist in one line - v $AUR_HELPER -S --needed --noconfirm ${pkglist[*]} + # execute for all meta packages at once + v $AUR_HELPER -Bi --needed --answerclean=n --noconfirm ${metapkgs[@]} fi @@ -110,9 +119,14 @@ case $SKIP_PYMYC_AUR in true) sleep 0;; *) if $ask;then - v $AUR_HELPER -S --answerclean=a ${pymyc[@]} + # Yay is bugged and destroys the PKGBUILD if you specify to cleanBuild with the -Bi flag, so we install the deps manually + v \ + $AUR_HELPER -S --answerclean=a --asdeps ${pymyc[@]} && \ + pushd arch-packages/illogical-impulse-pymyc-aur & makepkg -si & popd else - v $AUR_HELPER -S --answerclean=a --noconfirm ${pymyc[@]} + v \ + $AUR_HELPER -S --answerclean=a --asdeps --noconfirm ${pymyc[@]} && \ + pushd arch-packages/illogical-impulse-pymyc-aur & makepkg -si --noconfirm & popd fi ;; esac