Backport tunables/share to 2.11 and 2.12 branch

Backporting the abstractions/gnome changes resulted in invalid profiles
because 2.11 and 2.12 don't have @{user_share_dirs} defined.

Therefore add/copy over tunables/share from master, and include it in
tunables/global.
This commit is contained in:
Christian Boltz 2020-01-10 00:04:30 +01:00
parent 80794004e5
commit 99e2d38cc7
Failed to generate hash of commit
2 changed files with 16 additions and 0 deletions

View file

@ -18,3 +18,4 @@
#include <tunables/alias> #include <tunables/alias>
#include <tunables/kernelvars> #include <tunables/kernelvars>
#include <tunables/xdg-user-dirs> #include <tunables/xdg-user-dirs>
#include <tunables/share>

View file

@ -0,0 +1,15 @@
@{flatpak_exports_root} = {flatpak/exports,flatpak/{app,runtime}/*/*/*/*/export}
# System-wide directories with behaviour analogous to /usr/share
# in patterns like the freedesktop.org basedir spec. These are
# owned by root or a system user, appear in XDG_DATA_DIRS, and
# are the parent directory for `applications`, `themes`,
# `dbus-1/services`, etc.
@{system_share_dirs} = /{usr,usr/local,var/lib/@{flatpak_exports_root}}/share
# Per-user/personal directories with behaviour analogous to
# ~/.local/share in patterns like the freedesktop.org basedir spec.
# These are owned by the user running an application, appear in
# XDG_DATA_DIRS or XDG_DATA_HOME, and are the parent directory
# for the same subdirectories as @{system_share_dirs}
@{user_share_dirs} = @{HOME}/.local{,/share/@{flatpak_exports_root}}/share