Compare commits

...
9 Commits
Author SHA1 Message Date
Achill Gilgenast 33acd7ea34 [ci:skip-vercheck]: no shit sherlock 2026-06-14 13:04:37 +02:00
Achill Gilgenast e6a38a2fce TODO: provide dbus:blabla in community/oo7 with 100 prio replacing gnome-keyring 2026-06-14 13:04:37 +02:00
Achill Gilgenast b4bbb8ed56 TODO: enable openrc services 2026-06-14 13:04:37 +02:00
Achill Gilgenast 45f3836135 TEMP: temp/phosh: use oo7-portal as secret portal
Upstream to Alpine when merged: https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1905
2026-06-14 13:04:37 +02:00
Achill Gilgenast 9f68ef734e TEMP: temp/gnome: replace gnome-keyring with oo7 2026-06-14 13:04:36 +02:00
Achill Gilgenast 4dd82c9520 systemd/gnome-session: backport oo7 support
https://gitlab.alpinelinux.org/alpine/aports/-/commit/a449f62e9d2e9d6904617e3830502df48a15d8ba
2026-06-14 13:04:36 +02:00
Achill Gilgenast 800ad31991 systemd/postmarketos-base-systemd: enable oo7 services 2026-06-14 13:04:36 +02:00
Achill Gilgenast 83b12e10dc main/postmarketos-ui-cosmic: switch from gnome-keyring to oo7
See https://github.com/pop-os/xdg-desktop-portal-cosmic/commit/9e80ddfac429b27cd47c170d1eaf55708a9d8458
(since x-d-p-cosmic 1.0.14)
2026-06-14 13:04:36 +02:00
Achill Gilgenast 689aa4a40e main/postmarketos-base-ui-gnome: switch from gnome-keyring to oo7
Upstream nightly switched to oo7 and we can start switching aswell.

In the long-term, we should migrate all UIs to use oo7, see also
https://invent.kde.org/kde-linux/kde-linux/-/work_items/566 for upstream KDE.

Ref: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/work_items/1253
2026-06-14 13:04:17 +02:00
10 changed files with 312 additions and 7 deletions

No files matched your search

