AUR: xournalpp-git, qt-installer-framework, nordic-kde-git

This commit is contained in:
Daniel Langbein 2021-06-16 16:36:59 +02:00
parent 470fcfc2dd
commit 848892c72a
8 changed files with 29 additions and 6 deletions

9
.gitmodules vendored
View File

@ -1,3 +1,12 @@
[submodule "pkg/riseup-vpn"] [submodule "pkg/riseup-vpn"]
path = pkg/riseup-vpn path = pkg/riseup-vpn
url = https://aur.archlinux.org/riseup-vpn.git url = https://aur.archlinux.org/riseup-vpn.git
[submodule "pkg/nordic-kde-git"]
path = pkg/nordic-kde-git
url = https://aur.archlinux.org/nordic-kde-git.git
[submodule "pkg/qt-installer-framework"]
path = pkg/qt-installer-framework
url = https://aur.archlinux.org/qt-installer-framework.git
[submodule "pkg/xournalpp-git"]
path = pkg/xournalpp-git
url = https://aur.archlinux.org/xournalpp-git.git

View File

@ -5,7 +5,11 @@
There are several AUR packages added as submodules inside [pkg](pkg): There are several AUR packages added as submodules inside [pkg](pkg):
```shell ```shell
git submodule add "https://aur.archlinux.org/riseup-vpn.git" pkg/riseup-vpn AUR=(xournalpp-git qt-installer-framework riseup-vpn nordic-kde-git)
for pkg in "${AUR[@]}"; do
git submodule add "https://aur.archlinux.org/${pkg}.git" pkg/"${pkg}"
done
``` ```
To update all submodules, run To update all submodules, run

View File

@ -82,9 +82,13 @@ function main() {
done done
else else
# Stage1 # Stage1
build-and-push xorg-meta de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-sddm-autologin-placeholder de-p1st-sddm-autologin-yoda de-p1st-sddm-theme-default de-p1st-sddm-theme-nordic de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo de-p1st-ssh-key-placeholder de-p1st-ssh-key-yoda || return $? build-and-push xorg-meta de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-sddm-autologin-placeholder de-p1st-sddm-autologin-yoda de-p1st-sddm-theme-default de-p1st-sddm-theme-nordic de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo de-p1st-ssh-key-placeholder de-p1st-ssh-key-yoda \
xournalpp-git qt-installer-framework nordic-kde-git \
|| return $?
# Stage2 # Stage2
build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns de-p1st-ssh || return $? build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns de-p1st-ssh \
riseup-vpn \
|| return $?
# Stage3 # Stage3
build-and-push de-p1st-base || return $? build-and-push de-p1st-base || return $?
# Stage4 # Stage4

View File

@ -59,9 +59,13 @@ function main() {
fi fi
# Stage1 # Stage1
build-and-push xorg-meta de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-sddm-autologin-placeholder de-p1st-sddm-autologin-yoda de-p1st-sddm-theme-default de-p1st-sddm-theme-nordic de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo de-p1st-ssh-key-placeholder de-p1st-ssh-key-yoda || return $? build-and-push xorg-meta de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-sddm-autologin-placeholder de-p1st-sddm-autologin-yoda de-p1st-sddm-theme-default de-p1st-sddm-theme-nordic de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo de-p1st-ssh-key-placeholder de-p1st-ssh-key-yoda \
xournalpp-git qt-installer-framework nordic-kde-git \
|| return $?
# Stage2 # Stage2
build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns de-p1st-ssh || return $? build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns de-p1st-ssh \
riseup-vpn \
|| return $?
# Stage3 # Stage3
build-and-push de-p1st-base || return $? build-and-push de-p1st-base || return $?
# Stage4 # Stage4

View File

@ -12,7 +12,6 @@ license=('MIT')
depends=('sddm' 'sddm-nordic-theme-git') depends=('sddm' 'sddm-nordic-theme-git')
# Without plasma-framework the following error occurs: # Without plasma-framework the following error occurs:
# Main.qml:28:1: module "org.kde.plasma.extras" is not installed # Main.qml:28:1: module "org.kde.plasma.extras" is not installed
# TODO: is this reported upstream (on AUR?)
depends+=('plasma-framework') depends+=('plasma-framework')
depends+=('holo' 'git' 'base') depends+=('holo' 'git' 'base')
depends+=('de-p1st-wallpaper') depends+=('de-p1st-wallpaper')

1
pkg/nordic-kde-git Submodule

@ -0,0 +1 @@
Subproject commit dab91fe8c3cca06c128b8bec51ba499b46e40d9c

@ -0,0 +1 @@
Subproject commit 2dbc32d4b4bd1c88ce83b4cf783628f5373c8a3c

1
pkg/xournalpp-git Submodule

@ -0,0 +1 @@
Subproject commit 862ea08ac50c7ae6cb0eccb796af0bb9075238b0