main/postmarketos-base-ui-gnome: new aport (MR 2945)

Shared package for shared gnome and phosh ui configurations

Additionally, added missing dependencies:

Both Phosh and GNOME need elogind to do sleep inhibition and to
provide pam modules. gnome-bluetooth has some small udev rule
that helps marking devices for rfkill. Given that most devices
in pmOS have a bluetooth, this should be useful as a dependency.

main/postmarketos-ui-gnome/000-gschema.override → main/postmarketos-base-ui-gnome/00_postmarketos-base-ui-gnome.gschema.override

@@ -9,3 +9,11 @@ user-agent='Mozilla/5.0 (Linux; Android 10; Pixel) AppleWebKit/537.36 (KHTML, li
 
 [org.gnome.settings-daemon.plugins.power]
 sleep-inactive-ac-type='nothing'
+ambient-enabled=false
+
+[org.gnome.settings-daemon.plugins.wwan]
+unlock-sim=true
+
+[org.gnome.software]
+first-run=false
+download-updates=false

main/postmarketos-base-ui-gnome/APKBUILD

+pkgname=postmarketos-base-ui-gnome
+pkgver=1
+pkgrel=0
+pkgdesc="Meta package for shared configuration for GNOME-based UIs"
+url="https://postmarketos.org"
+arch="noarch"
+license="GPL-3.0-or-later"
+depends="
+	dnsmasq
+	elogind
+	gnome-bluetooth
+	polkit-elogind
+	postmarketos-base-ui
+	pulseaudio
+	"
+source="
+	00_postmarketos-base-ui-gnome.gschema.override
+	"
+options="!check"
+
+package() {
+	install -Dm644 -t "$pkgdir"/usr/share/glib-2.0/schemas \
+		"$srcdir"/00_postmarketos-base-ui-gnome.gschema.override
+}
+sha512sums="
+2e5387d30526ee88caf11dea830893da2d6368aa0a4e37395683cf6ebb43110249965557ea777f6d834367779a022dd294beb1d2adc1ecb5cd3420814b83cb08  00_postmarketos-base-ui-gnome.gschema.override
+"

main/postmarketos-ui-gnome/APKBUILD

 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=postmarketos-ui-gnome
-pkgver=1
-pkgrel=9
+pkgver=2
+pkgrel=0
 pkgdesc="(Wayland) Gnome Shell"
 url="https://gnome.org/"
 arch="noarch"
 license="GPL-3.0-or-later"
 depends="
-	dnsmasq
 	gdm
 	gnome
 	kgx
-	polkit-elogind
-	postmarketos-base-ui
+	postmarketos-base-ui-gnome
 	postmarketos-artwork-wallpapers
-	pulseaudio
 	xwayland
 	"
 install="$pkgname.post-install $pkgname.post-upgrade"
-source="000-gschema.override"
 options="!check pmb:gpu-accel"
 
 package() {
-	install -Dm644 "$srcdir"/000-gschema.override \
-		"$pkgdir"/usr/share/glib-2.0/schemas/000-postmarketos.gschema.override
+	mkdir -p "$pkgdir"
 }
-sha512sums="
-7802c41a37172ab243892d7ff99ddbc60b6c6e8df1c33dc88f2e97c987203777deedf5d04b0f55642855ec5663fa3b7143c962336c340e1d23da292e167aa5c3  000-gschema.override
-"

main/postmarketos-ui-phosh/000-gschema.override

-[org.gnome.desktop.background]
-picture-uri='file:///usr/share/wallpapers/postmarketos.jpg'
-
-[org.gnome.Epiphany]
-search-engines=[('Search the Web', 'https://duckduckgo.com/?q=%s&t=epiphany', ''), ('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'), ('Qwant', 'https://www.qwant.com/?q=%s', '!q')]
-
-[org.gnome.Epiphany.web]
-user-agent='Mozilla/5.0 (Linux; Android 10; Pixel) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.96 Mobile Safari/537.36'
-
-[org.gnome.settings-daemon.plugins.power]
-sleep-inactive-ac-type='nothing'
-ambient-enabled=false
-
-[org.gnome.eog.ui]
-sidebar=false
-
-[sm.puri.phosh]
-# disable filtering apps based on 'adaptive' tag
-app-filter-mode=[]
-favorites=['org.gnome.Calls.desktop', 'sm.puri.Chatty.desktop', 'org.gnome.Contacts.desktop', 'org.mozilla.firefox.desktop']
-
-[org.gnome.settings-daemon.plugins.wwan]
-unlock-sim=true
-
-[org.gnome.software]
-first-run=false
-download-updates=false

