diff --git a/device/community/device-nokia-n900/APKBUILD b/device/community/device-nokia-n900/APKBUILD index ac53d5c3f..e3be7c932 100644 --- a/device/community/device-nokia-n900/APKBUILD +++ b/device/community/device-nokia-n900/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Daniele Debernardi pkgname=device-nokia-n900 pkgver=7 -pkgrel=4 +pkgrel=5 pkgdesc="Nokia N900" url="https://postmarketos.org" arch="armv7" @@ -15,7 +15,6 @@ subpackages=" $pkgname-weston $pkgname-x11 $pkgname-i3wm - $pkgname-xfce4 $pkgname-nonfree-firmware:nonfree_firmware " source=" @@ -151,12 +150,6 @@ i3wm() { "$subpkgdir"/etc/sudoers.d/10-noroot-suspend } -xfce4() { - install_if="$pkgname postmarketos-ui-xfce4" - install="$subpkgname.post-install" - mkdir "$subpkgdir" -} - nonfree_firmware() { pkgdesc="Wifi firmware" depends="linux-firmware-ti-connectivity" diff --git a/device/community/device-nokia-n900/device-nokia-n900-xfce4.post-install b/device/community/device-nokia-n900/device-nokia-n900-xfce4.post-install deleted file mode 100644 index ad34346ff..000000000 --- a/device/community/device-nokia-n900/device-nokia-n900-xfce4.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -sed -i 's/monitor0/monitorLVDS-1/' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml - diff --git a/device/main/device-qemu-aarch64/APKBUILD b/device/main/device-qemu-aarch64/APKBUILD index 2edcba12a..6861e9e9c 100644 --- a/device/main/device-qemu-aarch64/APKBUILD +++ b/device/main/device-qemu-aarch64/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Daniele Debernardi pkgname=device-qemu-aarch64 pkgver=2.3 -pkgrel=1 +pkgrel=2 pkgdesc="Simulated device in QEMU (aarch64)" url="https://postmarketos.org" arch="aarch64" @@ -16,7 +16,6 @@ subpackages=" $pkgname-mce $pkgname-sway $pkgname-weston - $pkgname-xfce4 " source=" @@ -53,12 +52,6 @@ weston() { "$subpkgdir"/etc/xdg/weston/weston.ini } -xfce4() { - install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-xfce4" - install="$subpkgname.post-install" - mkdir "$subpkgdir" -} - kernel_virt() { pkgdesc="Alpine Virt kernel (minimal, no audio)" depends="linux-virt" diff --git a/device/main/device-qemu-aarch64/device-qemu-aarch64-xfce4.post-install b/device/main/device-qemu-aarch64/device-qemu-aarch64-xfce4.post-install deleted file mode 100644 index 31470445b..000000000 --- a/device/main/device-qemu-aarch64/device-qemu-aarch64-xfce4.post-install +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -sed -i 's/monitor0/monitorVirtual-1/' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/device/main/device-qemu-amd64/APKBUILD b/device/main/device-qemu-amd64/APKBUILD index 7f0510f00..5b0cb78d4 100644 --- a/device/main/device-qemu-amd64/APKBUILD +++ b/device/main/device-qemu-amd64/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Daniele Debernardi pkgname=device-qemu-amd64 pkgver=2.4 -pkgrel=1 +pkgrel=2 pkgdesc="Simulated device in QEMU (x86_64)" url="https://postmarketos.org" arch="x86_64" @@ -16,7 +16,6 @@ subpackages=" $pkgname-mce $pkgname-sway $pkgname-weston - $pkgname-xfce4 " source=" deviceinfo @@ -52,12 +51,6 @@ weston() { "$subpkgdir"/etc/xdg/weston/weston.ini } -xfce4() { - install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-xfce4" - install="$subpkgname.post-install" - mkdir "$subpkgdir" -} - kernel_virt() { pkgdesc="Alpine Virt kernel (minimal, no audio)" depends="linux-virt" diff --git a/device/main/device-qemu-amd64/device-qemu-amd64-xfce4.post-install b/device/main/device-qemu-amd64/device-qemu-amd64-xfce4.post-install deleted file mode 100644 index 31470445b..000000000 --- a/device/main/device-qemu-amd64/device-qemu-amd64-xfce4.post-install +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -sed -i 's/monitor0/monitorVirtual-1/' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD index ec5827c59..ae3d753de 100644 --- a/main/postmarketos-ui-xfce4/APKBUILD +++ b/main/postmarketos-ui-xfce4/APKBUILD @@ -1,7 +1,7 @@ -# Maintainer: Daniele Debernardi +# Maintainer: Jakko pkgname=postmarketos-ui-xfce4 -pkgver=0.3 -pkgrel=9 +pkgver=0.4.0 +pkgrel=0 pkgdesc="(X11) Lightweight desktop (stylus recommended)" url="https://gitlab.com/postmarketOS/xfce4-phone" arch="noarch" @@ -21,13 +21,14 @@ depends=" _pmb_recommends=" faenza-icon-theme gnome-keyring + greybird-themes + network-manager-applet onboard pavucontrol pm-utils postmarketos-artwork-icons postmarketos-artwork-wallpapers pulseaudio-utils - network-manager-applet xfce4-battery-plugin xfce4-pulseaudio-plugin xfce4-screensaver @@ -39,6 +40,7 @@ source=" xfce4-phone-$pkgver.tar.gz::https://gitlab.com/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz 10_onboard.gschema.override 64-lightdm-autologin.conf + enable-scrollbars.sh onboard-autostart.desktop " options="!check" @@ -54,13 +56,17 @@ package() { install -Dm644 "$srcdir"/64-lightdm-autologin.conf \ "$pkgdir"/usr/share/lightdm/lightdm.conf.d/64-autologin.conf + install -Dm644 "$srcdir"/enable-scrollbars.sh \ + "$pkgdir"/etc/profile.d/enable-scrollbars.sh + install -Dm644 "$srcdir"/onboard-autostart.desktop \ "$pkgdir"/etc/skel/.config/autostart/onboard-autostart.desktop } sha512sums=" -9adf87cdb531ad0eb4ab0d42dd4d43c88da117fdb8c7583c58ef2fcda52ce658e9234fe0451e5bf7d3768cdabf966c9dc27bda360e53ec44c04856ddfa941ab4 xfce4-phone-0.3.tar.gz +753d8c228a938255594ecc007d6071cb35e5c400d622990e0db9540c3297e17e73bdd088d5bee25ac749606700ca42a636243864523788b1cbe0dd77afa900be xfce4-phone-0.4.0.tar.gz ffcc518ff58d37de302bd101e57bf983800e45899645d476045d0a74096704333a0b513f45e6a5485fdbd80ac1caebce14a760cab6fcc6d5dde0d766ade8b58b 10_onboard.gschema.override 3841294daffdd3e0da5a7ba155ba8c21e9e5a2f2ba5b3b5ffa3ea6a16486625d3655d03f8c18740fcddfbca673c42a5289ec3b22720cfbbdd56fde8fdc3bf9b0 64-lightdm-autologin.conf -0f7947628076fcecb4883df8c4ff9989fb98448bbe8c12558bb47fc0d6dde0001c023c814fa88fe1390d6b058c7449dbecd0538e2289016ab84db0df2e15af6a onboard-autostart.desktop +262cdcf334cfa56872797c960cb8683b79c7b13b0a8179cd002e598576f0e9fe07057fd0fe724e87a6664db4b91b31a8c0cbf026ab137533b07675f838ae57bb enable-scrollbars.sh +85a7f157fc237959f2e1a411f494f52a97c683bc656ea3899c7636db3de39ce9cb25b88ff5408fe2c36fe871065830c8581e8bdee385fb1aa94709c189463966 onboard-autostart.desktop " diff --git a/main/postmarketos-ui-xfce4/enable-scrollbars.sh b/main/postmarketos-ui-xfce4/enable-scrollbars.sh new file mode 100644 index 000000000..5fab676a7 --- /dev/null +++ b/main/postmarketos-ui-xfce4/enable-scrollbars.sh @@ -0,0 +1,3 @@ +# shellcheck shell=sh +# This environment variable enables scrollbars +export GTK_OVERLAY_SCROLLING=0 diff --git a/main/postmarketos-ui-xfce4/onboard-autostart.desktop b/main/postmarketos-ui-xfce4/onboard-autostart.desktop index ac917af10..6a072cdf8 100644 --- a/main/postmarketos-ui-xfce4/onboard-autostart.desktop +++ b/main/postmarketos-ui-xfce4/onboard-autostart.desktop @@ -1,2 +1,7 @@ [Desktop Entry] +Type=Application +Name=Onboard +Comment=Flexible onscreen keyboard +Icon=onboard +Exec=onboard X-XFCE-Autostart-Override=true