From 6f7d579334d6ef02a463c77d612d8ed8e0fe5160 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Fri, 12 Jun 2020 22:13:15 +0000 Subject: user/horizon: Bump to 0.9.2, add -boot subpackage --- user/horizon/APKBUILD | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/user/horizon/APKBUILD b/user/horizon/APKBUILD index 4d035e184..6c3278bc1 100644 --- a/user/horizon/APKBUILD +++ b/user/horizon/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=horizon -pkgver=0.9.1 -pkgrel=1 +pkgver=0.9.2 +pkgrel=0 pkgdesc="Installation tools for Adélie Linux" url="https://horizon.adelielinux.org/" arch="all" @@ -16,10 +16,8 @@ makedepends="bcnm-dev boost-dev cmake curl-dev eudev-dev libarchive-dev libcap-dev libx11-dev libxkbfile-dev qt5-qtbase-dev" subpackages="$pkgname-image $pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-qt5 - $pkgname-tools $pkgname-wizard" -source="https://distfiles.adelielinux.org/source/horizon-$pkgver.tar.xz - fix-qt-runner.patch - " + $pkgname-tools $pkgname-wizard $pkgname-boot" +source="https://distfiles.adelielinux.org/source/horizon-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -74,7 +72,9 @@ image() { qt5() { pkgdesc="Qt 5 installation wizard for Adélie Linux" depends="horizon" + mkdir -p "$subpkgdir"/etc/horizon mkdir -p "$subpkgdir"/usr/bin + mkdir -p "$subpkgdir"/var/log/horizon for _bin in horizon-ppc64-detect horizon-qt5 horizon-run-qt5; do mv "$pkgdir"/usr/bin/$_bin "$subpkgdir"/usr/bin/ @@ -99,5 +99,38 @@ wizard() { rm -r "$subpkgdir"/usr/share } -sha512sums="fe8f58a232b7e577aeba62cecfd97bec4037d41dd179781af912c9974210ce4648b0c56bd84fbf78866698e91882b8f4b7168c22842bde1682ea118ca931832f horizon-0.9.1.tar.xz -78d1a1bca7d12a189d506e1fcc42ea0ab968ed3cb9ada7e95fab6256ea2e0cb820d9b41cdd858e22da37a63f899918fe40c00bcd2d67dea81e3a9ce30570ad46 fix-qt-runner.patch" +boot() { + pkgdesc="Boot to Horizon" + depends="horizon-qt5 horizon kwin qt5ct sddm + netsurf partitionmanager xterm" + + mkdir -p "$subpkgdir"/etc/profile.d + mkdir -p "$subpkgdir"/etc/sddm.conf.d + mkdir -p "$subpkgdir"/etc/xdg/qt5ct + mkdir -p "$subpkgdir"/usr/bin + mkdir -p "$subpkgdir"/usr/share/qt5ct/qss + mkdir -p "$subpkgdir"/usr/share/xsessions + + cat >"$subpkgdir"/etc/profile.d/horizon-qt5.sh <