diff --git a/.gitmodules b/.gitmodules index c4d281f..49689e1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "pkg/xournalpp-git"] path = pkg/xournalpp-git url = https://aur.archlinux.org/xournalpp-git.git +[submodule "pkg/xorg-meta"] + path = pkg/xorg-meta + url = https://aur.archlinux.org/xorg-meta.git diff --git a/README.md b/README.md index 4631c95..37d6246 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ There are several AUR packages added as submodules inside [pkg](pkg): ```shell -AUR=(xournalpp-git qt-installer-framework riseup-vpn nordic-kde-git) +AUR=(xorg-meta 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}" diff --git a/build-pkg/build-all-without-docker.sh b/build-pkg/build-all-without-docker.sh index 8857cc4..bbe91f3 100755 --- a/build-pkg/build-all-without-docker.sh +++ b/build-pkg/build-all-without-docker.sh @@ -83,7 +83,7 @@ function main() { else # 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 \ - xournalpp-git qt-installer-framework nordic-kde-git \ + xorg-meta xournalpp-git qt-installer-framework nordic-kde-git \ || return $? # Stage2 build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns de-p1st-ssh \ diff --git a/build-pkg/build-all.sh b/build-pkg/build-all.sh index 6137c3c..17e22a8 100755 --- a/build-pkg/build-all.sh +++ b/build-pkg/build-all.sh @@ -60,7 +60,7 @@ function main() { # 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 \ - xournalpp-git qt-installer-framework nordic-kde-git \ + xorg-meta xournalpp-git qt-installer-framework nordic-kde-git \ || return $? # Stage2 build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns de-p1st-ssh \ diff --git a/pkg/xorg-meta b/pkg/xorg-meta new file mode 160000 index 0000000..7070dad --- /dev/null +++ b/pkg/xorg-meta @@ -0,0 +1 @@ +Subproject commit 7070dad48c329a26b59c0ab4603ae4969b3eebea diff --git a/pkg/xorg-meta/PKGBUILD b/pkg/xorg-meta/PKGBUILD deleted file mode 100644 index 3f55189..0000000 --- a/pkg/xorg-meta/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Maintainer: Daniel Langbein < daniel [ at ] systemli [ dot ] org > -pkgname="xorg-meta" -pkgver=0.0.1 -pkgrel=1 -pkgdesc="Meta package for installing the xorg group" -arch=('any') -license=('MIT') - -depends=() -# xorg group -# pacman -Sg xorg | sed 's|^xorg |depends+=(|; s|$|)|' -depends+=(xf86-video-vesa) -depends+=(xorg-bdftopcf) -depends+=(xorg-docs) -depends+=(xorg-font-util) -depends+=(xorg-fonts-100dpi) -depends+=(xorg-fonts-75dpi) -depends+=(xorg-fonts-encodings) -depends+=(xorg-iceauth) -depends+=(xorg-mkfontscale) -depends+=(xorg-server) -depends+=(xorg-server-common) -depends+=(xorg-server-devel) -depends+=(xorg-server-xephyr) -depends+=(xorg-server-xnest) -depends+=(xorg-server-xvfb) -depends+=(xorg-sessreg) -depends+=(xorg-setxkbmap) -depends+=(xorg-smproxy) -depends+=(xorg-x11perf) -depends+=(xorg-xauth) -depends+=(xorg-xbacklight) -depends+=(xorg-xcmsdb) -depends+=(xorg-xcursorgen) -depends+=(xorg-xdpyinfo) -depends+=(xorg-xdriinfo) -depends+=(xorg-xev) -depends+=(xorg-xgamma) -depends+=(xorg-xhost) -depends+=(xorg-xinput) -depends+=(xorg-xkbcomp) -depends+=(xorg-xkbevd) -depends+=(xorg-xkbutils) -depends+=(xorg-xkill) -depends+=(xorg-xlsatoms) -depends+=(xorg-xlsclients) -depends+=(xorg-xmodmap) -depends+=(xorg-xpr) -depends+=(xorg-xprop) -depends+=(xorg-xrandr) -depends+=(xorg-xrdb) -depends+=(xorg-xrefresh) -depends+=(xorg-xset) -depends+=(xorg-xsetroot) -depends+=(xorg-xvinfo) -depends+=(xorg-xwayland) -depends+=(xorg-xwd) -depends+=(xorg-xwininfo) -depends+=(xorg-xwud)