main/postmarketos-ui-phosh/01_postmarketos-ui-phosh.gschema.override

+[org.gnome.eog.ui]
+sidebar=false
+
+[sm.puri.phosh]
+# disable filtering apps based on 'adaptive' tag
+app-filter-mode=[]
+favorites=['org.gnome.Calls.desktop', 'sm.puri.Chatty.desktop', 'org.gnome.Contacts.desktop', 'org.mozilla.firefox.desktop']

main/postmarketos-ui-phosh/APKBUILD

 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-phosh
-pkgver=17
-pkgrel=1
+pkgver=18
+pkgrel=0
 pkgdesc="(Wayland) Mobile UI developed for the Librem 5"
 url="https://puri.sm"
 arch="noarch !armhf"
@@ -11,7 +11,6 @@ license="GPL-3.0-or-later"
 depends="
 	!pipewire-pulse
 	bluez
-	dnsmasq
 	gnome-keyring
 	iio-sensor-proxy
 	iio-sensor-proxy-openrc
@@ -19,9 +18,7 @@ depends="
 	modemmanager-openrc
 	networkmanager
 	phosh
-	polkit-elogind
-	postmarketos-base-ui
-	pulseaudio
+	postmarketos-base-ui-gnome
 	tinydm
 	tinydm-openrc
 	udiskie
@@ -57,7 +54,7 @@ _pmb_groups="feedbackd"
 subpackages="$pkgname-qt_tweaks $pkgname-firefox"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
-	000-gschema.override
+	01_postmarketos-ui-phosh.gschema.override
 	01-phoc-scaling
 	dconf-profile-postmarketos
 	firefox.desktop
@@ -70,8 +67,8 @@ source="
 options="!check pmb:gpu-accel"
 
 package() {
-	install -Dm644 "$srcdir"/000-gschema.override \
-		"$pkgdir"/usr/share/glib-2.0/schemas/000-postmarketos.gschema.override
+	install -Dm644 "$srcdir"/01_postmarketos-ui-phosh.gschema.override \
+		-t "$pkgdir"/usr/share/glib-2.0/schemas/
 	# Alpine sm.puri.OSK0 service packaged in phosh does not hardcode
 	# squeekboard, executes /usr/bin/osk-wayland instead
 	install -Dm755 "$srcdir"/osk.sh \
@@ -104,7 +101,7 @@ firefox() {
 }
 
 sha512sums="
-86a2b0e859cf733a35b20525af166a42d9153c36c961e69024669a01c39b6b0311c5372f3671b67967b97e620529371985964adad285c385a36420aa345307a4  000-gschema.override
+9f012a14aa6aecae24bd7b1bace60fda0e7b3c599d5b4f61bf945e4ed130334ea7dc34e6dfc86f8252ec7da4d32d2b1193f0bdef5486a7b48778adc09fedb35d  01_postmarketos-ui-phosh.gschema.override
 6d0ccbecfab1dbf2543dbd938d4b7544e278af9e88c8ab6751494b49aa281369f46d2769a1a1874e9bdad2faf8e8025d2ce97ea6b6302569a95283af5cedf459  01-phoc-scaling
 e00756c2c056f68123d877f2f6a5ad3434ca7851095f021c26831c081728b821cf7947ba08d6742eee51d93dc83859a7ead553f4dcbc8b6fcefa33ae344ba178  dconf-profile-postmarketos
 5a450658f94e5064ff233ec0dd1fcc42334d599b07bcc7cf281f73e593f5188c1a23cec0246f28bfb19c70fe4c29709dd4bdc72a7593b79ccaca9f34af37e3d6  firefox.desktop