main/postmarketos-ui-hildon: fix launch (!439)

[ci:skip-build]: already built successfully in CI

maemo/hildon-desktop/APKBUILD

@@ -1,10 +1,11 @@
+# Contributor: NotKit
 pkgname=hildon-desktop
 pkgver=2.2.157.11
-pkgrel=0
+pkgrel=1
 pkgdesc="Hildon desktop for Fremantle"
 arch="all"
 url="https://github.com/maemo-leste/hildon-desktop"
-license="GPL"
+license="GPL-2.0-or-later"
 depends="libhildon libmatchbox2 libhildondesktop clutter gnome-menus profiled"
 makedepends="
 	autoconf
@@ -14,27 +15,21 @@ makedepends="
 	libmatchbox2-dev
 	mce-headers
 	profiled-dev"
-source="
-	$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/hildon-desktop/archive/$pkgver.tar.gz
-"
-
-builddir="$srcdir/hildon-desktop-$pkgver"
-
-prepare() {
-	default_prepare
-	cd "$builddir"
-	sed -i -e 's/g_return_if_fail (!render_manager->priv->zoomed);//g' src/home/hd-render-manager.c
-}
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/hildon-desktop/archive/$pkgver.tar.gz
+	build-fix.patch"
 
 build() {
-	cd "$builddir"
 	./autogen.sh
 	./configure --prefix=/usr --sysconfdir=/etc
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir/" install
+
+	# Once dsmetool is packaged, we should use this rather than our own launch script
+	# install -Dm644 "$builddir"/debian/hildon-desktop.xsession \
+	#	"$pkgdir"/usr/bin/hildon-desktop
 }
-sha512sums="4084f535b366283d2d7d1a2ca546a925c50506a97270c0bfbb9358f859a4e175d9fbd530ffa9e3251afe372c58352d91d4d707c9190b19b114f655f35ea16f58  hildon-desktop-2.2.157.11.tar.gz"
+sha512sums="4084f535b366283d2d7d1a2ca546a925c50506a97270c0bfbb9358f859a4e175d9fbd530ffa9e3251afe372c58352d91d4d707c9190b19b114f655f35ea16f58  hildon-desktop-2.2.157.11.tar.gz
+f9f7ae9c4b175bb40d9f76a6716afdf3e77630bedee727b09b442b723a90f0dfa125937c483e75024343ae55eb60e5d824bc8bf3ce554c071cca9d88b9af2594  build-fix.patch"

maemo/hildon-desktop/build-fix.patch

@@ -0,0 +1,16 @@
+hd-render-manager.c:3414:46: error: 'HdRenderManagerPrivate' {aka 'struct _HdRenderManagerPrivate'} has no member named 'zoomed'; did you mean 'home'?
+     g_return_if_fail (!render_manager->priv->zoomed);
+                                              ^~~~~~
+--
+diff --git a/src/home/hd-render-manager.c b/src/home/hd-render-manager.c
+index b3a2943..8c1ceca 100644
+--- a/src/home/hd-render-manager.c
++++ b/src/home/hd-render-manager.c
+@@ -3411,7 +3411,6 @@ hd_render_manager_press_effect (void)
+     HdRenderManagerPrivate *priv = render_manager->priv;
+ 
+     g_return_if_fail (render_manager != NULL);
+-    g_return_if_fail (!render_manager->priv->zoomed);
+ 
+     if (!priv->press_effect)  
+     {

main/postmarketos-ui-hildon/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=postmarketos-ui-hildon
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="(X11) Lightweight GTK+2 UI (optimized for single-touch touchscreens)"
 url="https://postmarketos.org"
 arch="noarch"
@@ -19,11 +19,11 @@ package() {
 		"$pkgdir"/usr/share/xsessions/hildon.desktop
 
 	install -Dm755 "$srcdir"/xinitrc_hildon.sh \
-		"$pkgdir"/etc/postmarketos-ui/xinitrc_hildon.sh
+		"$pkgdir"/usr/bin/xinitrc_hildon
 
 	install -Dm644 "$srcdir"/60-lightdm-autologin.conf \
 		"$pkgdir"/usr/share/lightdm/lightdm.conf.d/60-autologin.conf
 }
 sha512sums="7abdefbffd24c5c7cd1400045895ee2c2cad933398bf37c749594efb698767efdac95aced9c1e7ea26f2333a2e9c877a0698ab5d086d7fbbd2972f261f6beb87  60-lightdm-autologin.conf
-c191ccc783d6d1acfdfb6c93214458323d784533257fa90cc5daeff605983b97fe016c5d3a62cb2e09645bd2016648529f7f699a38b2c3383aa9cc0b6ce9a4ac  hildon.desktop
-5ef5710bee7bde99e1f240eb8873239c452b55c6dc943930e181d091835824094cf56bf29ae1b34d792ba0ce27f76e30ea69f3c125dda3bf286eaaaba8c8e6ae  xinitrc_hildon.sh"
+b2c52b8d8751ed10c148f2a6aa3ab76be8b4854c85721963fb303a3605c9762e317221b5b69f8a41ccc19580055d7a6f07fa110b1daa7f3975f226b0d9acb833  hildon.desktop
+24bb92da41979df11944da60ab260c6c1e2ce82b66e143dc145e5657d53c3861c70a87f8dad06e623632c492bc401e5c216c2c1e54224c8f0aedfe6ef2230e80  xinitrc_hildon.sh"

main/postmarketos-ui-hildon/hildon.desktop

@@ -3,8 +3,8 @@ Name=Hildon
 Name[en]=Hildon
 Comment=This session logs you into Hildon
 Comment[en]=This session logs you into Hildon
-Exec=/etc/postmarketos-ui/xinitrc_hildon.sh
-TryExec=/etc/postmarketos-ui/xinitrc_hildon.sh
+Exec=/usr/bin/xinitrc_hildon
+TryExec=/usr/bin/xinitrc_hildon
 Icon=
 Type=Application
 DesktopNames=Hildon

main/postmarketos-ui-hildon/xinitrc_hildon.sh

@@ -13,4 +13,5 @@ eval "$(dbus-launch --sh-syntax --exit-with-session)"
 
 # Start X11 with Hildon
 export LC_MESSAGES=en_US.UTF-8
+export CLUTTER_BACKEND=x11
 exec hildon-desktop