+3 -1
View File
@@ -8,7 +8,7 @@ maintainer="Stefan Hansson <newbyte@postmarketos.org>"
pkgname=gnome-session
_pkgver=50.1
pkgver=9999$_pkgver
pkgrel=0
pkgrel=1
pkgdesc="GNOME session manager"
url="https://gitlab.gnome.org/GNOME/gnome-session"
# armhf: pmb#2618
@@ -38,6 +38,7 @@ makedepends="
options="!check" #no tests
subpackages="$pkgname-lang $pkgname-doc $pkgname-systemd gnome-shell-session:_shell:noarch"
source="https://download.gnome.org/sources/gnome-session/${_pkgver%%.*}/gnome-session-$_pkgver.tar.xz
oo7.patch
"
builddir="$srcdir/gnome-session-$_pkgver"
@@ -76,4 +77,5 @@ _shell() {
sha512sums="
8f2d2cc3eb39dc52fdef42696d633808605b311adedaa197813f90eff60517ee1cfd53754e62987115ed8325775ed62ed77796cfd1f457263d1d98d209468abe gnome-session-50.1.tar.xz
56ea243bc4a19aec5b971752f7e45b37e6e748ed2e2cdafcacf2aa72782dd2d3401962cbb227a5029c45062d675a7fae7b09eaac4b8ec3b786539740dc916938 oo7.patch
"
@@ -0,0 +1,23 @@
From a9d4b4d72562973d415cb943a41b4746d19bba78 Mon Sep 17 00:00:00 2001
From: Achill Gilgenast <achill@achill.org>
Date: Wed, 6 May 2026 11:20:25 +0200
Subject: [PATCH] data: Use oo7-portal as secret portal
Once https://gitlab.gnome.org/GNOME/gnome-build-meta/-/work_items/1253 is
approved, x-d-p should prefer oo7-portal instead of gnome-keyring.
---
data/gnome-portals.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/gnome-portals.conf b/data/gnome-portals.conf
index 7e1094cf..0fd839d7 100644
--- a/data/gnome-portals.conf
+++ b/data/gnome-portals.conf
@@ -1,3 +1,3 @@
[preferred]
default=gnome;gtk;
-org.freedesktop.impl.portal.Secret=gnome-keyring;
+org.freedesktop.impl.portal.Secret=oo7-portal;gnome-keyring;
--
GitLab
@@ -1,7 +1,7 @@
# pmbootstrap installs this, if systemd is selected in "pmbootstrap init".
maintainer="Clayton Craft <clayton@craftyguy.net>"
pkgname=postmarketos-base-systemd
pkgver=78
pkgver=79
pkgrel=0
pkgdesc="Meta package for running postmarketOS with systemd"
url="https://postmarketos.org"
@@ -124,7 +124,7 @@ bde7052939d1ddde22fe1df86439d3f1b0cd41810911cee7acf26aac08afe1610360cbbd257b3c1a
cedd159b98ce47ee9d03e5f332c4132c7c3eff32135aa7b7993e19c4867d55aff689b418fc549e139c0ea4690f1094e86efcee7a5bc6cd6998ba99821064a917 rootfs-usr-lib-systemd-system-tmp.mount.d-10-min-memory.conf
c5252710d8e2f95f5c216cce17737bb14e112c7f1e0b73f085ac0bc3da5a718bb831cc62c0c62e7e5e99337fdcc5c4ace76c5c11bb0ae1f242181ce6829e4fd3 rootfs-usr-lib-systemd-system-user@.service.d-10-oomd-defaults.conf
4217385ab8e0d0e53a6f6eb2ad0ef5c1ae88cab431c9fdca3528f147241edfefe7eec8f2927670dcf79c6f853d2c8a930782fad7e2a28ef6575b55df115f2f83 rootfs-usr-lib-systemd-user-app.slice.d-10-oomd-defaults.conf
cc59f71e6f5b0089bc893c5d303cbc9a370c6432c507ac5c5e120e866499d817d6e2304c11e17960dddc65bc35575b17b27b25cc2382a5a885fd80b052f3cd1f rootfs-usr-lib-systemd-user-preset-90-base.preset
efe3e6ff21a2b6671b149d354207694d5556ebb33e0f6aacd1b847856fff09cc6b1af221cc5b7fe41aa5b0ace06eea62845d37004b74383222aeda388cd2cd57 rootfs-usr-lib-systemd-user-preset-90-base.preset
15423bfda57c90ab62fe69865ca4072a0aeb83bf77d9c278257e346f4da81843d010b41003c91ae9f3fcb1c67447645e7c19078eea2bf11312051e6ad7523ad1 rootfs-usr-share-mkinitfs-files-extra-01-initramfs-base-systemd.files
6ff3fbd88493e50de5821c6e3db92623b38de52be4e8e967f4f297d8f70e31a86d91f1243b973387b80c8520edcc89a8233db6f234bca22a56ee61a1b4333670 rootfs-etc-apk-commit_hooks.d-postmarketos-base-systemd
605df1f004783d2e0ec5dd99a688bca27502c8c24bc05fb4dc26589b2070b0fbd1cf9bd56e6861d7cda2f8ac8147e7eb040acfd886185c01c8cf9de8b1ce2dcd rootfs-usr-bin-setup-timezone
@@ -20,6 +20,8 @@ enable io.github.kolunmi.Bazaar.service
# GNOME
enable gnome-keyring-daemon.service
enable gnome-keyring-daemon.socket
enable oo7-portal.service
enable oo7-daemon.service
enable sm.puri.Chatty-daemon.service
# xfce4
+3 -3
View File
@@ -2,8 +2,8 @@
# Co-Maintainer: Achill Gilgenast <achill@achill.org>
maintainer="Stefan Hansson <newbyte@postmarketos.org>"
pkgname=postmarketos-base-ui-gnome
pkgver=11
pkgrel=1
pkgver=12
pkgrel=0
pkgdesc="Meta package for shared configuration for GNOME-based UIs"
url="https://postmarketos.org"
arch="noarch"
@@ -15,7 +15,7 @@ depends="
glycin-thumbnailer
gnome-backgrounds
gnome-bluetooth
gnome-keyring
oo7
gst-thumbnailers
iio-sensor-proxy
modemmanager
+1 -1
View File
@@ -32,7 +32,7 @@ _pmb_recommends="
cosmic-term
firefox-esr
flatpak
gnome-keyring
oo7
gst-libav
gst-plugins-bad
gst-plugins-good
+120
View File
@@ -0,0 +1,120 @@
maintainer="Achill Gilgenast <achill@achill.org>"
pkgname=gnome
pkgver=50.1
pkgrel=9999
pkgdesc="GNOME Base - meta package"
url="https://www.gnome.org/"
arch="noarch !armhf !s390x" # GNOME isn't available on all arches yet
options="!check" # No tests for a metapkg
license="GPL-3.0-or-later"
depends="
adwaita-fonts
bolt
dbus-x11
gcr-ssh-agent
gdm
gnome-backgrounds
gnome-browser-connector
gnome-control-center
gnome-initial-setup
gnome-online-accounts
gnome-remote-desktop
gnome-shell
gnome-shell-extensions
gnome-tour
gnome-user-docs
gsettings-desktop-schemas
gst-thumbnailers
gvfs
iio-sensor-proxy
localsearch
mesa
mesa-dri-gallium
oo7
pinentry-gnome
polkit-elogind
polkit-gnome
tinysparql
udisks2
xdg-desktop-portal-gnome
xdg-desktop-portal-gtk
xdg-user-dirs
"
subpackages="
$pkgname-apps-core:_apps_core
$pkgname-dev-tools:_dev_tools
"
package() {
mkdir -p "$pkgdir"
}
_apps_core() {
pkgdesc="GNOME core apps - meta package"
# From https://apps.gnome.org and https://apps.gnome.org/_api/components.json
depends="
baobab
decibels
epiphany
gnome-calculator
gnome-calendar
gnome-characters
gnome-clocks
gnome-connections
gnome-console
gnome-contacts
gnome-disk-utility
gnome-extensions-app
gnome-font-viewer
gnome-maps
gnome-music
gnome-software
gnome-software-plugin-apk2
gnome-system-monitor
gnome-text-editor
gnome-tweaks
gnome-user-share
gnome-weather
grilo
grilo-plugins
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gvfs-afc
gvfs-afp
gvfs-archive
gvfs-avahi
gvfs-cdda
gvfs-dav
gvfs-fuse
gvfs-goa
gvfs-gphoto2
gvfs-mtp
gvfs-nfs
gvfs-smb
loupe
nautilus
papers
showtime
simple-scan
snapshot
yelp
"
mkdir -p "$subpkgdir"
}
_dev_tools() {
pkgdesc="GNOME apps used for development and designing - meta package"
depends="
d-spy
dconf-editor
gnome-boxes
gnome-builder
manuals
sysprof
"
mkdir -p "$subpkgdir"
}
+123
View File
@@ -0,0 +1,123 @@
maintainer="Achill Gilgenast <achill@achill.org>"
pkgname=phosh
pkgver=0.54.0
pkgrel=9999
pkgdesc="Wayland shell for GNOME on mobile devices"
# armhf: blocked by gnome-shell-schemas
arch="all !armhf"
url="https://gitlab.gnome.org/World/Phosh/phosh"
license="GPL-3.0-only"
triggers="$pkgname.trigger=/usr/lib/phosh/plugins/prefs"
depends="
$pkgname-schemas
adwaita-fonts
adwaita-icon-theme
bash
dbus-x11
dbus:org.freedesktop.Secrets
desktop-file-utils
gnome-control-center
gnome-session
gnome-settings-daemon
gnome-shell-schemas
gsettings-desktop-schemas
phoc
phosh-keyboard
xwayland
"
makedepends="
callaudiod-dev
elogind-dev
evince-dev
evolution-data-server-dev
feedbackd-dev
gcr-dev
gettext-dev
glib-dev
gmobile-dev
gnome-bluetooth-dev
gnome-desktop-dev
gtk+3.0-dev
libadwaita-dev
libgudev-dev
libhandy1-dev
libsecret-dev
linux-pam-dev
meson
modemmanager-dev
networkmanager-dev
polkit-elogind-dev
pulseaudio-dev
py3-docutils
qrcodegen-dev
upower-dev
wayland-dev
wayland-protocols
"
checkdepends="xvfb-run xmlstarlet"
# the ordering here is important - libphosh split functions need to run first to move the libphosh-0
# headers/pkgconfig/lib into the libphosh packages, before the top level -dev package gobbles
# up the rest.
subpackages="
libphosh:libs
libphosh-dev:libphosh_dev
$pkgname-dbg
$pkgname-dev
$pkgname-doc
$pkgname-lang
$pkgname-portalsconf::noarch
$pkgname-schemas::noarch
$pkgname-systemd
"
source="https://sources.phosh.mobi/releases/phosh/phosh-${pkgver/_/.}.tar.xz
oo7.patch
"
builddir="$srcdir/$pkgname-${pkgver/_/.}"
somask="libphoshsearch.so"
prepare() {
default_prepare
sed -i 's/\.rc/_rc/' meson.build
}
build() {
# phoc tests need a running Wayland compositor
abuild-meson \
-Db_lto=true \
-Dphoc_tests=disabled \
-Dman=true \
-Dbindings-lib=true \
. output
meson compile -C output
}
check() {
xvfb-run -a meson test --print-errorlogs -C output
}
package() {
DESTDIR="$pkgdir/" meson install --no-rebuild --skip-subprojects -C output
}
portalsconf() {
install_if="$pkgname=$pkgver-r$pkgrel xdg-desktop-portal>=1.17.1"
amove usr/share/xdg-desktop-portal/phosh-portals.conf
}
libphosh_dev() {
amove usr/include/libphosh-*
amove usr/lib/libphosh-*.so
amove usr/lib/pkgconfig/libphosh-*.pc
}
schemas() {
pkgdesc="$pkgdesc (schemas)"
depends=
amove usr/share/glib-2.0/schemas
}
sha512sums="
441bfdac0087e788f1d0dae43568e15e88e04255147eb95f16c05167340b97de5a0ae6dc2b55531fdecc76b69ad555a0df536dc35e45bc68a584ab3411adf992 phosh-0.54.0.tar.xz
718aafcbb2599336a2edbed6b61d9956f371faa14425e2d09f0c753229707466f1630603cfc998901b6609db8522372f27cf9a21990008e5db08261abea18461 oo7.patch
"
+26
View File
@@ -0,0 +1,26 @@
From a6cedc29fb4467e521442ab56bcfd829dfa41679 Mon Sep 17 00:00:00 2001
From: Achill Gilgenast <achill@achill.org>
Date: Wed, 6 May 2026 12:27:53 +0200
Subject: [PATCH] data: Use oo7-portal as secret portal
GNOME is likely going to switch to oo7 too.
Signed-off-by: Achill Gilgenast <achill@achill.org>
---
data/phosh-portals.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/phosh-portals.conf b/data/phosh-portals.conf
index 3bf377d27..e0055b3e5 100644
--- a/data/phosh-portals.conf
+++ b/data/phosh-portals.conf
@@ -8,5 +8,5 @@ org.freedesktop.impl.portal.InputCapture=none;
org.freedesktop.impl.portal.RemoteDesktop=none;
org.freedesktop.impl.portal.ScreenCast=wlr;
org.freedesktop.impl.portal.Screenshot=gtk;wlr;
-org.freedesktop.impl.portal.Secret=gnome-keyring;
+org.freedesktop.impl.portal.Secret=oo7-portal;gnome-keyring;
org.freedesktop.impl.portal.Usb=none;
--
GitLab
+9
View File
@@ -0,0 +1,9 @@
#!/bin/sh
for i in "$@"; do
if ! [ -e "$i" ]; then
continue
fi
/usr/bin/gio-querymodules "$i"
done