From 6e43496ecd4c95ea0d25e05870cecb8a3cb1dbde Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sat, 7 Oct 2023 03:23:59 -0500 Subject: user/horizon: Update to 0.9.8_pre7 * Set cap_sys_time on horizon-qt5 to allow setting the clock. (adelie/horizon#321) * Move gfxdetect to graphical runlevel. (adelie/horizon#346) --- user/horizon/APKBUILD | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/user/horizon/APKBUILD b/user/horizon/APKBUILD index 92ec869e5..796a9c86c 100644 --- a/user/horizon/APKBUILD +++ b/user/horizon/APKBUILD @@ -1,12 +1,12 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=horizon -pkgver=0.9.7 +pkgver=0.9.8_pre7 pkgrel=0 pkgdesc="Installation tools for Adélie Linux" url="https://horizon.adelielinux.org/" arch="all" -options="!archcheck !check" # Unpackaged dependency ruby-aruba. +options="!archcheck !check suid" # Unpackaged dependency ruby-aruba. license="AGPL-3.0+" depends="" checkdepends="ruby-aruba ruby-rspec valgrind" @@ -14,7 +14,7 @@ checkdepends="ruby-aruba ruby-rspec valgrind" makedepends="bcnm-dev boost-dev cmake curl-dev eudev-dev libarchive-dev linux-headers parted-dev skalibs-dev util-linux-dev - libcap-dev libx11-dev libxkbfile-dev qt5-qtbase-dev" + libcap libcap-dev libx11-dev libxkbfile-dev qt5-qtbase-dev" subpackages="$pkgname-image $pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-qt5 $pkgname-tools $pkgname-wizard $pkgname-boot" source="https://distfiles.adelielinux.org/source/horizon-$pkgver.tar.xz" @@ -61,7 +61,7 @@ package() { image() { pkgdesc="Tools for generating images using HorizonScript" - depends="dracut mtools" + depends="dracut mtools squashfs-tools xorriso" mkdir -p "$subpkgdir"/usr/bin mkdir -p "$subpkgdir"/usr/lib mkdir -p "$subpkgdir"/usr/share/horizon @@ -81,6 +81,10 @@ qt5() { for _bin in horizon-ppc64-detect horizon-qt5 horizon-run-qt5; do mv "$pkgdir"/usr/bin/$_bin "$subpkgdir"/usr/bin/ done + + chmod 4755 "$subpkgdir"/usr/bin/horizon-run-qt5 + chmod 1777 "$subpkgdir"/etc/horizon + /usr/sbin/setcap cap_sys_time+ep "$subpkgdir"/usr/bin/horizon-qt5 } tools() { @@ -103,12 +107,12 @@ wizard() { boot() { pkgdesc="Boot to Horizon" - depends="horizon-qt5 horizon kwin qt5ct sddm + depends="horizon-qt5 horizon kwin papirus-icons qt5ct sddm netsurf partitionmanager xterm" mkdir -p "$subpkgdir"/etc/init.d mkdir -p "$subpkgdir"/etc/profile.d - mkdir -p "$subpkgdir"/etc/runlevels/default + mkdir -p "$subpkgdir"/etc/runlevels/graphical mkdir -p "$subpkgdir"/etc/sddm.conf.d mkdir -p "$subpkgdir"/etc/xdg/qt5ct mkdir -p "$subpkgdir"/usr/bin @@ -124,7 +128,7 @@ PROFILE cat >"$subpkgdir"/etc/xdg/kdeglobals <