main/postmarketos-ondev: upgrade to 0.3.2 (MR 1780)

The calamares module and branding was made distro-agnostic and moved to calamares-extensions.git. A new "make install" target inside postmarketos-ondev.git installs all files, so we need less logic in the APKBUILD. Lightdm is replaced with tinydm. Bring back the dependency on plasma-phone-components-vkbd-style, so we have a mobile keyboard instead of the default desktop keyboard. Add xset dependency to disable screen blanking.
temp/plasma-phone-components-vkbd-style: new aport (MR 1780)
2020-12-18 18:29:05 -08:00 · 2020-12-18 18:29:05 -08:00
2 changed files with 31 additions and 42 deletions
@@ -1,7 +1,7 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-ondev
-pkgver=0.2.1
-pkgrel=4
+pkgver=0.3.2
+pkgrel=0
 pkgdesc="Calamares based on-device installer"
 url="https://postmarketos.org"
 arch="all !armhf" # armhf: qt5-qtdeclarative
@@ -9,62 +9,31 @@ license="GPL-3.0-or-later"
 depends="
 	$pkgname-openrc
 	calamares
+	calamares-extensions-brand-default-mobile
+	calamares-extensions-mod-mobile
 	calamares-mod-mount
 	calamares-mod-shellprocess
 	calamares-mod-unpackfs
 	e2fsprogs
 	i3wm
 	kirigami2
-	lightdm
-	lightdm-openrc
 	mesa-egl
+	plasma-phone-components-vkbd-style
 	qt5-qtvirtualkeyboard
 	qtvirtualkeyboard-plasma
+	tinydm
+	tinydm-openrc
 	unclutter-xfixes
 	xorg-server
-"
-makedepends="
-	calamares-dev
-	qt5-qtquickcontrols2-dev
-	qt5-qtsvg-dev
+	xset
 "
 subpackages="$pkgname-openrc"
 install="$pkgname.post-install"
-source="https://gitlab.com/postmarketOS/postmarketos-ondev/-/archive/$pkgver/postmarketos-ondev-$pkgver.tar.bz2
-	postmarketos-ondev.initd
-	"
+source="https://gitlab.com/postmarketOS/postmarketos-ondev/-/archive/$pkgver/postmarketos-ondev-$pkgver.tar.bz2"
 options="!check"  # has no tests

-build() {
-	cd calamares
-	cmake -B build \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=None
-	make -C build
-}
-
 package() {
-	# Calamares modules (don't conflict with official modules)
-	make -C calamares/build DESTDIR="$pkgdir" install
-	mv "$pkgdir/usr/lib/calamares/modules" \
-		"$pkgdir/usr/lib/calamares/modules-pmos"
-
-	# Calamares configs
-	mkdir -p "$pkgdir/etc"
-	cp -r "$builddir/calamares/config/" "$pkgdir/etc/calamares"
-
-	# Scripts
-	install -Dm755 "$builddir/ondev-prepare.sh" \
-		"$pkgdir/usr/bin/ondev-prepare"
-	install -Dm755 "$builddir/ondev-boot.sh" \
-		"$pkgdir/usr/bin/ondev-boot"
-
-	# OpenRC
-	install -Dm755 "$srcdir/postmarketos-ondev.initd" \
-		"$pkgdir/etc/init.d/postmarketos-ondev"
+	make DESTDIR="$pkgdir" install
 }

-sha512sums="5838b8b592918818ed40dc6c2364a1f233f31b14c0283ac1dffd0e01b6bddf0462424a233d060f8740e0d393fe0f907fb8f33386e0ae633218c49db18c136310  postmarketos-ondev-0.2.1.tar.bz2
-eff2c9f4ddcc7d22d8afd4c5d1cac92f6e6e9fef7713af2370dae715819ca2aba2d33b1cd0ea0478526c503dfc6948fee2242b6d804f8e9dcd6ef5cf1500fc7f  postmarketos-ondev.initd"
+sha512sums="e90a0db3f0c9535a107cf0331754c9704d0d2208a36faac311a03705bd7577bff82397a5f77346e2d58651efa0de14419368fb9379ea34213122bf9f21866bfe  postmarketos-ondev-0.3.2.tar.bz2"
@@ -0,0 +1,20 @@
+# postmarketos-ondev currently depends on this
+pkgname=plasma-phone-components-vkbd-style
+pkgver=5.19.5
+pkgrel=0
+pkgdesc="Legacy virtual keyboard style (dropped in 5.19.99)"
+arch="noarch"
+url="https://www.plasma-mobile.org/"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
+source="https://invent.kde.org/plasma/plasma-phone-components/-/archive/v$pkgver/plasma-phone-components-v$pkgver.tar.bz2"
+options="!check pmb:cross-native"
+builddir="$srcdir/plasma-phone-components-v$pkgver/qtvirtualkeyboardplugin"
+
+package() {
+	for i in style.qml images/*.svg; do
+		install -v -Dm644 "$i" \
+			"$pkgdir/usr/lib/qt5/qml/QtQuick/VirtualKeyboard/Styles/Plasma/$i"
+	done
+}
+
+sha512sums="d1d8705a7065bf198982432564180bf8765def2866759d83b1161d65d1f1d85ab16860f552d75138cd4c962aa46b4a925a8b6256d884bc393062bd6f564ff51d  plasma-phone-components-v5.19.5.tar.bz2"