experimental/horizon: Bump to 0.9.1

2 files changed, 9 insertions, 70 deletions

diff --git a/experimental/horizon/APKBUILD b/experimental/horizon/APKBUILD
index 9c1d39ee7..7f8c04e21 100644
--- a/experimental/horizon/APKBUILD
+++ b/experimental/horizon/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=horizon
-pkgver=0.9.0
+pkgver=0.9.1
 pkgrel=0
 pkgdesc="Installation tools for Adélie Linux"
 url="https://horizon.adelielinux.org/"
 arch="all"
-options="!check"  # Unpackaged dependency ruby-aruba.
+options="!archcheck !check"  # Unpackaged dependency ruby-aruba.
 license="AGPL-3.0+"
 depends=""
 checkdepends="ruby-aruba ruby-rspec valgrind"
@@ -15,11 +15,9 @@ 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"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-image $pkgname-qt5
+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
-	noninstall-mount.patch
-	"
+source="https://distfiles.adelielinux.org/source/horizon-$pkgver.tar.xz"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
@@ -61,15 +59,19 @@ package() {
 
 image() {
 	pkgdesc="Tools for generating images using HorizonScript"
+	depends="mtools"
 	mkdir -p "$subpkgdir"/usr/bin
 	mkdir -p "$subpkgdir"/usr/lib
+	mkdir -p "$subpkgdir"/usr/share/horizon
 
 	mv "$pkgdir"/usr/bin/hscript-image "$subpkgdir"/usr/bin/
 	mv "$pkgdir"/usr/lib/libhi-backends.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/share/horizon/iso "$subpkgdir"/usr/share/horizon/
 }
 
 qt5() {
 	pkgdesc="Qt 5 installation wizard for Adélie Linux"
+	depends="horizon"
 	mkdir -p "$subpkgdir"/usr/bin
 
 	for _bin in horizon-ppc64-detect horizon-qt5 horizon-run-qt5; do
@@ -90,11 +92,9 @@ wizard() {
 	pkgdesc="Wizard to generate a HorizonScript for another computer"
 
 	make DESTDIR="$subpkgdir" -C "$builddir"/build-wizard install
-	rm "$subpkgdir"/usr/bin/hscript-printowner
 	rm -r "$subpkgdir"/usr/include
 	rm -r "$subpkgdir"/usr/lib
 	rm -r "$subpkgdir"/usr/share
 }
 
-sha512sums="a2185744b611154f41ba433399f621c8114147bc981dad03fac581bf7ddd67c46042bc230fd68d4c89188cefa281022d101d7394cf1a0554729da540706e6216  horizon-0.9.0.tar.xz
-44a4f022df03a3ac3ec9fe3aea9faa8d98ed6c9b61ff50e3c363f5691a2ed428d328f6d5aa019f25be67811dede8da7195eaf354f1cd3a4a56c77f698d53e7fb  noninstall-mount.patch"
+sha512sums="fe8f58a232b7e577aeba62cecfd97bec4037d41dd179781af912c9974210ce4648b0c56bd84fbf78866698e91882b8f4b7168c22842bde1682ea118ca931832f  horizon-0.9.1.tar.xz"
diff --git a/experimental/horizon/noninstall-mount.patch b/experimental/horizon/noninstall-mount.patch
deleted file mode 100644
index 2b0e7152a..000000000
--- a/experimental/horizon/noninstall-mount.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc
-index 143ae43..556a6f3 100644
---- a/ui/qt5/horizonwizard.cc
-+++ b/ui/qt5/horizonwizard.cc
-@@ -542,7 +542,9 @@ QString HorizonWizard::toHScript() {
-         break;
-     }
- 
-+#ifdef HAS_INSTALL_ENV
-     part_lines << (dynamic_cast<PartitionMountPage *>(page(Page_PartitionMount)))->mountLines();
-+#endif  /* HAS_INSTALL_ENV */
- 
-     if(chosen_disk.empty()) {
-         lines << part_lines;
-diff --git a/ui/qt5/mountdialog.cc b/ui/qt5/mountdialog.cc
-index f986423..103e442 100644
---- a/ui/qt5/mountdialog.cc
-+++ b/ui/qt5/mountdialog.cc
-@@ -16,6 +16,7 @@
- #include <QLabel>
- #include <QLineEdit>
- #include <QPushButton>
-+#include <QSet>
- #include <QVBoxLayout>
- 
- MountDialog::MountDialog(QStringList skipParts, QStringList skipMounts,
-@@ -75,7 +76,11 @@ MountDialog::MountDialog(QStringList skipParts, QStringList skipMounts,
- 
-     QVBoxLayout *controlLayout = new QVBoxLayout;
-     controlLayout->addWidget(new QLabel(tr("Partition")));
-+#ifdef HAS_INSTALL_ENV
-     controlLayout->addWidget(partList);
-+#else  /* !HAS_INSTALL_ENV */
-+    controlLayout->addWidget(partInput);
-+#endif  /* HAS_INSTALL_ENV */
-     controlLayout->addWidget(new QLabel(tr("will be mounted on")));
-     controlLayout->addWidget(pathInput);
- 
-@@ -87,14 +92,22 @@ MountDialog::MountDialog(QStringList skipParts, QStringList skipMounts,
- }
- 
- QString MountDialog::partition() const {
-+#ifdef HAS_INSTALL_ENV
-     assert(partList->currentItem() != nullptr);
-     return partList->currentItem()->text();
-+#else  /* !HAS_INSTALL_ENV */
-+    return partInput->text();
-+#endif  /* HAS_INSTALL_ENV */
- }
- 
- void MountDialog::setPartition(const QString &part) {
-+#ifdef HAS_INSTALL_ENV
-     QList<QListWidgetItem *> candidate = partList->findItems(part, Qt::MatchExactly);
-     if(candidate.empty()) return;
-     partList->setCurrentItem(candidate.at(0));
-+#else  /* !HAS_INSTALL_ENV */
-+    partInput->setText(part);
-+#endif  /* HAS_INSTALL_ENV */
- }
- 
- QString MountDialog::mountPoint() const {